MFH

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index a60f32eee83ffa618f86e5755b1822732fd4e23e..27e961923209480eebf817bd4e593fabfe8bd1fc 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1613,7 +1613,7 @@ static void exif_iif_add_value(image_info_type *image_info, int section_index, c
                        } else {
                                info_value = &info_data->value;
                        }
-                       for (index=0,vptr=value; index<length; index++,vptr+=php_tiff_bytes_per_format[format]) {
+                       for (index=0,vptr=value; index<length; index++,(int)vptr+=php_tiff_bytes_per_format[format]) {
                                if (length>1) {
                                        info_value = &info_data->value.list[index];
                                }

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 43dc555762100720aa716c6c9a1ab40f27aecc97..2cf4ad7ef11287c205fd140b1a11b42533eff0de 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1526,12 +1526,14 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
                                }
                                (*func_p)(im, i, fp);
                                break;
+#if HAVE_LIBGD20
                        case PHP_GDIMG_TYPE_GD:
                                if(im->trueColor){
                                        gdImageTrueColorToPalette(im,1,256);
                                }
                                (*func_p)(im, fp);
                                break;
+#endif                         
                        default:
                                (*func_p)(im, fp);
                                break;
@@ -1563,12 +1565,14 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
                                }
                                (*func_p)(im, q, tmp);
                                break;
+#if HAVE_LIBGD20
                        case PHP_GDIMG_TYPE_GD:
                                if (im->trueColor) {
                                        gdImageTrueColorToPalette(im,1,256);
                                }
                                (*func_p)(im, tmp);
                                break;
+#endif                         
                        default:
                                (*func_p)(im, tmp);
                                break;