From 6bb2cb228d5f1170e86cf54b6ca85116a9745e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= <jindra.petrik@gmail.com>
Date: Sat, 4 May 2013 15:03:32 +0200
Subject: [PATCH] transparency in DefineBitsJPEG3 and 4

---
 .../flash/tags/DefineBitsJPEG3Tag.java         | 18 ++++++++++++++++--
 .../flash/tags/DefineBitsJPEG4Tag.java         | 18 ++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
index 9c4314b20..0af255494 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
@@ -68,13 +68,27 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag {
 
     @Override
     public String getImageFormat() {
-        return ImageTag.getImageFormat(imageData);
+        String fmt=ImageTag.getImageFormat(imageData);
+        if(fmt.equals("jpg")){
+            fmt = "png"; //transparency
+        }
+        return fmt;
     }
 
     @Override
     public BufferedImage getImage(List<Tag> tags) {
         try {
-            return ImageIO.read(new ByteArrayInputStream(imageData));
+            BufferedImage img=ImageIO.read(new ByteArrayInputStream(imageData));
+            BufferedImage img2=new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_INT_ARGB);
+            for(int y=0;y<img.getHeight();y++){
+                for(int x=0;x<img.getWidth();x++){
+                    int val=img.getRGB(x, y);
+                    int a = bitmapAlphaData[x+y*img.getWidth()]&0xff;
+                    val = (val&0xffffff) | (a<<24);
+                    img2.setRGB(x, y, val);
+                }
+            }
+            return img2;
         } catch (IOException ex) {
         }
         return null;
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java
index d9658bdb9..e930b2d09 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java
@@ -51,7 +51,11 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag {
 
     @Override
     public String getImageFormat() {
-        return ImageTag.getImageFormat(imageData);
+        String fmt=ImageTag.getImageFormat(imageData);
+        if(fmt.equals("jpg")){
+            fmt = "png"; //transparency
+        }
+        return fmt;
     }
 
     @Override
@@ -79,7 +83,17 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag {
     @Override
     public BufferedImage getImage(List<Tag> tags) {
         try {
-            return ImageIO.read(new ByteArrayInputStream(imageData));
+            BufferedImage img=ImageIO.read(new ByteArrayInputStream(imageData));
+            BufferedImage img2=new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_INT_ARGB);
+            for(int y=0;y<img.getHeight();y++){
+                for(int x=0;x<img.getWidth();x++){
+                    int val=img.getRGB(x, y);
+                    int a = bitmapAlphaData[x+y*img.getWidth()]&0xff;
+                    val = (val&0xffffff) | (a<<24);
+                    img2.setRGB(x, y, val);
+                }
+            }
+            return img2;
         } catch (IOException ex) {
         }
         return null;