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

Fixed #2212 GFX - Allow loading (DDS) images despite of set bitmapFormat

Browse Source
This commit is contained in:
Jindra Petřík
2024-08-05 11:17:25 +02:00
parent 4fe999bd47
commit 25ec3e9516
5 changed files with 173 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/AbstractGfxImageTag.java
+95
View File
@@ -0,0 +1,95 @@
/*
* Copyright (C) 2010-2023 JPEXS, All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
*/
package com.jpexs.decompiler.flash.tags.gfx;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.gfx.TgaSupport;
import com.jpexs.decompiler.flash.tags.base.ImageTag;
import com.jpexs.helpers.ByteArrayRange;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import javax.imageio.ImageIO;
import net.npe.dds.DDSReader;
/**
*
* @author JPEXS
*/
public abstract class AbstractGfxImageTag extends ImageTag {
public static final int BITMAP_FORMAT_DEFAULT = 0;
public static final int BITMAP_FORMAT_TGA = 1;
public static final int BITMAP_FORMAT_DDS = 2;
//It looks like gfxexport produces BITMAP_FORMAT2_* values for format,
//but BITMAP_FORMAT_* works the same way
public static final int BITMAP_FORMAT2_JPEG = 10;
public static final int BITMAP_FORMAT2_TGA = 13;
public static final int BITMAP_FORMAT2_DDS = 14;
public AbstractGfxImageTag(SWF swf, int id, String name, ByteArrayRange data) {
super(swf, id, name, data);
}
private BufferedImage loadDds(byte[] imageData) {
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
return bufImage;
}
protected BufferedImage getExternalBufferedImage(String fileName, int bitmapFormat) {
Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName));
if (imagePath == null || !imagePath.toFile().exists()) {
return null;
}
byte[] imageData;
try {
imageData = Files.readAllBytes(imagePath);
} catch (IOException ex) {
return null;
}
if (imageData.length >= 4 &&
imageData[0] == 0x44 &&
imageData[1] == 0x44 &&
imageData[2] == 0x53 &&
imageData[3] == 0x20) {
return loadDds(imageData);
}
if (fileName.toLowerCase().endsWith(".tga")
|| bitmapFormat == BITMAP_FORMAT2_TGA
|| bitmapFormat == BITMAP_FORMAT_TGA) {
TgaSupport.init();
}
try {
return ImageIO.read(imagePath.toFile());
} catch (IOException ex) {
return null;
}
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java
+22 -63
View File
@@ -44,7 +44,7 @@ import net.npe.dds.DDSReader;
*
* @author JPEXS
*/
public class DefineExternalImage extends ImageTag {
public class DefineExternalImage extends AbstractGfxImageTag {
public static final int ID = 1001;
@@ -58,21 +58,7 @@ public class DefineExternalImage extends ImageTag {
public String exportName;
public String fileName;
public static final int BITMAP_FORMAT_DEFAULT = 0;
public static final int BITMAP_FORMAT_TGA = 1;
public static final int BITMAP_FORMAT_DDS = 2;
//It looks like gfxexport produces BITMAP_FORMAT2_* values for format,
//but BITMAP_FORMAT_* works the same way
public static final int BITMAP_FORMAT2_JPEG = 10;
public static final int BITMAP_FORMAT2_TGA = 13;
public static final int BITMAP_FORMAT2_DDS = 14;
public String fileName;
@HideInRawEdit
private SerializableImage serImage;
@@ -176,54 +162,27 @@ public class DefineExternalImage extends ImageTag {
}
private void initImage() {
if (!Objects.equals(cachedImageFilename, fileName)
|| (serImage != null && (serImage.getWidth() != targetWidth || serImage.getHeight() != targetHeight))) {
if (targetWidth <= 0 || targetHeight <= 0) {
serImage = new SerializableImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR_PRE);
serImage.fillTransparent();
} else if (bitmapFormat == BITMAP_FORMAT2_JPEG || bitmapFormat == BITMAP_FORMAT2_TGA || bitmapFormat == BITMAP_FORMAT_TGA) {
Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName));
if (imagePath != null && imagePath.toFile().exists()) {
try {
if (bitmapFormat == BITMAP_FORMAT2_TGA || bitmapFormat == BITMAP_FORMAT_TGA) {
TgaSupport.init();
}
BufferedImage bufImage = ImageIO.read(imagePath.toFile());
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = fileName;
} catch (IOException ex) {
createFailedImage();
}
} else {
createFailedImage();
}
} else if (bitmapFormat == BITMAP_FORMAT2_DDS || bitmapFormat == BITMAP_FORMAT_DDS) {
Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName));
if (imagePath != null && imagePath.toFile().exists()) {
try {
byte[] imageData = Files.readAllBytes(imagePath);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = fileName;
} catch (IOException ex) {
createFailedImage();
}
} else {
createFailedImage();
}
} else {
createFailedImage();
}
if (Objects.equals(cachedImageFilename, fileName)
&& serImage != null && (serImage.getWidth() == targetWidth && serImage.getHeight() == targetHeight)) {
return;
}
if (targetWidth <= 0 || targetHeight <= 0) {
serImage = new SerializableImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR_PRE);
serImage.fillTransparent();
return;
}
BufferedImage bufImage = getExternalBufferedImage(fileName, bitmapFormat);
if (bufImage == null) {
createFailedImage();
return;
}
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = fileName;
}
@Override
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java
+22 -63
View File
@@ -44,7 +44,7 @@ import net.npe.dds.DDSReader;
*
* @author JPEXS
*/
public class DefineExternalImage2 extends ImageTag {
public class DefineExternalImage2 extends AbstractGfxImageTag {
public static final int ID = 1009;
@@ -73,21 +73,7 @@ public class DefineExternalImage2 extends ImageTag {
public String fileName;
public byte[] extraData; //?
public static final int BITMAP_FORMAT_DEFAULT = 0;
public static final int BITMAP_FORMAT_TGA = 1;
public static final int BITMAP_FORMAT_DDS = 2;
//It looks like gfxexport produces BITMAP_FORMAT2_* values for format,
//but BITMAP_FORMAT_* works the same way
public static final int BITMAP_FORMAT2_JPEG = 10;
public static final int BITMAP_FORMAT2_TGA = 13;
public static final int BITMAP_FORMAT2_DDS = 14;
public byte[] extraData; //?
@HideInRawEdit
private SerializableImage serImage;
@@ -202,54 +188,27 @@ public class DefineExternalImage2 extends ImageTag {
}
private void initImage() {
if (!Objects.equals(cachedImageFilename, fileName)
|| (serImage != null && (serImage.getWidth() != targetWidth || serImage.getHeight() != targetHeight))) {
if (targetWidth <= 0 || targetHeight <= 0) {
serImage = new SerializableImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR_PRE);
serImage.fillTransparent();
} else if (bitmapFormat == BITMAP_FORMAT2_JPEG || bitmapFormat == BITMAP_FORMAT2_TGA || bitmapFormat == BITMAP_FORMAT_TGA) {
Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName));
if (imagePath != null && imagePath.toFile().exists()) {
try {
if (bitmapFormat == BITMAP_FORMAT2_TGA || bitmapFormat == BITMAP_FORMAT_TGA) {
TgaSupport.init();
}
BufferedImage bufImage = ImageIO.read(imagePath.toFile());
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = fileName;
} catch (IOException ex) {
createFailedImage();
}
} else {
createFailedImage();
}
} else if (bitmapFormat == BITMAP_FORMAT2_DDS || bitmapFormat == BITMAP_FORMAT_DDS) {
Path imagePath = getSwf().getFile() == null ? null : Paths.get(getSwf().getFile()).getParent().resolve(Paths.get(fileName));
if (imagePath != null && imagePath.toFile().exists()) {
try {
byte[] imageData = Files.readAllBytes(imagePath);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = fileName;
} catch (IOException ex) {
createFailedImage();
}
} else {
createFailedImage();
}
} else {
createFailedImage();
}
if (Objects.equals(cachedImageFilename, fileName)
&& serImage != null && (serImage.getWidth() == targetWidth && serImage.getHeight() == targetHeight)) {
return;
}
if (targetWidth <= 0 || targetHeight <= 0) {
serImage = new SerializableImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR_PRE);
serImage.fillTransparent();
return;
}
BufferedImage bufImage = getExternalBufferedImage(fileName, bitmapFormat);
if (bufImage == null) {
createFailedImage();
return;
}
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = fileName;
}
@Override
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineSubImage.java
+32 -62
View File
@@ -43,7 +43,7 @@ import net.npe.dds.DDSReader;
*
* @author JPEXS
*/
public class DefineSubImage extends ImageTag {
public class DefineSubImage extends AbstractGfxImageTag {
public static final int ID = 1008;
@@ -186,68 +186,38 @@ public class DefineSubImage extends ImageTag {
int targetHeight = y2 - y1;
int bitmapFormat = image.bitmapFormat;
if (!Objects.equals(cachedImageFilename, image.fileName)
|| !Objects.equals(cachedX1, (Integer) x1)
|| !Objects.equals(cachedX2, (Integer) x2)
|| !Objects.equals(cachedY1, (Integer) y1)
|| !Objects.equals(cachedY2, (Integer) y2)
|| (serImage != null && (serImage.getWidth() != targetWidth || serImage.getHeight() != targetHeight))) {
if (targetWidth <= 0 || targetHeight <= 0) {
serImage = new SerializableImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR_PRE);
serImage.fillTransparent();
return;
}
Path imagePath = image.getSwf().getFile() == null ? null : Paths.get(image.getSwf().getFile()).getParent().resolve(Paths.get(image.fileName));
if (imagePath != null && imagePath.toFile().exists()) {
if (bitmapFormat == DefineExternalImage2.BITMAP_FORMAT2_JPEG
|| bitmapFormat == DefineExternalImage2.BITMAP_FORMAT2_TGA
|| bitmapFormat == DefineExternalImage2.BITMAP_FORMAT_TGA) {
try {
if (bitmapFormat == DefineExternalImage2.BITMAP_FORMAT2_TGA
|| bitmapFormat == DefineExternalImage2.BITMAP_FORMAT_TGA) {
TgaSupport.init();
}
BufferedImage bufImage = ImageIO.read(imagePath.toFile());
Image scaled = bufImage.getScaledInstance(image.targetWidth, image.targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, -x1, -y1, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = image.fileName;
cachedX1 = x1;
cachedX2 = x2;
cachedY1 = y1;
cachedY2 = y2;
} catch (IOException ex) {
createFailedImage();
}
} else if (bitmapFormat == DefineExternalImage2.BITMAP_FORMAT2_DDS
|| bitmapFormat == DefineExternalImage2.BITMAP_FORMAT_DDS) {
try {
byte[] imageData = Files.readAllBytes(imagePath);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(image.targetWidth, image.targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, -x1, -y1, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = image.fileName;
cachedX1 = x1;
cachedX2 = x2;
cachedY1 = y1;
cachedY2 = y2;
} catch (IOException e) {
createFailedImage();
}
} else {
createFailedImage();
}
} else {
createFailedImage();
}
if (Objects.equals(cachedImageFilename, image.fileName)
&& Objects.equals(cachedX1, (Integer) x1)
&& Objects.equals(cachedX2, (Integer) x2)
&& Objects.equals(cachedY1, (Integer) y1)
&& Objects.equals(cachedY2, (Integer) y2)
&& serImage != null
&& serImage.getWidth() == targetWidth
&& serImage.getHeight() == targetHeight) {
return;
}
if (targetWidth <= 0 || targetHeight <= 0) {
serImage = new SerializableImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR_PRE);
serImage.fillTransparent();
return;
}
BufferedImage bufImage = getExternalBufferedImage(image.fileName, bitmapFormat);
if (bufImage == null) {
createFailedImage();
return;
}
Image scaled = bufImage.getScaledInstance(image.targetWidth, image.targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, -x1, -y1, null);
serImage = new SerializableImage(bufImage);
cachedImageFilename = image.fileName;
cachedX1 = x1;
cachedX2 = x2;
cachedY1 = y1;
cachedY2 = y2;
}
@Override