GraphicsMagick: RGBTransformImage(): Move cast in primary_info.x...

GraphicsMagick Commits <[email protected]> Tue, 07 Nov 2023 07:56:40 -0600
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.15651.1699365408.7975.graphicsmagick-commit@lists.sourceforge.net>
changeset 7e7556380183 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=7e7556380183
summary: RGBTransformImage(): Move cast in primary_info.x and primary_info.y calcuation.

diffstat:

 ChangeLog                              |   5 +++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 magick/colorspace.c                    |  24 ++++++++++++------------
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |  11 +++++++++++
 5 files changed, 32 insertions(+), 16 deletions(-)

diffs (129 lines):

diff -r 6a6ef48daf48 -r 7e7556380183 ChangeLog
--- a/ChangeLog	Tue Nov 07 01:39:11 2023 +0100
+++ b/ChangeLog	Tue Nov 07 07:56:34 2023 -0600
@@ -1,5 +1,10 @@
 2023-11-07  Bob Friesenhahn  <[email protected]>
 
+	* magick/colorspace.c (RGBTransformImage): Move cast in
+	primary_info.x and primary_info.y calcuation.  Addresses concern
+	expressed in SourceForge issue #730 "Recent colorspace conversion
+	change".
+
 	* coders/wpg.c Revert
 	* coders/mat.c Prevent against geometry injection.
 
diff -r 6a6ef48daf48 -r 7e7556380183 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Tue Nov 07 01:39:11 2023 +0100
+++ b/VisualMagick/installer/inc/version.isx	Tue Nov 07 07:56:34 2023 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020231106"
-#define public MagickPackageReleaseDate "snapshot-20231106"
+#define public MagickPackageVersionAddendum ".020231107"
+#define public MagickPackageReleaseDate "snapshot-20231107"
diff -r 6a6ef48daf48 -r 7e7556380183 magick/colorspace.c
--- a/magick/colorspace.c	Tue Nov 07 01:39:11 2023 +0100
+++ b/magick/colorspace.c	Tue Nov 07 07:56:34 2023 -0600
@@ -634,8 +634,8 @@
             I and Q, normally -0.5 through 0.5, are normalized to the range 0
             through MaxRGB.
           */
-          xform.primary_info.y=(((float) MaxMap+1)/2);
-          xform.primary_info.z=(((float) MaxMap+1)/2);
+          xform.primary_info.y=(float) ((MaxMap+1)/2);
+          xform.primary_info.z=(float) ((MaxMap+1)/2);
 #if MaxMap > 255
 #  if defined(HAVE_OPENMP)
 #    pragma omp parallel for schedule(static,64)
@@ -738,8 +738,8 @@
             Cb and Cr, normally -0.5 through 0.5, are normalized to the range 0
             through MaxRGB.
           */
-          xform.primary_info.y=(((float) MaxMap+1)/2);
-          xform.primary_info.z=(((float) MaxMap+1)/2);
+          xform.primary_info.y=(float) ((MaxMap+1)/2);
+          xform.primary_info.z=(float) ((MaxMap+1)/2);
 #if MaxMap > 255
 #  if defined(HAVE_OPENMP)
 #    pragma omp parallel for schedule(static,64)
@@ -771,8 +771,8 @@
             Cb and Cr, normally -0.5 through 0.5, are normalized to the range 0
             through MaxRGB.
           */
-          xform.primary_info.y=(((float) MaxMap+1)/2);
-          xform.primary_info.z=(((float) MaxMap+1)/2);
+          xform.primary_info.y=(float) ((MaxMap+1)/2);
+          xform.primary_info.z=(float) ((MaxMap+1)/2);
 #if MaxMap > 255
 #  if defined(HAVE_OPENMP)
 #    pragma omp parallel for schedule(static,64)
@@ -847,8 +847,8 @@
             I and Q, normally -0.5 through 0.5, are normalized to the range 0
             through MaxRGB.
           */
-          xform.primary_info.y=(((float) MaxMap+1)/2);
-          xform.primary_info.z=(((float) MaxMap+1)/2);
+          xform.primary_info.y=(float) ((MaxMap+1)/2);
+          xform.primary_info.z=(float) ((MaxMap+1)/2);
 #if MaxMap > 255
 #  if defined(HAVE_OPENMP)
 #    pragma omp parallel for schedule(static,64)
@@ -880,8 +880,8 @@
             Pb and Pr, normally -0.5 through 0.5, are normalized to the range 0
             through MaxRGB.
           */
-          xform.primary_info.y=(((float) MaxMap+1)/2);
-          xform.primary_info.z=(((float) MaxMap+1)/2);
+          xform.primary_info.y=(float) ((MaxMap+1)/2);
+          xform.primary_info.z=(float) ((MaxMap+1)/2);
 #if MaxMap > 255
 #  if defined(HAVE_OPENMP)
 #    pragma omp parallel for schedule(static,64)
@@ -914,8 +914,8 @@
             U and V, normally -0.5 through 0.5, are normalized to the range 0
             through MaxRGB.  Note that U = 0.493*(B-Y), V = 0.877*(R-Y).
           */
-          xform.primary_info.y=(((float) MaxMap+1)/2);
-          xform.primary_info.z=(((float) MaxMap+1)/2);
+          xform.primary_info.y=(float) ((MaxMap+1)/2);
+          xform.primary_info.z=(float) ((MaxMap+1)/2);
 #if MaxMap > 255
 #  if defined(HAVE_OPENMP)
 #    pragma omp parallel for schedule(static,64)
diff -r 6a6ef48daf48 -r 7e7556380183 magick/version.h
--- a/magick/version.h	Tue Nov 07 01:39:11 2023 +0100
+++ b/magick/version.h	Tue Nov 07 07:56:34 2023 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272404
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,4
-#define MagickChangeDate   "20231106"
-#define MagickReleaseDate  "snapshot-20231106"
+#define MagickChangeDate   "20231107"
+#define MagickReleaseDate  "snapshot-20231107"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 6a6ef48daf48 -r 7e7556380183 www/Changelog.html
--- a/www/Changelog.html	Tue Nov 07 01:39:11 2023 +0100
+++ b/www/Changelog.html	Tue Nov 07 07:56:34 2023 -0600
@@ -37,6 +37,17 @@
 </div>
 
 <div class="document">
+<p>2023-11-07  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>magick/colorspace.c (RGBTransformImage): Move cast in
+primary_info.x and primary_info.y calcuation.  Addresses concern
+expressed in SourceForge issue #730 &quot;Recent colorspace conversion
+change&quot;.</p></li>
+<li><p>coders/wpg.c Revert</p></li>
+<li><p>coders/mat.c Prevent against geometry injection.</p></li>
+</ul>
+</blockquote>
 <p>2023-11-06  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">