XFA: Upgrade to libtiff 4.0.6.

third_party/libtiff/tif_print.c

-/* $Id: tif_print.c,v 1.60 2012-08-19 16:56:35 bfriesen Exp $ */
+/* $Id: tif_print.c,v 1.62 2015-08-19 02:31:04 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and 
  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
@@ skipping 16 matching lines @@
  * TIFF Library.
  *
  * Directory Printing Support
  */
 #include "tiffiop.h"
 #include <stdio.h>
 
 #include <ctype.h>
 
 static void
-_TIFFprintAsciiBounded(FILE* fd, const char* cp, int max_chars);
+_TIFFprintAsciiBounded(FILE* fd, const char* cp, size_t max_chars);
 
 static const char *photoNames[] = {
     "min-is-white",                             /* PHOTOMETRIC_MINISWHITE */
     "min-is-black",                             /* PHOTOMETRIC_MINISBLACK */
     "RGB color",                                /* PHOTOMETRIC_RGB */
     "palette color (RGB from colormap)",        /* PHOTOMETRIC_PALETTE */
     "transparency mask",                        /* PHOTOMETRIC_MASK */
     "separated",                                /* PHOTOMETRIC_SEPARATED */
     "YCbCr",                                    /* PHOTOMETRIC_YCBCR */
     "7 (0x7)",
@@ skipping 339 matching lines @@
                 fprintf(fd, ">\n");
         }
         if (TIFFFieldSet(tif,FIELD_INKNAMES)) {
                 char* cp;
                 fprintf(fd, "  Ink Names: ");
                 i = td->td_samplesperpixel;
                 sep = "";
                 for (cp = td->td_inknames; 
                      i > 0 && cp < td->td_inknames + td->td_inknameslen; 
                      cp = strchr(cp,'\0')+1, i--) {
-                        int max_chars = 
-                                (int)(td->td_inknameslen - (cp - td->td_inknames));
+                        size_t max_chars = 
+                                td->td_inknameslen - (cp - td->td_inknames);
                         fputs(sep, fd);
                         _TIFFprintAsciiBounded(fd, cp, max_chars);
                         sep = ", ";
                 }
                 fputs("\n", fd);
         }
         if (TIFFFieldSet(tif,FIELD_THRESHHOLDING)) {
                 fprintf(fd, "  Thresholding: ");
                 switch (td->td_threshholding) {
                 case THRESHHOLD_BILEVEL:
@@ skipping 165 matching lines @@
                         const TIFFField *fip;
                         uint32 value_count;
                         int mem_alloc = 0;
                         void *raw_data;
 
                         fip = TIFFFieldWithTag(tif, tag);
                         if(fip == NULL)
                                 continue;
 
                         if(fip->field_passcount) {
-                                if (fip->field_readcount == TIFF_VARIABLE ) {
+                                if (fip->field_readcount == TIFF_VARIABLE2 ) {
                                         if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1)
                                                 continue;
-                                } else if (fip->field_readcount == TIFF_VARIABLE2 ) {
+                                } else if (fip->field_readcount == TIFF_VARIABLE ) {
                                         uint16 small_value_count;
                                         if(TIFFGetField(tif, tag, &small_value_count, &raw_data) != 1)
                                                 continue;
                                         value_count = small_value_count;
                                 } else {
                                         assert (fip->field_readcount == TIFF_VARIABLE
                                                 || fip->field_readcount == TIFF_VARIABLE2);
                                         continue;
                                 } 
                         } else {
@@ skipping 69 matching lines @@
                             (unsigned long) s,
                             (unsigned long long) td->td_stripoffset[s],
                             (unsigned long long) td->td_stripbytecount[s]);
 #endif
         }
 }
 
 void
 _TIFFprintAscii(FILE* fd, const char* cp)
 {
-        _TIFFprintAsciiBounded( fd, cp, (int)strlen(cp));
+        _TIFFprintAsciiBounded( fd, cp, strlen(cp));
 }
 
 static void
-_TIFFprintAsciiBounded(FILE* fd, const char* cp, int max_chars)
+_TIFFprintAsciiBounded(FILE* fd, const char* cp, size_t max_chars)
 {
         for (; max_chars > 0 && *cp != '\0'; cp++, max_chars--) {
                 const char* tp;
 
                 if (isprint((int)*cp)) {
                         fputc(*cp, fd);
                         continue;
                 }
                 for (tp = "\tt\bb\rr\nn\vv"; *tp; tp++)
                         if (*tp++ == *cp)
@@ skipping 14 matching lines @@
 }
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 8
  * fill-column: 78
  * End:
  */
-