From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 10 Dec 2002 18:01:33 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.3.0RC3~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=065b04628fc2ff1e0ac8c13b1556fe70df8483cd;p=php

MFH
---

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index a60f32eee8..27e9619232 100644
--- 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 43dc555762..2cf4ad7ef1 100644
--- 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;