LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 01:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround for ImageIO jpeg export bug when alpha channel exists, tag method orders changed (contructors, readData, getData, etc)

Browse Source
This commit is contained in:
[email protected]
2015-05-16 11:04:14 +02:00
parent 7d3373f96e
commit 3632c466e1
43 changed files with 6011 additions and 5832 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/MainPanel.java
+33 -3
View File
@@ -91,6 +91,8 @@ import com.jpexs.decompiler.flash.importers.SymbolClassImporter;
import com.jpexs.decompiler.flash.importers.TextImporter;
import com.jpexs.decompiler.flash.tags.ABCContainerTag;
import com.jpexs.decompiler.flash.tags.DefineBinaryDataTag;
import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag;
import com.jpexs.decompiler.flash.tags.DefineBitsJPEG4Tag;
import com.jpexs.decompiler.flash.tags.DefineSoundTag;
import com.jpexs.decompiler.flash.tags.DefineSpriteTag;
import com.jpexs.decompiler.flash.tags.DoActionTag;
@@ -2475,6 +2477,34 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
}
}
public void replaceAlphaButtonActionPerformed(ActionEvent evt) {
TreeItem item = tagTree.getCurrentTreeItem();
if (item == null) {
return;
}
if (item instanceof DefineBitsJPEG3Tag || item instanceof DefineBitsJPEG4Tag) {
ImageTag it = (ImageTag) item;
if (it.importSupported()) {
File selectedFile = showImportFileChooser("");
if (selectedFile != null) {
File selfile = Helper.fixDialogFile(selectedFile);
byte[] data = Helper.readFile(selfile.getAbsolutePath());
try {
new ImageImporter().importImageAlpha(it, data);
SWF swf = it.getSwf();
swf.clearImageCache();
} catch (IOException ex) {
logger.log(Level.SEVERE, "Invalid image", ex);
View.showMessageDialog(null, translate("error.image.invalid"), translate("error"), JOptionPane.ERROR_MESSAGE);
}
reload(true);
}
}
}
}
public void exportJavaSourceActionPerformed(ActionEvent evt) {
if (Main.isWorking()) {
return;
@@ -2799,7 +2829,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
previewPanel.clear();
stopFlashPlayer();
previewPanel.setImageReplaceButtonVisible(false);
previewPanel.setImageReplaceButtonVisible(false, false);
boolean internalViewer = isInternalFlashViewerSelected();
@@ -2894,7 +2924,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
showCard(CARDACTIONSCRIPTPANEL);
} else if (treeItem instanceof ImageTag) {
ImageTag imageTag = (ImageTag) treeItem;
previewPanel.setImageReplaceButtonVisible(imageTag.importSupported());
previewPanel.setImageReplaceButtonVisible(imageTag.importSupported(), imageTag instanceof DefineBitsJPEG3Tag || imageTag instanceof DefineBitsJPEG4Tag);
previewPanel.showImagePanel(imageTag.getImage());
showCard(CARDPREVIEWPANEL);
} else if ((treeItem instanceof DrawableTag) && (!(treeItem instanceof TextTag)) && (!(treeItem instanceof FontTag)) && internalViewer) {
@@ -2935,7 +2965,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
showCard(CARDPREVIEWPANEL);
} else if ((treeItem instanceof SoundTag)) { //&& isInternalFlashViewerSelected() && (Arrays.asList("mp3", "wav").contains(((SoundTag) tagObj).getExportFormat())))) {
previewPanel.showImagePanel(new SerializableImage(View.loadImage("sound32")));
previewPanel.setImageReplaceButtonVisible(treeItem instanceof DefineSoundTag);
previewPanel.setImageReplaceButtonVisible(treeItem instanceof DefineSoundTag, false);
try {
SoundTagPlayer soundThread = new SoundTagPlayer((SoundTag) treeItem, Configuration.loopMedia.get() ? Integer.MAX_VALUE : 1, true);
previewPanel.setMedia(soundThread);
src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
+10 -1
View File
@@ -152,6 +152,8 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
// Image tag buttons
private JButton replaceImageButton;
private JButton replaceImageAlphaButton;
private JButton prevFontsButton;
private JButton nextFontsButton;
@@ -242,6 +244,11 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
replaceImageButton.addActionListener(mainPanel::replaceButtonActionPerformed);
replaceImageButton.setVisible(false);
replaceImageAlphaButton = new JButton(mainPanel.translate("button.replaceAlphaChannel"), View.getIcon("edit16"));
replaceImageAlphaButton.setMargin(new Insets(3, 3, 3, 10));
replaceImageAlphaButton.addActionListener(mainPanel::replaceAlphaButtonActionPerformed);
replaceImageAlphaButton.setVisible(false);
prevFontsButton = new JButton(mainPanel.translate("button.prev"), View.getIcon("prev16"));
prevFontsButton.setMargin(new Insets(3, 3, 3, 10));
prevFontsButton.addActionListener(this::prevFontsButtonActionPerformed);
@@ -254,6 +261,7 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
ButtonsPanel imageButtonsPanel = new ButtonsPanel();
imageButtonsPanel.add(replaceImageButton);
imageButtonsPanel.add(replaceImageAlphaButton);
imageButtonsPanel.add(prevFontsButton);
imageButtonsPanel.add(nextFontsButton);
return imageButtonsPanel;
@@ -573,8 +581,9 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
parametersPanel.setVisible(false);
}
public void setImageReplaceButtonVisible(boolean show) {
public void setImageReplaceButtonVisible(boolean show, boolean showAlpha) {
replaceImageButton.setVisible(show);
replaceImageAlphaButton.setVisible(showAlpha);
prevFontsButton.setVisible(false);
nextFontsButton.setVisible(false);
}
src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
+591 -588
View File
File diff suppressed because it is too large Load Diff
src/com/jpexs/decompiler/flash/gui/locales/MainFrame_hu.properties
+590 -587
View File
File diff suppressed because it is too large Load Diff