XFA: Upgrade to libtiff 4.0.6.

third_party/libtiff/tif_luv.c

-/* $Id: tif_luv.c,v 1.35 2011-04-02 20:54:09 bfriesen Exp $ */
+/* $Id: tif_luv.c,v 1.40 2015-06-21 01:09:09 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1997 Greg Ward Larson
  * Copyright (c) 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, Greg Larson and Silicon Graphics may not be used in any
  * advertising or publicity relating to the software without the specific,
  * prior written permission of Sam Leffler, Greg Larson and Silicon Graphics.
  * 
  * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
  * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
  * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
  * 
  * IN NO EVENT SHALL SAM LEFFLER, GREG LARSON OR SILICON GRAPHICS BE LIABLE
  * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
  * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
  * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
+
 #include "tiffiop.h"
 #ifdef LOGLUV_SUPPORT
 
 /*
  * TIFF Library.
  * LogLuv compression support for high dynamic range images.
  *
  * Contributed by Greg Larson.
  *
  * LogLuv image support uses the TIFF library to store 16 or 10-bit
@@ skipping 335 matching lines @@
 /*
  * Decode a strip of pixels.  We break it into rows to
  * maintain synchrony with the encode algorithm, which
  * is row by row.
  */
 static int
 LogLuvDecodeStrip(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
 {
         tmsize_t rowlen = TIFFScanlineSize(tif);
 
+        if (rowlen == 0)
+                return 0;
+
         assert(cc%rowlen == 0);
         while (cc && (*tif->tif_decoderow)(tif, bp, rowlen, s))
                 bp += rowlen, cc -= rowlen;
         return (cc == 0);
 }
 
 /*
  * Decode a tile of pixels.  We break it into rows to
  * maintain synchrony with the encode algorithm, which
  * is row by row.
  */
 static int
 LogLuvDecodeTile(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
 {
         tmsize_t rowlen = TIFFTileRowSize(tif);
 
+        if (rowlen == 0)
+                return 0;
+
         assert(cc%rowlen == 0);
         while (cc && (*tif->tif_decoderow)(tif, bp, rowlen, s))
                 bp += rowlen, cc -= rowlen;
         return (cc == 0);
 }
 
 /*
  * Encode a row of 16-bit pixels.
  */
 static int
@@ skipping 229 matching lines @@
 
 /*
  * Encode a strip of pixels.  We break it into rows to
  * avoid encoding runs across row boundaries.
  */
 static int
 LogLuvEncodeStrip(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
 {
         tmsize_t rowlen = TIFFScanlineSize(tif);
 
+        if (rowlen == 0)
+                return 0;
+
         assert(cc%rowlen == 0);
         while (cc && (*tif->tif_encoderow)(tif, bp, rowlen, s) == 1)
                 bp += rowlen, cc -= rowlen;
         return (cc == 0);
 }
 
 /*
  * Encode a tile of pixels.  We break it into rows to
  * avoid encoding runs across row boundaries.
  */
 static int
 LogLuvEncodeTile(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
 {
         tmsize_t rowlen = TIFFTileRowSize(tif);
 
+        if (rowlen == 0)
+                return 0;
+
         assert(cc%rowlen == 0);
         while (cc && (*tif->tif_encoderow)(tif, bp, rowlen, s) == 1)
                 bp += rowlen, cc -= rowlen;
         return (cc == 0);
 }
 
 /*
  * Encode/Decode functions for converting to and from user formats.
  */
 
 #include "uvcode.h"
 
 #ifndef UVSCALE
 #define U_NEU           0.210526316
 #define V_NEU           0.473684211
 #define UVSCALE         410.
 #endif
 
 #ifndef M_LN2
 #define M_LN2           0.69314718055994530942
 #endif
 #ifndef M_PI
 #define M_PI            3.14159265358979323846
 #endif
-#ifndef log2
+#undef log2 /* Conflict with C'99 function */
 #define log2(x)         ((1./M_LN2)*log(x))
-#endif
+#undef exp2  /* Conflict with C'99 function */
 #define exp2(x)         exp(M_LN2*(x))
 
 #define itrunc(x,m)     ((m)==SGILOGENCODE_NODITHER ? \
                                 (int)(x) : \
                                 (int)((x) + rand()*(1./RAND_MAX) - .5))
 
 #if !LOGLUV_PUBLIC
 static
 #endif
 double
@@ skipping 977 matching lines @@
 #endif /* LOGLUV_SUPPORT */
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 8
  * fill-column: 78
  * End:
  */
-