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

#481 Image exporting fixed (DefineBitsJPEG2/3 erroneous header)

Browse Source
This commit is contained in:
Honfika
2014-01-22 18:41:43 +01:00
parent 41e9e58c31
commit 5abdf60a24
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class SWFInputStream extends InputStream {
*
* @param pos Number of bytes
*/
public void seek(int pos) throws IOException {
public void seek(long pos) throws IOException {
if (is instanceof SeekableInputStream) {
SeekableInputStream sis = (SeekableInputStream) is;
sis.seek(pos);
trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java
+3
View File
@@ -48,6 +48,9 @@ public class DefineBitsJPEG2Tag extends ImageTag implements AloneTag {
@Override
public BufferedImage getImage(List<Tag> tags) {
try {
if (SWF.hasErrorHeader(imageData)) {
return ImageIO.read(new ByteArrayInputStream(imageData, 4, imageData.length - 4));
}
return ImageIO.read(new ByteArrayInputStream(imageData));
} catch (IOException ex) {
}
trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
+6 -1
View File
@@ -69,7 +69,12 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag {
@Override
public BufferedImage getImage(List<Tag> tags) {
try {
BufferedImage img = ImageIO.read(new ByteArrayInputStream(imageData));
BufferedImage img;
if (SWF.hasErrorHeader(imageData)) {
img = ImageIO.read(new ByteArrayInputStream(imageData, 4, imageData.length - 4));
} else {
img = ImageIO.read(new ByteArrayInputStream(imageData));
}
if (bitmapAlphaData.length == 0) {
return img;
}
trunk/src/com/jpexs/decompiler/flash/types/shaperecords/SHAPERECORD.java
+3 -1
View File
@@ -188,7 +188,9 @@ public abstract class SHAPERECORD implements Cloneable, NeedsCharacters, Seriali
btrans.preConcatenate(AffineTransform.getTranslateInstance(startX / DESCALE, startY / DESCALE));
g.setTransform(btrans);
BufferedImage img = image.getImage(tags);
g.setPaint(new TexturePaint(img, new Rectangle(img.getWidth(), img.getHeight())));
if (img != null) {
g.setPaint(new TexturePaint(img, new Rectangle(img.getWidth(), img.getHeight())));
}
g.fill(new Rectangle(-16384 * maxRepeat, -16384 * maxRepeat, 16384 * 2 * maxRepeat, 16384 * 2 * maxRepeat));
g.setTransform(oldAf);
g.setClip(null);