GraphicsMagick: HEIF/HEIC: If module compiled but HasFOO not def...

changeset 171c0dd24d8a in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=171c0dd24d8a
summary: HEIF/HEIC: If module compiled but HasFOO not defined, then provide empty register/unregister implementations.

diffstat:

 ChangeLog                              |  10 ++++++++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 coders/heif.c                          |  17 ++++++++---------
 coders/jxl.c                           |   8 +++++---
 magick/static.c                        |   2 +-
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |   9 +++++++++
 7 files changed, 37 insertions(+), 17 deletions(-)

diffs (211 lines):

diff -r 6067712c2819 -r 171c0dd24d8a ChangeLog
--- a/ChangeLog	Sat Jul 30 09:32:46 2022 -0500
+++ b/ChangeLog	Sun Jul 31 09:23:17 2022 -0500
@@ -1,3 +1,13 @@
+2022-07-31  Bob Friesenhahn  <[email protected]>
+
+        * coders/heif.c: If module is compiled, but HasHEIF is not
+        defined, then RegisterHEIFImage/UnregisterHEIFImage
+        implementations are empty.
+
+        * coders/jxl.c: If module is compiled, but HasJXL is not defined,
+        then RegisterJXLImage/UnregisterJXLImage implementations are
+        empty.
+
 2022-07-30  Sam James        <[email protected]>
 
         * configure.ac: Fix Bashism in maintainer-mode check.
diff -r 6067712c2819 -r 171c0dd24d8a VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sat Jul 30 09:32:46 2022 -0500
+++ b/VisualMagick/installer/inc/version.isx	Sun Jul 31 09:23:17 2022 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020220730"
-#define public MagickPackageReleaseDate "snapshot-20220730"
+#define public MagickPackageVersionAddendum ".020220731"
+#define public MagickPackageReleaseDate "snapshot-20220731"
diff -r 6067712c2819 -r 171c0dd24d8a coders/heif.c
--- a/coders/heif.c	Sat Jul 30 09:32:46 2022 -0500
+++ b/coders/heif.c	Sun Jul 31 09:23:17 2022 -0500
@@ -14,7 +14,7 @@
 %                       H   H  E      I  F                                    %
 %                       H   H  EEEEE  I  F                                    %
 %                                                                             %
-%                     Read Heif/Heic Image Format.                            %
+%           Read HEIF/HEIC/AVIF image formats using libheif.                  %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 * Status: Support for reading a single image.
@@ -32,10 +32,11 @@
 #include "magick/utility.h"
 #include "magick/resource.h"
 
+#if defined(HasHEIF)
+
 /* Set to 1 to enable the currently non-functional progress monitor callbacks */
 #define HEIF_ENABLE_PROGRESS_MONITOR 0
 
-#if defined(HasHEIF)
 #include <libheif/heif.h>
 
 /*
@@ -497,7 +498,7 @@
   return image;
 }
 
-#endif
+#endif /* HasHEIF */
 
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -522,6 +523,7 @@
 */
 ModuleExport void RegisterHEIFImage(void)
 {
+#if defined(HasHEIF)
   static const char
     description[] = "HEIF Image Format";
 
@@ -546,10 +548,8 @@
                   heif_minor, heif_revision);
 
   entry=SetMagickInfo("AVIF");
-#if defined(HasHEIF)
   entry->decoder=(DecoderHandler) ReadHEIFImage;
   entry->magick=(MagickHandler) IsHEIF;
-#endif
   entry->description=description;
   entry->adjoin=False;
   entry->seekable_stream=MagickTrue;
@@ -560,10 +560,8 @@
   (void) RegisterMagickInfo(entry);
 
   entry=SetMagickInfo("HEIF");
-#if defined(HasHEIF)
   entry->decoder=(DecoderHandler) ReadHEIFImage;
   entry->magick=(MagickHandler) IsHEIF;
-#endif
   entry->description=description;
   entry->adjoin=False;
   entry->seekable_stream=MagickTrue;
@@ -574,10 +572,8 @@
   (void) RegisterMagickInfo(entry);
 
   entry=SetMagickInfo("HEIC");
-#if defined(HasHEIF)
   entry->decoder=(DecoderHandler) ReadHEIFImage;
   entry->magick=(MagickHandler) IsHEIF;
-#endif
   entry->description=description;
   entry->adjoin=False;
   entry->seekable_stream=MagickTrue;
@@ -586,6 +582,7 @@
   entry->module="HEIF";
   entry->coder_class=PrimaryCoderClass;
   (void) RegisterMagickInfo(entry);
+#endif /* HasHEIF */
 }
 
 /*
@@ -609,7 +606,9 @@
 */
 ModuleExport void UnregisterHEIFImage(void)
 {
+#if defined(HasHEIF)
   (void) UnregisterMagickInfo("AVIF");
   (void) UnregisterMagickInfo("HEIF");
   (void) UnregisterMagickInfo("HEIC");
+#endif /* HasHEIF */
 }
diff -r 6067712c2819 -r 171c0dd24d8a coders/jxl.c
--- a/coders/jxl.c	Sat Jul 30 09:32:46 2022 -0500
+++ b/coders/jxl.c	Sun Jul 31 09:23:17 2022 -0500
@@ -1080,7 +1080,7 @@
   return MagickPass;
 }
 
-#endif
+#endif /* HasJXL */
 
 
 /*
@@ -1106,6 +1106,7 @@
 */
 ModuleExport void RegisterJXLImage(void)
 {
+#if defined(HasJXL)
   static const char
     description[] = "JXL Image Format";
 
@@ -1130,10 +1131,8 @@
                   jxl_minor, jxl_revision);
 
   entry=SetMagickInfo("JXL");
-#if defined(HasJXL)
   entry->decoder=(DecoderHandler) ReadJXLImage;
   entry->encoder=(EncoderHandler) WriteJXLImage;
-#endif
   entry->description=description;
   entry->adjoin=False;
   entry->seekable_stream=MagickTrue;
@@ -1142,6 +1141,7 @@
   entry->module="JXL";
   entry->coder_class=PrimaryCoderClass;
   (void) RegisterMagickInfo(entry);
+#endif /* HasJXL */
 }
 
 /*
@@ -1165,5 +1165,7 @@
 */
 ModuleExport void UnregisterJXLImage(void)
 {
+#if defined(HasJXL)
   (void) UnregisterMagickInfo("JXL");
+#endif /* HasJXL */
 }
diff -r 6067712c2819 -r 171c0dd24d8a magick/static.c
--- a/magick/static.c	Sat Jul 30 09:32:46 2022 -0500
+++ b/magick/static.c	Sun Jul 31 09:23:17 2022 -0500
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003-2019 GraphicsMagick Group
+% Copyright (C) 2003-2021 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 %
 % This program is covered by multiple licenses, which are described in
diff -r 6067712c2819 -r 171c0dd24d8a magick/version.h
--- a/magick/version.h	Sat Jul 30 09:32:46 2022 -0500
+++ b/magick/version.h	Sun Jul 31 09:23:17 2022 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272400
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,0
-#define MagickChangeDate   "20220730"
-#define MagickReleaseDate  "snapshot-20220730"
+#define MagickChangeDate   "20220731"
+#define MagickReleaseDate  "snapshot-20220731"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 6067712c2819 -r 171c0dd24d8a www/Changelog.html
--- a/www/Changelog.html	Sat Jul 30 09:32:46 2022 -0500
+++ b/www/Changelog.html	Sun Jul 31 09:23:17 2022 -0500
@@ -35,6 +35,15 @@
 <div class="document">
 
 
+<p>2022-07-31  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>
+<p>* coders/heif.c: If module is compiled, but HasHEIF is not
+defined, then RegisterHEIFImage/UnregisterHEIFImage
+implementations are empty.</p>
+<p>* coders/jxl.c: If module is compiled, but HasJXL is not defined,
+then RegisterJXLImage/UnregisterJXLImage implementations are
+empty.</p>
+</blockquote>
 <p>2022-07-30  Sam James        &lt;<a class="reference external" href="mailto:sam&#37;&#52;&#48;gentoo&#46;org">sam<span>&#64;</span>gentoo<span>&#46;</span>org</a>&gt;</p>
 <blockquote>
 * configure.ac: Fix Bashism in maintainer-mode check.</blockquote>