summaryrefslogtreecommitdiff
path: root/ext/exif/exif.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/exif/exif.c')
-rw-r--r--ext/exif/exif.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index f0c631e07b..91aeb7dc7b 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2710,7 +2710,8 @@ static int exif_process_unicode(image_info_type *ImageInfo, xp_field_type *xp_fi
* Process nested IFDs directories in Maker Note. */
static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * value_ptr, int value_len, char *offset_base, size_t IFDlength, size_t displacement)
{
- int de, i=0, section_index = SECTION_MAKERNOTE;
+ size_t i;
+ int de, section_index = SECTION_MAKERNOTE;
int NumDirEntries, old_motorola_intel, offset_diff;
const maker_note_type *maker_note;
char *dir_start;
@@ -3348,11 +3349,11 @@ static int exif_scan_JPEG_header(image_info_type *ImageInfo)
}
/* Read the length of the section. */
- if ((lh = php_stream_getc(ImageInfo->infile)) == EOF) {
+ if ((lh = php_stream_getc(ImageInfo->infile)) == (unsigned int)EOF) {
EXIF_ERRLOG_CORRUPT(ImageInfo)
return FALSE;
}
- if ((ll = php_stream_getc(ImageInfo->infile)) == EOF) {
+ if ((ll = php_stream_getc(ImageInfo->infile)) == (unsigned int)EOF) {
EXIF_ERRLOG_CORRUPT(ImageInfo)
return FALSE;
}