GraphicsMagick: TIFF: Disable new EXIF code which is not working...
GraphicsMagick Commits <[email protected]> Wed, 20 Dec 2023 11:28:30 -0600
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.8950.1703093318.7803.graphicsmagick-commit@lists.sourceforge.net> |
changeset 6497b8f34d57 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=6497b8f34d57 summary: TIFF: Disable new EXIF code which is not working correctly yet. Enable using EXPERIMENTAL_EXIF_TAGS. diffstat: ChangeLog | 3 +++ coders/tiff.c | 10 ++++++++-- www/Changelog.html | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diffs (72 lines): diff -r 0225ad819b0d -r 6497b8f34d57 ChangeLog --- a/ChangeLog Wed Dec 20 11:02:29 2023 -0600 +++ b/ChangeLog Wed Dec 20 11:28:25 2023 -0600 @@ -1,5 +1,8 @@ 2023-12-20 Bob Friesenhahn <[email protected]> + * coders/tiff.c: Disable new EXIF code which is not working + correctly yet. Enable using EXPERIMENTAL_EXIF_TAGS. + * fuzzing/oss-fuzz-build.sh: Remove unnecessary space in include path argument. diff -r 0225ad819b0d -r 6497b8f34d57 coders/tiff.c --- a/coders/tiff.c Wed Dec 20 11:02:29 2023 -0600 +++ b/coders/tiff.c Wed Dec 20 11:28:25 2023 -0600 @@ -96,6 +96,8 @@ # define uint32 uint32_t #endif /* TIFFLIB_VERSION */ +#undef EXPERIMENTAL_EXIF_TAGS + /* Set to 1 in order to log low-level BLOB I/O at "coder" level. */ @@ -4399,6 +4401,7 @@ #if defined(HasTIFF) +#if defined(EXPERIMENTAL_EXIF_TAGS) #if TIFFLIB_VERSION >= 20120922 /* @@ -4549,7 +4552,8 @@ return FieldCount; } -#endif +#endif /* if TIFFLIB_VERSION >= 20120922 */ +#endif /* defined(EXPERIMENTAL_EXIF_TAGS) */ /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -6628,6 +6632,7 @@ "TIFFWriteDirectory returns failed status!"); } +#if defined(EXPERIMENTAL_EXIF_TAGS) #if TIFFLIB_VERSION >= 20120922 if(status!=MagickFail) { @@ -6655,7 +6660,8 @@ } } } -#endif +#endif /* TIFFLIB_VERSION >= 20120922 */ +#endif /* defined(EXPERIMENTAL_EXIF_TAGS) */ if (image->next == (Image *) NULL) break; diff -r 0225ad819b0d -r 6497b8f34d57 www/Changelog.html --- a/www/Changelog.html Wed Dec 20 11:02:29 2023 -0600 +++ b/www/Changelog.html Wed Dec 20 11:28:25 2023 -0600 @@ -40,6 +40,8 @@ <p>2023-12-20 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> <blockquote> <ul class="simple"> +<li><p>coders/tiff.c: Disable new EXIF code which is not working +correctly yet. Enable using EXPERIMENTAL_EXIF_TAGS.</p></li> <li><p>fuzzing/oss-fuzz-build.sh: Remove unnecessary space in include path argument.</p></li> <li><p>coders/jxl.c (RegisterJXLImage): Fix version identification.