• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Révision171c0dd24d8ad781775a32c081c062e3699476e8 (tree)
l'heure2022-07-31 23:23:17
AuteurBob Friesenhahn <bfriesen@Grap...>
CommiterBob Friesenhahn

Message de Log

HEIF/HEIC: If module compiled but HasFOO not defined, then provide empty register/unregister implementations.

Change Summary

Modification

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 @@
1+2022-07-31 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
2+
3+ * coders/heif.c: If module is compiled, but HasHEIF is not
4+ defined, then RegisterHEIFImage/UnregisterHEIFImage
5+ implementations are empty.
6+
7+ * coders/jxl.c: If module is compiled, but HasJXL is not defined,
8+ then RegisterJXLImage/UnregisterJXLImage implementations are
9+ empty.
10+
111 2022-07-30 Sam James <sam@gentoo.org>
212
313 * 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 @@
1010
1111 #define public MagickPackageName "GraphicsMagick"
1212 #define public MagickPackageVersion "1.4"
13-#define public MagickPackageVersionAddendum ".020220730"
14-#define public MagickPackageReleaseDate "snapshot-20220730"
13+#define public MagickPackageVersionAddendum ".020220731"
14+#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 @@
1414 % H H E I F %
1515 % H H EEEEE I F %
1616 % %
17-% Read Heif/Heic Image Format. %
17+% Read HEIF/HEIC/AVIF image formats using libheif. %
1818 % %
1919 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
2020 * Status: Support for reading a single image.
@@ -32,10 +32,11 @@
3232 #include "magick/utility.h"
3333 #include "magick/resource.h"
3434
35+#if defined(HasHEIF)
36+
3537 /* Set to 1 to enable the currently non-functional progress monitor callbacks */
3638 #define HEIF_ENABLE_PROGRESS_MONITOR 0
3739
38-#if defined(HasHEIF)
3940 #include <libheif/heif.h>
4041
4142 /*
@@ -497,7 +498,7 @@
497498 return image;
498499 }
499500
500-#endif
501+#endif /* HasHEIF */
501502
502503 /*
503504 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -522,6 +523,7 @@
522523 */
523524 ModuleExport void RegisterHEIFImage(void)
524525 {
526+#if defined(HasHEIF)
525527 static const char
526528 description[] = "HEIF Image Format";
527529
@@ -546,10 +548,8 @@
546548 heif_minor, heif_revision);
547549
548550 entry=SetMagickInfo("AVIF");
549-#if defined(HasHEIF)
550551 entry->decoder=(DecoderHandler) ReadHEIFImage;
551552 entry->magick=(MagickHandler) IsHEIF;
552-#endif
553553 entry->description=description;
554554 entry->adjoin=False;
555555 entry->seekable_stream=MagickTrue;
@@ -560,10 +560,8 @@
560560 (void) RegisterMagickInfo(entry);
561561
562562 entry=SetMagickInfo("HEIF");
563-#if defined(HasHEIF)
564563 entry->decoder=(DecoderHandler) ReadHEIFImage;
565564 entry->magick=(MagickHandler) IsHEIF;
566-#endif
567565 entry->description=description;
568566 entry->adjoin=False;
569567 entry->seekable_stream=MagickTrue;
@@ -574,10 +572,8 @@
574572 (void) RegisterMagickInfo(entry);
575573
576574 entry=SetMagickInfo("HEIC");
577-#if defined(HasHEIF)
578575 entry->decoder=(DecoderHandler) ReadHEIFImage;
579576 entry->magick=(MagickHandler) IsHEIF;
580-#endif
581577 entry->description=description;
582578 entry->adjoin=False;
583579 entry->seekable_stream=MagickTrue;
@@ -586,6 +582,7 @@
586582 entry->module="HEIF";
587583 entry->coder_class=PrimaryCoderClass;
588584 (void) RegisterMagickInfo(entry);
585+#endif /* HasHEIF */
589586 }
590587
591588 /*
@@ -609,7 +606,9 @@
609606 */
610607 ModuleExport void UnregisterHEIFImage(void)
611608 {
609+#if defined(HasHEIF)
612610 (void) UnregisterMagickInfo("AVIF");
613611 (void) UnregisterMagickInfo("HEIF");
614612 (void) UnregisterMagickInfo("HEIC");
613+#endif /* HasHEIF */
615614 }
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 @@
10801080 return MagickPass;
10811081 }
10821082
1083-#endif
1083+#endif /* HasJXL */
10841084
10851085
10861086 /*
@@ -1106,6 +1106,7 @@
11061106 */
11071107 ModuleExport void RegisterJXLImage(void)
11081108 {
1109+#if defined(HasJXL)
11091110 static const char
11101111 description[] = "JXL Image Format";
11111112
@@ -1130,10 +1131,8 @@
11301131 jxl_minor, jxl_revision);
11311132
11321133 entry=SetMagickInfo("JXL");
1133-#if defined(HasJXL)
11341134 entry->decoder=(DecoderHandler) ReadJXLImage;
11351135 entry->encoder=(EncoderHandler) WriteJXLImage;
1136-#endif
11371136 entry->description=description;
11381137 entry->adjoin=False;
11391138 entry->seekable_stream=MagickTrue;
@@ -1142,6 +1141,7 @@
11421141 entry->module="JXL";
11431142 entry->coder_class=PrimaryCoderClass;
11441143 (void) RegisterMagickInfo(entry);
1144+#endif /* HasJXL */
11451145 }
11461146
11471147 /*
@@ -1165,5 +1165,7 @@
11651165 */
11661166 ModuleExport void UnregisterJXLImage(void)
11671167 {
1168+#if defined(HasJXL)
11681169 (void) UnregisterMagickInfo("JXL");
1170+#endif /* HasJXL */
11691171 }
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 @@
11 /*
2-% Copyright (C) 2003-2019 GraphicsMagick Group
2+% Copyright (C) 2003-2021 GraphicsMagick Group
33 % Copyright (C) 2002 ImageMagick Studio
44 %
55 % 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 @@
3838 #define MagickLibVersion 0x272400
3939 #define MagickLibVersionText "1.4"
4040 #define MagickLibVersionNumber 27,24,0
41-#define MagickChangeDate "20220730"
42-#define MagickReleaseDate "snapshot-20220730"
41+#define MagickChangeDate "20220731"
42+#define MagickReleaseDate "snapshot-20220731"
4343
4444 /*
4545 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 @@
3535 <div class="document">
3636
3737
38+<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>
39+<blockquote>
40+<p>* coders/heif.c: If module is compiled, but HasHEIF is not
41+defined, then RegisterHEIFImage/UnregisterHEIFImage
42+implementations are empty.</p>
43+<p>* coders/jxl.c: If module is compiled, but HasJXL is not defined,
44+then RegisterJXLImage/UnregisterJXLImage implementations are
45+empty.</p>
46+</blockquote>
3847 <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>
3948 <blockquote>
4049 * configure.ac: Fix Bashism in maintainer-mode check.</blockquote>
Afficher sur ancien navigateur de dépôt.