🐛 Fix exporting TIFF RGB images

SceneGate · Oct 1, 2023 · f9c54b3 · f9c54b3
1 parent bd7a571
commit f9c54b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Texim/Formats/Sprite2Tiff.cs b/src/Texim/Formats/Sprite2Tiff.cs
@@ -123,7 +123,7 @@ public TiffImage Convert(ISprite source)
                 page.ColorMap = fullPalette;
                 page.IsIndexed = true;
             } else {
-                page.RgbPixels = layerIndexedImage.CreateFullImage(parameters.Palettes).Pixels;
+                page.RgbPixels = layerIndexedImage.CreateFullImage(parameters.Palettes, true).Pixels;
             }
         }
 

diff --git a/src/Texim/Formats/Tiff2Binary.cs b/src/Texim/Formats/Tiff2Binary.cs
@@ -107,6 +107,7 @@ private static void WriteIndexedPage(Tiff tiff, TiffPage page, int totalPages)
         Assert(tiff.SetField(TiffTag.RESOLUTIONUNIT, ResUnit.INCH));
         Assert(tiff.SetField(TiffTag.PHOTOMETRIC, Photometric.PALETTE));
         Assert(tiff.SetField(TiffTag.EXTRASAMPLES, 1, new short[] { (short)ExtraSample.UNASSALPHA }));
+        Assert(tiff.SetField(TiffTag.COMPRESSION, Compression.LZW));
 
         Assert(tiff.SetField(TiffTag.XPOSITION, page.X / 100.0));
         Assert(tiff.SetField(TiffTag.YPOSITION, page.Y / 100.0));
@@ -148,6 +149,7 @@ private static void WriteRgbPage(Tiff tiff, TiffPage page, int totalPages)
         Assert(tiff.SetField(TiffTag.RESOLUTIONUNIT, ResUnit.INCH));
         Assert(tiff.SetField(TiffTag.EXTRASAMPLES, 1, new short[] { (short)ExtraSample.UNASSALPHA }));
         Assert(tiff.SetField(TiffTag.PHOTOMETRIC, Photometric.RGB));
+        Assert(tiff.SetField(TiffTag.COMPRESSION, Compression.LZW));
 
         Assert(tiff.SetField(TiffTag.XPOSITION, page.X / 100.0));
         Assert(tiff.SetField(TiffTag.YPOSITION, page.Y / 100.0));

diff --git a/src/Texim/Images/Indexed2FullImage.cs b/src/Texim/Images/Indexed2FullImage.cs
@@ -72,14 +72,15 @@ public FullImage Convert(IIndexedImage source)
             var image = new FullImage(source.Width, source.Height);
             for (int i = 0; i < source.Pixels.Length; i++) {
                 IndexedPixel pixel = source.Pixels[i];
-                if (pixel.PaletteIndex > palettes.Palettes.Count) {
-                    throw new FormatException("Missing palettes");
-                }
 
                 if (firstColorAsTransparent && pixel.Index == 0) {
                     // Color may not exists as it could be a
                     // generated transparent pixel with not associated palette.
                     image.Pixels[i] = new Rgb(0, 0, 0, 0);
+                } else if (pixel.PaletteIndex >= palettes.Palettes.Count) {
+                    throw new FormatException($"Missing palette {pixel.PaletteIndex}. Count: {palettes.Palettes.Count}");
+                } else if (pixel.Index >= palettes.Palettes[pixel.PaletteIndex].Colors.Count) {
+                    throw new FormatException($"Missing color {pixel.Index}. Count: {palettes.Palettes[pixel.PaletteIndex].Colors.Count}");
                 } else {
                     var color = palettes.Palettes[pixel.PaletteIndex].Colors[pixel.Index];
                     image.Pixels[i] = (pixel.Alpha == 255) ? color : new Rgb(color, pixel.Alpha);