Metrowerks Objective-C++ is more strict about types than Apple's.

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

diff --git a/src/tiff/tif_getimage.c b/src/tiff/tif_getimage.c
index b9a0903767bb110ff075fc3a2d84112a5f387935..f69fbc17aae896dec77bab44940382cba49905e7 100644 (file)
--- a/src/tiff/tif_getimage.c
+++ b/src/tiff/tif_getimage.c
@@ -2034,12 +2034,12 @@ initYCbCrConversion(TIFFRGBAImage* img)
         */
        TIFFGetFieldDefaulted(img->tif, TIFFTAG_YCBCRSUBSAMPLING, &hs, &vs);
        switch ((hs<<4)|vs) {
         */
        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);
        }
 
        return (NULL);


@@ -2075,7 +2075,7 @@ initCIELabConversion(TIFFRGBAImage* img)
                return NULL;
        }
 
                return NULL;
        }
 

-       return putcontig8bitCIELab;
+       return &putcontig8bitCIELab;

 }
 
 /*
 }
 
 /*