GraphicsMagick: coders/jp2.c: Fix compilation with JasPer 3.0.0 ...

changeset 3e86bcc1251e in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=3e86bcc1251e
summary: coders/jp2.c: Fix compilation with JasPer 3.0.0 (which is now released).

diffstat:

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

diffs (98 lines):

diff -r 3207580e44c9 -r 3e86bcc1251e ChangeLog
--- a/ChangeLog	Sat Feb 05 16:47:11 2022 -0600
+++ b/ChangeLog	Sun Feb 06 09:10:16 2022 -0600
@@ -1,3 +1,8 @@
+2022-02-06  Bob Friesenhahn  <[email protected]>
+
+        * coders/jp2.c: Fix compilation with JasPer 3.0.0 (which is now
+        released).
+
 2022-02-05  Bob Friesenhahn  <[email protected]>
 
         * magick/fx.c (ColorizeImagePixelsCB): Apply clipping and rounding
diff -r 3207580e44c9 -r 3e86bcc1251e VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sat Feb 05 16:47:11 2022 -0600
+++ b/VisualMagick/installer/inc/version.isx	Sun Feb 06 09:10:16 2022 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020220205"
-#define public MagickPackageReleaseDate "snapshot-20220205"
+#define public MagickPackageVersionAddendum ".020220206"
+#define public MagickPackageReleaseDate "snapshot-20220206"
diff -r 3207580e44c9 -r 3e86bcc1251e coders/jp2.c
--- a/coders/jp2.c	Sat Feb 05 16:47:11 2022 -0600
+++ b/coders/jp2.c	Sun Feb 06 09:10:16 2022 -0600
@@ -332,17 +332,17 @@
   int (*write_)(jas_stream_obj_t *obj, const char *buf, unsigned cnt);
 
   In Jasper 3.0.0 the interface changed again:
-  jas_ssize_t (*read_)(jas_stream_obj_t *obj, char *buf, size_t cnt);
-  jas_ssize_t (*write_)(jas_stream_obj_t *obj, const char *buf, size_t cnt);
+  ssize_t (*read_)(jas_stream_obj_t *obj, char *buf, size_t cnt);
+  ssize_t (*write_)(jas_stream_obj_t *obj, const char *buf, size_t cnt);
 
   We have yet to find a useful way to determine the version of the
   JasPer library using the C pre-processor.
  */
 
 /* Read characters from a file object. */
-/* jas_ssize_t (*read_)(jas_stream_obj_t *obj, char *buf, size_t cnt); */
+/* ssize_t (*read_)(jas_stream_obj_t *obj, char *buf, size_t cnt); */
 #if defined(HAVE_JAS_STREAM_IO_V3)
-static jas_ssize_t BlobRead(jas_stream_obj_t *obj, char *buf, size_t cnt)
+static ssize_t BlobRead(jas_stream_obj_t *obj, char *buf, size_t cnt)
 #else
 static int BlobRead(jas_stream_obj_t *obj, char *buf, unsigned cnt)
 #endif
@@ -358,9 +358,9 @@
 }
 
 /* Write characters to a file object. */
-/* jas_ssize_t (*write_)(jas_stream_obj_t *obj, const char *buf, size_t cnt); */
+/* ssize_t (*write_)(jas_stream_obj_t *obj, const char *buf, size_t cnt); */
 #if defined(HAVE_JAS_STREAM_IO_V3)
-static jas_ssize_t  BlobWrite(jas_stream_obj_t *obj, const char *buf, size_t cnt)
+static ssize_t  BlobWrite(jas_stream_obj_t *obj, const char *buf, size_t cnt)
 #else
 static int BlobWrite(jas_stream_obj_t *obj, const char *buf, unsigned cnt)
 #endif
diff -r 3207580e44c9 -r 3e86bcc1251e magick/fx.c
--- a/magick/fx.c	Sat Feb 05 16:47:11 2022 -0600
+++ b/magick/fx.c	Sun Feb 06 09:10:16 2022 -0600
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003-2019 GraphicsMagick Group
+% Copyright (C) 2003-2022 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 % Copyright 1991-1999 E. I. du Pont de Nemours and Company
 %
diff -r 3207580e44c9 -r 3e86bcc1251e magick/version.h
--- a/magick/version.h	Sat Feb 05 16:47:11 2022 -0600
+++ b/magick/version.h	Sun Feb 06 09:10:16 2022 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x262300
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 26,23,0
-#define MagickChangeDate   "20220205"
-#define MagickReleaseDate  "snapshot-20220205"
+#define MagickChangeDate   "20220206"
+#define MagickReleaseDate  "snapshot-20220206"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 3207580e44c9 -r 3e86bcc1251e www/Changelog.html
--- a/www/Changelog.html	Sat Feb 05 16:47:11 2022 -0600
+++ b/www/Changelog.html	Sun Feb 06 09:10:16 2022 -0600
@@ -35,6 +35,10 @@
 <div class="document">
 
 
+<p>2022-02-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>
+* coders/jp2.c: Fix compilation with JasPer 3.0.0 (which is now
+released).</blockquote>
 <p>2022-02-05  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>
 * magick/fx.c (ColorizeImagePixelsCB): Apply clipping and rounding