From 618ad9b3870c1d3fdf042dd76a99dbcbc0a39476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Fri, 9 May 2025 14:40:44 +0200
Subject: [PATCH] Fixed again: #2454 SVG export - color matrix not applied to
 images. Note: a conversion to PNG applied. This would make larger files for
 JPEG inputs :-(.

---
 .../exporters/shape/SVGShapeExporter.java     | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
index 9027d3b5f..123b68e54 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
@@ -33,6 +33,9 @@ import com.jpexs.decompiler.flash.types.SHAPE;
 import com.jpexs.helpers.Helper;
 import com.jpexs.helpers.SerializableImage;
 import java.awt.Color;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import javax.imageio.ImageIO;
 import org.w3c.dom.Element;
 
 /**
@@ -143,16 +146,31 @@ public class SVGShapeExporter extends DefaultSVGShapeExporter {
         if (image != null) {
             SerializableImage img = image.getImageCached();
             if (img != null) {
-                if (colorTransform != null) {
-                    img = colorTransform.apply(img);
-                }
-
                 int width = img.getWidth();
                 int height = img.getHeight();
                 lastPatternId++;
                 String patternId = "PatternID_" + id + "_" + lastPatternId;
                 ImageFormat format = image.getImageFormat();
                 byte[] imageData = Helper.readStream(image.getConvertedImageData());
+                
+                if (colorTransform != null) {
+                    //Apply transform and convert it to PNG.
+                    //If we use the same format as input, then we would lose quality for JPEGs.
+                    //This will also make significantly larger files for JPEGs.
+                    //It would be better if we use a SVG filter for colormatrix transform,
+                    //but that will be problematic during importing it back (we cannot properly parse filters)
+                    
+                    img = colorTransform.apply(img);
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    try {
+                        ImageIO.write(img.getBufferedImage(), "PNG", baos);
+                    } catch (IOException iex) {
+                        //ignore
+                    }
+                    imageData = baos.toByteArray();
+                    format = ImageFormat.PNG;
+                }
+                
                 String base64ImgData = Helper.byteArrayToBase64String(imageData);
 
                 Element pattern = exporter.createElement("pattern");