cvs: php4 /ext/exif exif.c

fmk Mon Aug 6 12:58:27 2001 EDT Modified files: /php4/ext/exif exif.c Log: Adding missing TSRM macros. Kill signed/unsigned compiler warning Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.27 php4/ext/exif/exif.c:1.28 --- php4/ext/exif/exif.c:1.27 Sat Aug 4 18:35:03 2001 +++ php4/ext/exif/exif.c Mon Aug 6 12:58:27 2001 @@ -521,7 +521,7 @@ return; } else { /* Check to make sure we are not going to go past the ExifLength */ - if (ImageInfo->ThumbnailOffset + ImageInfo->ThumbnailSize > ExifLength) { + if ((unsigned)(ImageInfo->ThumbnailOffset + ImageInfo->ThumbnailSize) > ExifLength) { php_error(E_WARNING,"Thumbnail goes beyond exif header boundary"); return; } else { @@ -1038,7 +1038,7 @@ */ int ReadJpegFile(ImageInfoType *ImageInfo, Section_t *Sections, int *SectionsRead, char *FileName, - int ReadAll, char *LastExifRefd) + int ReadAll, char *LastExifRefd TSRMLS_DC) { FILE *infile; int ret; @@ -1097,7 +1097,7 @@ /* {{{ php_read_jpeg_exif */ -int php_read_jpeg_exif(ImageInfoType *ImageInfo, char *FileName, int ReadAll) +int php_read_jpeg_exif(ImageInfoType *ImageInfo, char *FileName, int ReadAll TSRMLS_DC) { Section_t Sections[20]; int SectionsRead; @@ -1107,7 +1107,7 @@ ImageInfo->MotorolaOrder = 0; - ret = ReadJpegFile(ImageInfo, Sections, &SectionsRead, FileName, ReadAll, LastExifRefd); + ret = ReadJpegFile(ImageInfo, Sections, &SectionsRead, FileName, ReadAll, LastExifRefd TSRMLS_CC); /* * Thought this might pick out the embedded thumbnail, but it doesn't work. -RL for (i=0;i<SectionsRead-1;i++) { @@ -1151,7 +1151,7 @@ readall = Z_LVAL_PP(p_readall); } - ret = php_read_jpeg_exif(&ImageInfo, Z_STRVAL_PP(p_name), readall); + ret = php_read_jpeg_exif(&ImageInfo, Z_STRVAL_PP(p_name), readall TSRMLS_CC); if (ret==FALSE || array_init(return_value) == FAILURE) { RETURN_FALSE;