cvs to svn

[wxWidgets.git] / src / tiff / tif_aux.c

diff --git a/src/tiff/tif_aux.c b/src/tiff/tif_aux.c
index 6e8796684d64157ac1aac29a1bb02eb206fd7a9d..e3f6e39a55653771020f2a9d39d41bf1642bb294 100644 (file)
--- a/src/tiff/tif_aux.c
+++ b/src/tiff/tif_aux.c
@@ -30,42 +30,63 @@
  * Auxiliary Support Routines.
  */
 #include "tiffiop.h"
-
-#ifdef COLORIMETRY_SUPPORT
+#include "tif_predict.h"
 #include <math.h>
 
-static void
+static int
 TIFFDefaultTransferFunction(TIFFDirectory* td)
 {
        uint16 **tf = td->td_transferfunction;
-       long i, n = 1<<td->td_bitspersample;
+       tsize_t i, n, nbytes;
+
+       tf[0] = tf[1] = tf[2] = 0;
+       if (td->td_bitspersample >= sizeof(tsize_t) * 8 - 2)
+               return 0;
 
-       tf[0] = (uint16 *)_TIFFmalloc(n * sizeof (uint16));
+       n = 1<<td->td_bitspersample;
+       nbytes = n * sizeof (uint16);
+       if (!(tf[0] = (uint16 *)_TIFFmalloc(nbytes)))
+               return 0;
        tf[0][0] = 0;
        for (i = 1; i < n; i++) {
                double t = (double)i/((double) n-1.);
                tf[0][i] = (uint16)floor(65535.*pow(t, 2.2) + .5);
        }
+
        if (td->td_samplesperpixel - td->td_extrasamples > 1) {
-               tf[1] = (uint16 *)_TIFFmalloc(n * sizeof (uint16));
-               _TIFFmemcpy(tf[1], tf[0], n * sizeof (uint16));
-               tf[2] = (uint16 *)_TIFFmalloc(n * sizeof (uint16));
-               _TIFFmemcpy(tf[2], tf[0], n * sizeof (uint16));
+               if (!(tf[1] = (uint16 *)_TIFFmalloc(nbytes)))
+                       goto bad;
+               _TIFFmemcpy(tf[1], tf[0], nbytes);
+               if (!(tf[2] = (uint16 *)_TIFFmalloc(nbytes)))
+                       goto bad;
+               _TIFFmemcpy(tf[2], tf[0], nbytes);
        }
+       return 1;
+
+bad:
+       if (tf[0])
+               _TIFFfree(tf[0]);
+       if (tf[1])
+               _TIFFfree(tf[1]);
+       if (tf[2])
+               _TIFFfree(tf[2]);
+       tf[0] = tf[1] = tf[2] = 0;
+       return 0;
 }
 
-static void
+static int
 TIFFDefaultRefBlackWhite(TIFFDirectory* td)
 {
        int i;
 
-       td->td_refblackwhite = (float *)_TIFFmalloc(6*sizeof (float));
+       if (!(td->td_refblackwhite = (float *)_TIFFmalloc(6*sizeof (float))))
+               return 0;
        for (i = 0; i < 3; i++) {
            td->td_refblackwhite[2*i+0] = 0;
            td->td_refblackwhite[2*i+1] = (float)((1L<<td->td_bitspersample)-1L);
        }
+       return 1;
 }
-#endif
 
 /*
  * Like TIFFGetField, but return any default
@@ -116,7 +137,12 @@ TIFFVGetFieldDefaulted(TIFF* tif, ttag_t tag, va_list ap)
        case TIFFTAG_RESOLUTIONUNIT:
                *va_arg(ap, uint16 *) = td->td_resolutionunit;
                return (1);
-#ifdef CMYK_SUPPORT
+       case TIFFTAG_PREDICTOR:
+                {
+                       TIFFPredictorState* sp = (TIFFPredictorState*) tif->tif_data;
+                       *va_arg(ap, uint16*) = (uint16) sp->predictor;
+                       return (1);
+                }
        case TIFFTAG_DOTRANGE:
                *va_arg(ap, uint16 *) = 0;
                *va_arg(ap, uint16 *) = (1<<td->td_bitspersample)-1;
@@ -127,7 +153,6 @@ TIFFVGetFieldDefaulted(TIFF* tif, ttag_t tag, va_list ap)
        case TIFFTAG_NUMBEROFINKS:
                *va_arg(ap, uint16 *) = td->td_ninks;
                return (1);
-#endif
        case TIFFTAG_EXTRASAMPLES:
                *va_arg(ap, uint16 *) = td->td_extrasamples;
                *va_arg(ap, uint16 **) = td->td_sampleinfo;
@@ -143,14 +168,18 @@ TIFFVGetFieldDefaulted(TIFF* tif, ttag_t tag, va_list ap)
        case TIFFTAG_DATATYPE:
                *va_arg(ap, uint16 *) = td->td_sampleformat-1;
                return (1);
+       case TIFFTAG_SAMPLEFORMAT:
+               *va_arg(ap, uint16 *) = td->td_sampleformat;
+                return(1);
        case TIFFTAG_IMAGEDEPTH:
                *va_arg(ap, uint32 *) = td->td_imagedepth;
                return (1);
-#ifdef YCBCR_SUPPORT
        case TIFFTAG_YCBCRCOEFFICIENTS:
                if (!td->td_ycbcrcoeffs) {
                        td->td_ycbcrcoeffs = (float *)
                            _TIFFmalloc(3*sizeof (float));
+                       if (!td->td_ycbcrcoeffs)
+                               return (0);
                        /* defaults are from CCIR Recommendation 601-1 */
                        td->td_ycbcrcoeffs[0] = 0.299f;
                        td->td_ycbcrcoeffs[1] = 0.587f;
@@ -165,11 +194,28 @@ TIFFVGetFieldDefaulted(TIFF* tif, ttag_t tag, va_list ap)
        case TIFFTAG_YCBCRPOSITIONING:
                *va_arg(ap, uint16 *) = td->td_ycbcrpositioning;
                return (1);
-#endif
-#ifdef COLORIMETRY_SUPPORT
+       case TIFFTAG_WHITEPOINT:
+               if (!td->td_whitepoint) {
+                       td->td_whitepoint = (float *)
+                               _TIFFmalloc(2 * sizeof (float));
+                       if (!td->td_whitepoint)
+                               return (0);
+                       /* TIFF 6.0 specification says that it is no default
+                          value for the WhitePoint, but AdobePhotoshop TIFF
+                          Technical Note tells that it should be CIE D50. */
+                       td->td_whitepoint[0] =
+                               D50_X0 / (D50_X0 + D50_Y0 + D50_Z0);
+                       td->td_whitepoint[1] =
+                               D50_Y0 / (D50_X0 + D50_Y0 + D50_Z0);
+               }
+               *va_arg(ap, float **) = td->td_whitepoint;
+               return (1);
        case TIFFTAG_TRANSFERFUNCTION:
-               if (!td->td_transferfunction[0])
-                       TIFFDefaultTransferFunction(td);
+               if (!td->td_transferfunction[0] &&
+                   !TIFFDefaultTransferFunction(td)) {
+                       TIFFError(tif->tif_name, "No space for \"TransferFunction\" tag");
+                       return (0);
+               }
                *va_arg(ap, uint16 **) = td->td_transferfunction[0];
                if (td->td_samplesperpixel - td->td_extrasamples > 1) {
                        *va_arg(ap, uint16 **) = td->td_transferfunction[1];
@@ -177,11 +223,10 @@ TIFFVGetFieldDefaulted(TIFF* tif, ttag_t tag, va_list ap)
                }
                return (1);
        case TIFFTAG_REFERENCEBLACKWHITE:
-               if (!td->td_refblackwhite)
-                       TIFFDefaultRefBlackWhite(td);
+               if (!td->td_refblackwhite && !TIFFDefaultRefBlackWhite(td))
+                       return (0);
                *va_arg(ap, float **) = td->td_refblackwhite;
                return (1);
-#endif
        }
        return (0);
 }