GraphicsMagick: HRZ: Fix RegisterHRZImage() settings. Add HRZ t...

changeset 09390431d3d4 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=09390431d3d4
summary: HRZ: Fix RegisterHRZImage() settings.  Add HRZ to rwblob.tap and rwfile.tap.

diffstat:

 ChangeLog          |   7 +++++++
 coders/hrz.c       |   4 +++-
 tests/rwblob.tap   |  10 ++++++++--
 tests/rwfile.tap   |  11 +++++++++--
 www/ChangeLog.html |   8 ++++++++
 5 files changed, 35 insertions(+), 5 deletions(-)

diffs (121 lines):

diff -r 519a0e693923 -r 09390431d3d4 ChangeLog
--- a/ChangeLog	Wed Feb 21 07:19:49 2024 -0600
+++ b/ChangeLog	Wed Feb 21 07:50:53 2024 -0600
@@ -1,3 +1,10 @@
+2024-02-21  Bob Friesenhahn  <[email protected]>
+
+	* tests/{rwblob.tap, rwfile.tap}: Add HRZ to sanity checks.
+
+	* coders/hrz.c (RegisterHRZImage): Set 'seekable_stream' and
+	'adjoin' correctly.
+
 2024-02-21  Fojtik Jaroslav  <[email protected]>
 
 	* coders/hrz.c: Provide writer.
diff -r 519a0e693923 -r 09390431d3d4 coders/hrz.c
--- a/coders/hrz.c	Wed Feb 21 07:19:49 2024 -0600
+++ b/coders/hrz.c	Wed Feb 21 07:50:53 2024 -0600
@@ -207,7 +207,7 @@
   /*
     Allocate memory for pixels.
   */
-  pixels = MagickAllocateResourceLimitedMemory(unsigned char *,(size_t)hrz_image->columns*3*sizeof(*pixels));
+  pixels = MagickAllocateResourceLimitedArray(unsigned char *,(size_t)hrz_image->columns,3*sizeof(*pixels));
   if(pixels == (unsigned char *) NULL)
   {
     DestroyImage(hrz_image);
@@ -288,8 +288,10 @@
   entry=SetMagickInfo("HRZ");
   entry->decoder = (DecoderHandler)ReadHRZImage;
   entry->encoder = (EncoderHandler)WriteHRZImage;
+  entry->seekable_stream=MagickTrue; /* FIXME: Requiring this is a bug */
   entry->description="HRZ: Slow scan TV";
   entry->module="HRZ";
+  entry->adjoin=MagickFalse;
   (void) RegisterMagickInfo(entry);
 }
 
diff -r 519a0e693923 -r 09390431d3d4 tests/rwblob.tap
--- a/tests/rwblob.tap	Wed Feb 21 07:19:49 2024 -0600
+++ b/tests/rwblob.tap	Wed Feb 21 07:50:53 2024 -0600
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2004-2023 GraphicsMagick Group
+# Copyright (C) 2004-2024 GraphicsMagick Group
 . ./common.shi
 . ${top_srcdir}/tests/common.shi
 
@@ -10,7 +10,7 @@
 check_types='bilevel gray palette truecolor'
 
 # Number of tests we plan to run
-test_plan_fn 213
+test_plan_fn 217
 
 # ART format
 for type in ${check_types}
@@ -116,6 +116,12 @@
   test_command_fn "GIF87 ${type}" ${MEMCHECK} ${rwblob} "${SRCDIR}/input_${type}.miff" GIF87
 done
 
+# HRZ format
+for type in ${check_types}
+do
+  test_command_fn "HRZ ${type}" ${MEMCHECK} ${rwblob} "${SRCDIR}/input_${type}.miff" HRZ
+done
+
 # JBIG format
 for type in ${check_types}
 do
diff -r 519a0e693923 -r 09390431d3d4 tests/rwfile.tap
--- a/tests/rwfile.tap	Wed Feb 21 07:19:49 2024 -0600
+++ b/tests/rwfile.tap	Wed Feb 21 07:50:53 2024 -0600
@@ -1,6 +1,6 @@
 #!/bin/sh
 # -*- shell-script -*-
-# Copyright (C) 2004-2023 GraphicsMagick Group
+# Copyright (C) 2004-2024 GraphicsMagick Group
 . ./common.shi
 . ${top_srcdir}/tests/common.shi
 
@@ -12,7 +12,7 @@
 check_types_noone='bilevel gray palette truecolor'
 
 # Number of tests we plan to run
-test_plan_fn 838 # 828
+test_plan_fn 848
 
 # ART format
 for type in ${check_types}
@@ -161,6 +161,13 @@
   test_command_fn "GRAY ${type} (stdio)" ${MEMCHECK} ${rwfile} -stdio -filespec "out_${type}_stdio_%d" "${SRCDIR}/input_${type}.miff" GRAY
 done
 
+# HRZ format
+for type in ${check_types}
+do
+  test_command_fn "HRZ ${type}" ${MEMCHECK} ${rwfile} -filespec "out_${type}_%d" "${SRCDIR}/input_${type}.miff" HRZ
+  test_command_fn "HRZ ${type} (stdio)" ${MEMCHECK} ${rwfile} -stdio -filespec "out_${type}_stdio_%d" "${SRCDIR}/input_${type}.miff" HRZ
+done
+
 # ICB format
 for type in ${check_types}
 do
diff -r 519a0e693923 -r 09390431d3d4 www/ChangeLog.html
--- a/www/ChangeLog.html	Wed Feb 21 07:19:49 2024 -0600
+++ b/www/ChangeLog.html	Wed Feb 21 07:50:53 2024 -0600
@@ -38,6 +38,14 @@
 
 <div class="document" id="graphicsmagick-changelog">
 <h1 class="title">GraphicsMagick ChangeLog</h1>
+<p>2024-02-21  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>tests/{rwblob.tap, rwfile.tap}: Add HRZ to sanity checks.</p></li>
+<li><p>coders/hrz.c (RegisterHRZImage): Set 'seekable_stream' and
+'adjoin' correctly.</p></li>
+</ul>
+</blockquote>
 <p>2024-02-21  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">