fix timeout value for wxDatagramSocket: was off by a factor of 1000

[wxWidgets.git] / src / tiff / libtiff / tif_getimage.c

diff --git a/src/tiff/libtiff/tif_getimage.c b/src/tiff/libtiff/tif_getimage.c
index be4e81963cb7d6df90cbb8bb07c06a521ec80fa0..2b2a6bc41509f07d08925a0042c02d77be44f472 100644 (file)
--- a/src/tiff/libtiff/tif_getimage.c
+++ b/src/tiff/libtiff/tif_getimage.c
@@ -2045,12 +2045,12 @@ initYCbCrConversion(TIFFRGBAImage* img)
         */
        TIFFGetFieldDefaulted(img->tif, TIFFTAG_YCBCRSUBSAMPLING, &hs, &vs);
        switch ((hs<<4)|vs) {
-               case 0x44: return (putcontig8bitYCbCr44tile);
-               case 0x42: return (putcontig8bitYCbCr42tile);
-               case 0x41: return (putcontig8bitYCbCr41tile);
-               case 0x22: return (putcontig8bitYCbCr22tile);
-               case 0x21: return (putcontig8bitYCbCr21tile);
-               case 0x11: return (putcontig8bitYCbCr11tile);
+               case 0x44: return &putcontig8bitYCbCr44tile;
+               case 0x42: return &putcontig8bitYCbCr42tile;
+               case 0x41: return &putcontig8bitYCbCr41tile;
+               case 0x22: return &putcontig8bitYCbCr22tile;
+               case 0x21: return &putcontig8bitYCbCr21tile;
+               case 0x11: return &putcontig8bitYCbCr11tile;
        }
 
        return (NULL);
@@ -2086,7 +2086,7 @@ initCIELabConversion(TIFFRGBAImage* img)
                return NULL;
        }
 
-       return putcontig8bitCIELab;
+       return &putcontig8bitCIELab;
 }
 
 /*