GraphicsMagick: coders/tiff.c: Allow succesfull compilation for ...

GraphicsMagick Commits <[email protected]> Mon, 29 Jan 2024 12:03:05 -0600
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.2702.1706551397.1736.graphicsmagick-commit@lists.sourceforge.net>
changeset 62257bfff68c in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=62257bfff68c
summary: coders/tiff.c: Allow succesfull compilation for older libtiff.

diffstat:

 ChangeLog     |  4 ++++
 coders/tiff.c |  4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diffs (46 lines):

diff -r 1c5183f48e29 -r 62257bfff68c ChangeLog
--- a/ChangeLog	Sun Jan 28 11:02:32 2024 -0600
+++ b/ChangeLog	Mon Jan 29 19:02:45 2024 +0100
@@ -1,3 +1,7 @@
+2024-01-29  Fojtik Jaroslav  <[email protected]>
+
+	* coders/tiff.c: Allow succesfull compilation for older libtiff.
+
 2024-01-28  Bob Friesenhahn  <[email protected]>
 
 	* NEWS.txt: Update the news as of January 28, 2024.
diff -r 1c5183f48e29 -r 62257bfff68c coders/tiff.c
--- a/coders/tiff.c	Sun Jan 28 11:02:32 2024 -0600
+++ b/coders/tiff.c	Mon Jan 29 19:02:45 2024 +0100
@@ -4654,6 +4654,7 @@
                              int i;
                              if(Long2<(magick_uint32_t)WriteCount) break;	/* Too small amount of mandatory items. */
                              if(Value+8*WriteCount>=profile_length-1) break;	/* Array falls over blob boundary. */
+#if TIFFLIB_VERSION >= 20230609
                              switch(TIFFFieldSetGetSize(fip))
                              {
                                case 8:		/* double array is required in input. */
@@ -4687,6 +4688,7 @@
                                  }
                                  break;
                              }
+#endif
                              break;
                            }
 
@@ -6873,6 +6875,7 @@
               }
             }
 
+#if TIFFLIB_VERSION >= 20230609
             if(TIFFCreateGPSDirectory(tiff) == 0)
             {
               if(AddExifFields(tiff,profile_data,profile_length,logging, FLAG_GPS) > 0)
@@ -6885,6 +6888,7 @@
               else
                 TIFFSetDirectory(tiff, 0);
             }
+#endif
 
             if(dir_EXIF_offset>0 || dir_GPS_offset>0)
             {          // Go back to the first directory, and add the EXIFIFD pointer.