Merge branch 'PHP-5.6' into PHP-7.0

nikic · nikic · commit 2022dacb9997 · 2017-01-05T11:38:05.000+01:00
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
@@ -2844,7 +2844,7 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 	}
 
 	if (components < 0) {
-		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%ld)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);
+		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%d)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);
 		return FALSE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2844,7 +2844,7 @@ static int exif_process_IFD_TAG(image_info_type ImageInfo, char dir_entry, cha`
`2844`	`2844`	`}`
`2845`	`2845`
`2846`	`2846`	`if (components < 0) {`
`2847`		`- exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%ld)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);`
	`2847`	`+ exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%d)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);`
`2848`	`2848`	`return FALSE;`
`2849`	`2849`	`}`
`2850`	`2850`