Commit c91a6f66e for imagemagick.org

commit c91a6f66e5af5b0329ac347838e00fd57845fd23
Author: Greg B <64932474+gregbenz@users.noreply.github.com>
Date:   Mon Sep 7 06:51:43 2026 -0500

    Preserve JPEG comments during automatic Ultra HDR decoding (#8943)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 917beca45..c6d9cba81 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1619,6 +1619,7 @@ static Image *ReadOneJPEGImage(const ImageInfo *image_info,
         MagickFalse))
     {
       const char
+        *comment,
         *sampling_factor;

       ExceptionInfo
@@ -1657,6 +1658,9 @@ static Image *ReadOneJPEGImage(const ImageInfo *image_info,
           if (sampling_factor != (const char *) NULL)
             (void) SetImageProperty(uhdr_image,"jpeg:sampling-factor",
               sampling_factor,exception);
+          comment=GetImageProperty(image,"comment",exception);
+          if (comment != (const char *) NULL)
+            (void) SetImageProperty(uhdr_image,"comment",comment,exception);
           InheritException(exception,uhdr_exception);
           uhdr_exception=DestroyExceptionInfo(uhdr_exception);
           client_info=JPEGCleanup(jpeg_info,client_info);
diff --git a/tests/cli-uhdr.tap b/tests/cli-uhdr.tap
index 1299b4089..a12cd72c8 100755
--- a/tests/cli-uhdr.tap
+++ b/tests/cli-uhdr.tap
@@ -27,14 +27,21 @@ locale_output=cli-uhdr-offset-locale.jpg
 jpeg_probe=cli-uhdr-jpeg-probe.jpg
 whitespace_output=cli-uhdr-offset-whitespace.jpg
 invalid_output=cli-uhdr-offset-invalid.jpg
+commented_source=cli-uhdr-commented.jpg
+comment_roundtrip=cli-uhdr-comment-roundtrip.jpg
+comment_linear=cli-uhdr-comment-roundtrip-linear.miff
 capacity_min=1.00000012
 capacity_max=2.00000024
 expected_offsets='1.00000001e-07,1.00000001e-07,1.00000001e-07 1.00000001e-07,1.00000001e-07,1.00000001e-07'
+source_comment='comments-local-baseline
+comments-local-second-line'

 cleanup()
 {
   rm -f "$raw_source" "$source" "$output" "$transformed_output" \
     "$locale_output" "$jpeg_probe" "$whitespace_output" "$invalid_output"
+  rm -f "$commented_source" "$comment_roundtrip" \
+    "$comment_linear"
 }

 check_value()
@@ -74,7 +81,7 @@ if [ "X$jpeg_format" != "XJPEG" ]; then
   exit 0
 fi

-echo "1..11"
+echo "1..13"
 if ! ${MAGICK} \( "${SRCDIR}/rose.pnm" -depth 8 \) \
     \( "${SRCDIR}/rose.pnm" -depth 16 \) \
     -define uhdr:hdr-color-transfer=linear "UHDR:$raw_source" \
@@ -91,6 +98,12 @@ if ! ${MAGICK} "UHDR:$raw_source" \
   cleanup
   exit 0
 fi
+if ! ${MAGICK} "UHDR:$source" -set comment "$source_comment" \
+    "UHDR:$commented_source" >/dev/null 2>&1; then
+  echo "Bail out! unable to create UHDR comment fixture"
+  cleanup
+  exit 0
+fi

 if ${MAGICK} "UHDR:$source" \
     -set hdrgm:OffsetSDR ' 0.0000001 , 0.0000001 , 0.0000001 ' \
@@ -186,6 +199,47 @@ check_value "offset values survive a geometry transform" \
 check_value "capacity values survive a geometry transform" \
   "$transformed_capacity" "$capacity_min $capacity_max"

+comment_status=0
+comment_value=`${IDENTIFY} -quiet -format '%[comment]' "$commented_source" \
+  2>/dev/null` || comment_status=$?
+if [ "$comment_status" = "0" ] && [ "X$comment_value" = "X$source_comment" ]; then
+  echo "ok - automatic UHDR JPEG read preserves the base comment"
+else
+  echo "not ok - automatic UHDR JPEG read preserves the base comment"
+  echo "# expected '$source_comment', got '$comment_value' (status $comment_status)"
+fi
+
+roundtrip_status=0
+if ${MAGICK} "$commented_source" "$comment_roundtrip" >/dev/null 2>&1; then
+  base_comment_status=0
+  base_comment=`${MAGICK} -define jpeg:detect-uhdr=false "$comment_roundtrip" \
+    -format '%[comment]' info: 2>/dev/null` || base_comment_status=$?
+  decode_status=0
+  ${MAGICK} -define uhdr:output-color-transfer=linear \
+    "UHDR:$comment_roundtrip" "$comment_linear" >/dev/null 2>&1 || \
+    decode_status=$?
+  profile_status=0
+  profile_decode=`${IDENTIFY} -quiet -format '%m|%[profiles]' \
+    "UHDR:$comment_roundtrip" 2>/dev/null` || profile_status=$?
+  profile_ok=0
+  case "$profile_decode" in
+    UHDR\|*hdrgm*) profile_ok=1 ;;
+  esac
+  if [ "$base_comment_status" = "0" ] && \
+      [ "X$base_comment" = "X$source_comment" ] && \
+      [ "$decode_status" = "0" ] && [ "$profile_status" = "0" ] && \
+      [ "$profile_ok" = "1" ]; then
+    echo "ok - automatic UHDR roundtrip preserves comment and HDR decode"
+  else
+    echo "not ok - automatic UHDR roundtrip preserves comment and HDR decode"
+    echo "# expected '$source_comment', got '$base_comment' (comment status $base_comment_status, decode status $decode_status, profile status $profile_status, profile '$profile_decode')"
+  fi
+else
+  roundtrip_status=$?
+  echo "not ok - automatic UHDR roundtrip preserves comment and HDR decode"
+  echo "# UHDR write failed (status $roundtrip_status)"
+fi
+
 comma_locale=
 for candidate in de_DE.UTF-8 fr_FR.UTF-8 nl_NL.UTF-8; do
   decimal_point=`LC_ALL=$candidate locale decimal_point 2>/dev/null`