GraphicsMagick: ReadJXLImage(): Request that libjxl take care of...

changeset bfc24cfa6b27 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=bfc24cfa6b27
summary: ReadJXLImage(): Request that libjxl take care of any pre-multiplied alpha for us so we don't need to do it

diffstat:

 ChangeLog          |  15 ++++++++++-----
 NEWS.txt           |   7 +++++--
 coders/jxl.c       |   3 +++
 www/Changelog.html |   8 ++++++++
 www/NEWS.html      |   6 ++++--
 5 files changed, 30 insertions(+), 9 deletions(-)

diffs (123 lines):

diff -r abf40851d8c0 -r bfc24cfa6b27 ChangeLog
--- a/ChangeLog	Sat Dec 24 10:46:39 2022 -0600
+++ b/ChangeLog	Sat Dec 24 16:05:54 2022 -0600
@@ -1,8 +1,14 @@
+2022-12-24  Bob Friesenhahn  <[email protected]>
+
+	* NEWS.txt: Updated the news.
+
+	* coders/jxl.c (ReadJXLImage): Request that libjxl take care of
+	any pre-multiplied alpha for us so we don't need to do it
+
 2022-12-24 Fojtik Jaroslav  <[email protected]>
 
 	* jp2/* Update lib jasper to 1.900.5.
 
-
 2022-12-23  Bob Friesenhahn  <[email protected]>
 
 	* coders/jxl.c: Support reading and writing ICC, EXIF, and XMP
@@ -48,14 +54,13 @@
 2022-12-17 Fojtik Jaroslav  <[email protected]>
         * VisualMagick/magick/magick_types.h.in
 	Reverting from 16859. The change in 16860 completelly breaks
-        compillation.
+	compillation.
 
 2022-12-17 Fojtik Jaroslav  <[email protected]>
 
 	* tiff/port/libport_config.h Added missing file
 	Documentation of libtiff upgraded.
-        Upgraded libtiff to 4.5.0.
-
+	Upgraded libtiff to 4.5.0.
 
 2022-12-17  Bob Friesenhahn  <[email protected]>
 
@@ -154,7 +159,7 @@
 	coders/ps3.c
 	coders/tiff.c
 	webp/src/webp/types.h
-        tiff/libtiff/* Upgraded libtiff to libtiff-4.4.0
+	tiff/libtiff/* Upgraded libtiff to libtiff-4.4.0
 	But code is still compilable with MSVC2008!
 
 2022-11-27  Bob Friesenhahn  <[email protected]>
diff -r abf40851d8c0 -r bfc24cfa6b27 NEWS.txt
--- a/NEWS.txt	Sat Dec 24 10:46:39 2022 -0600
+++ b/NEWS.txt	Sat Dec 24 16:05:54 2022 -0600
@@ -141,8 +141,9 @@
   better when reading from files.
 
 * JXL: The JXL coder is updated to compile with what will likely
-  become JXL 0.8.0.  Support for 16-bit 'short' samples and 32-bit
-  float samples added.
+  become JXL 0.8.0.  Support for 16-bit 'short' samples, 16-bit
+  'float' samples, and 32-bit float samples added.  Suppor for reading
+  and writing ICC, EXIF, and XMP profiles added.
 
 * MIME: GM "magick" to MIME mappings have been added for apng, avif,
   bmp, ico, and webp (regardless of if they are supported).
@@ -156,6 +157,8 @@
 
 Windows Delegate Updates/Additions:
 
+* Update bundled libjasper to version 1.900.5.
+
 * Update bundled libjpeg to version 9e.
 
 * Update bundled libtiff to version 4.5.0 (but still compilable using MSVC2008!).
diff -r abf40851d8c0 -r bfc24cfa6b27 coders/jxl.c
--- a/coders/jxl.c	Sat Dec 24 10:46:39 2022 -0600
+++ b/coders/jxl.c	Sat Dec 24 16:05:54 2022 -0600
@@ -381,6 +381,9 @@
   if (JxlDecoderSetKeepOrientation(jxl_decoder, JXL_TRUE) != JXL_DEC_SUCCESS)
     ThrowJXLReaderException(ResourceLimitError,MemoryAllocationFailed,image);
 
+  /* Apply any pre-multiplied alpha for us so we don't need to do it. */
+  (void) JxlDecoderSetUnpremultiplyAlpha(jxl_decoder, JXL_TRUE);
+
   if(!image_info->ping)
     {
       jxl_thread_runner=JxlThreadParallelRunnerCreate(NULL,(size_t) GetMagickResourceLimit(ThreadsResource));
diff -r abf40851d8c0 -r bfc24cfa6b27 www/Changelog.html
--- a/www/Changelog.html	Sat Dec 24 10:46:39 2022 -0600
+++ b/www/Changelog.html	Sat Dec 24 16:05:54 2022 -0600
@@ -37,6 +37,14 @@
 </div>
 
 <div class="document">
+<p>2022-12-24  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">
+<li><p>NEWS.txt: Updated the news.</p></li>
+<li><p>coders/jxl.c (ReadJXLImage): Request that libjxl take care of
+any pre-multiplied alpha for us so we don't need to do it</p></li>
+</ul>
+</blockquote>
 <p>2022-12-24 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">
diff -r abf40851d8c0 -r bfc24cfa6b27 www/NEWS.html
--- a/www/NEWS.html	Sat Dec 24 10:46:39 2022 -0600
+++ b/www/NEWS.html	Sat Dec 24 16:05:54 2022 -0600
@@ -190,8 +190,9 @@
 <li><p>Blob: The ReadBlobString() function has been re-written to perform
 better when reading from files.</p></li>
 <li><p>JXL: The JXL coder is updated to compile with what will likely
-become JXL 0.8.0.  Support for 16-bit 'short' samples and 32-bit
-float samples added.</p></li>
+become JXL 0.8.0.  Support for 16-bit 'short' samples, 16-bit
+'float' samples, and 32-bit float samples added.  Suppor for reading
+and writing ICC, EXIF, and XMP profiles added.</p></li>
 <li><p>MIME: GM &quot;magick&quot; to MIME mappings have been added for apng, avif,
 bmp, ico, and webp (regardless of if they are supported).</p></li>
 <li><p>XPM: The XPM reader performance is dramatically improved and is
@@ -202,6 +203,7 @@
 </ul>
 <p>Windows Delegate Updates/Additions:</p>
 <ul class="simple">
+<li><p>Update bundled libjasper to version 1.900.5.</p></li>
 <li><p>Update bundled libjpeg to version 9e.</p></li>
 <li><p>Update bundled libtiff to version 4.5.0 (but still compilable using MSVC2008!).</p></li>
 </ul>