GraphicsMagick: 2 new changesets

changeset 21bd550a6024 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=21bd550a6024
summary: coders/tga.c: Write correctly TGA with opacity values in palette.

changeset d613dd1c2ce9 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=d613dd1c2ce9
summary: Update generated files

diffstat:

 ChangeLog                              |   4 ++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 coders/tga.c                           |  11 ++++++-----
 magick/version.h                       |   4 ++--
 www/ChangeLog.html                     |   6 ++++++
 5 files changed, 20 insertions(+), 9 deletions(-)

diffs (95 lines):

diff -r df3d76d21d7e -r d613dd1c2ce9 ChangeLog
--- a/ChangeLog	Wed Apr 10 10:42:08 2024 -0500
+++ b/ChangeLog	Thu Apr 11 16:38:16 2024 -0500
@@ -1,3 +1,7 @@
+2024-04-11  Fojtik Jaroslav  <[email protected]>
+
+	* coders/tga.c: Write correctly TGA with opacity values in palette.
+
 2024-04-10  Bob Friesenhahn  <[email protected]>
 
 	* magick/module_aliases.h: Only include module alias when there
diff -r df3d76d21d7e -r d613dd1c2ce9 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Wed Apr 10 10:42:08 2024 -0500
+++ b/VisualMagick/installer/inc/version.isx	Thu Apr 11 16:38:16 2024 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020240410"
-#define public MagickPackageReleaseDate "snapshot-20240410"
+#define public MagickPackageVersionAddendum ".020240411"
+#define public MagickPackageReleaseDate "snapshot-20240411"
diff -r df3d76d21d7e -r d613dd1c2ce9 coders/tga.c
--- a/coders/tga.c	Wed Apr 10 10:42:08 2024 -0500
+++ b/coders/tga.c	Thu Apr 11 16:38:16 2024 -0500
@@ -1123,8 +1123,7 @@
       */
       if (((write_grayscale == MagickFalse) &&
            (image->storage_class == PseudoClass) &&
-           (image->colors > 256)) ||
-          (image->matte == MagickTrue))
+           (image->colors > 256)))
         {
           /* (void) SyncImage(image); */
           image->storage_class=DirectClass;
@@ -1191,7 +1190,7 @@
           tga_info.colormap_type=1;
           tga_info.colormap_index=0;
           tga_info.colormap_length=(unsigned short) image->colors;
-          tga_info.colormap_size=24;
+          tga_info.colormap_size = (image->matte==MagickTrue) ? 32 : 24;
         }
 
       switch(image->orientation)
@@ -1239,7 +1238,7 @@
             Dump colormap to file (blue, green, red byte order).
           */
           targa_colormap=MagickAllocateResourceLimitedArray(unsigned char *,
-                                                            tga_info.colormap_length,3);
+                                                            tga_info.colormap_length, tga_info.colormap_size/8);
           if (targa_colormap == (unsigned char *) NULL)
             ThrowWriterException(ResourceLimitError,MemoryAllocationFailed,
                                  image);
@@ -1249,8 +1248,10 @@
               *q++=ScaleQuantumToChar(image->colormap[i].blue);
               *q++=ScaleQuantumToChar(image->colormap[i].green);
               *q++=ScaleQuantumToChar(image->colormap[i].red);
+              if(tga_info.colormap_size==32)
+                  *q++=ScaleQuantumToChar(image->colormap[i].opacity);
             }
-          (void) WriteBlob(image, (size_t)3*tga_info.colormap_length,
+          (void) WriteBlob(image, (size_t)(tga_info.colormap_size/8)*tga_info.colormap_length,
                            (char *) targa_colormap);
           MagickFreeResourceLimitedMemory(targa_colormap);
         }
diff -r df3d76d21d7e -r d613dd1c2ce9 magick/version.h
--- a/magick/version.h	Wed Apr 10 10:42:08 2024 -0500
+++ b/magick/version.h	Thu Apr 11 16:38:16 2024 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x282500
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 28,25,0
-#define MagickChangeDate   "20240410"
-#define MagickReleaseDate  "snapshot-20240410"
+#define MagickChangeDate   "20240411"
+#define MagickReleaseDate  "snapshot-20240411"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r df3d76d21d7e -r d613dd1c2ce9 www/ChangeLog.html
--- a/www/ChangeLog.html	Wed Apr 10 10:42:08 2024 -0500
+++ b/www/ChangeLog.html	Thu Apr 11 16:38:16 2024 -0500
@@ -38,6 +38,12 @@
 
 <div class="document" id="graphicsmagick-changelog">
 <h1 class="title">GraphicsMagick ChangeLog</h1>
+<p>2024-04-11  Fojtik Jaroslav  &lt;<a class="reference external" href="mailto:JaFojtik&#37;&#52;&#48;yandex&#46;com">JaFojtik<span>&#64;</span>yandex<span>&#46;</span>com</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/tga.c: Write correctly TGA with opacity values in palette.</p></li>
+</ul>
+</blockquote>
 <p>2024-04-10  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">