GraphicsMagick: coders/tiff.c uint16_t must be passed where TIFF...

changeset ebb49cf121a3 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=ebb49cf121a3
summary: coders/tiff.c uint16_t must be passed where TIFF_SHORT is required.

diffstat:

 coders/tiff.c |  18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 58af5f4e74c9 -r ebb49cf121a3 coders/tiff.c
--- a/coders/tiff.c	Fri Jan 12 00:23:50 2024 +0100
+++ b/coders/tiff.c	Fri Jan 12 00:56:16 2024 +0100
@@ -4540,7 +4540,13 @@
             case TIFF_BYTE:
             case TIFF_SHORT:
             case TIFF_LONG:
-                         if(FDT!=TIFF_BYTE && FDT!=TIFF_SHORT && FDT!=TIFF_LONG)
+                         if(FDT==TIFF_SHORT)
+                         {
+                           if(TIFFSetField(tiff, Tag, (uint16_t)Value))
+                             FieldCount++;
+                           break;
+                         }
+                         if(FDT!=TIFF_BYTE && FDT!=TIFF_LONG)
                              break;
                          if(TIFFSetField(tiff, Tag, Value))
                              FieldCount++;
@@ -6743,8 +6749,7 @@
                 TIFFSetDirectory(tiff, 0);
             }
 */
-              /* Save changed tiff-directory to file */
-/*
+                /* Save changed tiff-directory to file */
             if(!TIFFWriteDirectory(tiff))
             {
               (void)LogMagickEvent(CoderEvent, GetMagickModule(), "TIFFWriteDirectory returns failed status!");
@@ -6752,13 +6757,14 @@
               // Re configure directory status for next image. Reset current IFD number.
             if(!TIFFSetDirectory(tiff, current_mainifd))
             {
-              fprintf(stderr, "TIFFSetDirectory() failed.\n");
+              if(logging)
+                LogMagickEvent(CoderEvent,GetMagickModule(),"TIFFSetDirectory() failed.\n");
             }
             if(!TIFFCreateDirectory(tiff))
             {
-              fprintf(stderr, "TIFFCreateDirectory() failed.\n");
+              if(logging)
+                LogMagickEvent(CoderEvent,GetMagickModule(),"TIFFCreateDirectory() failed.\n");
             }
-*/
           }
         }
 #endif /* TIFFLIB_VERSION >= 20120922 */