summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2017-01-05 11:38:17 +0100
committerNikita Popov <nikic@php.net>2017-01-05 11:38:17 +0100
commit769e17ce9bc6b93790237622020ac3c08ceb1e18 (patch)
treebef32cdbe3c22ac025f8b31e9fda0d193fa26e15
parentc370024c2c07eb047a77ed7f90a6cf921e0da6fb (diff)
parent2022dacb9997df2391866df99eb1592a1527fc27 (diff)
downloadphp-git-769e17ce9bc6b93790237622020ac3c08ceb1e18.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r--ext/exif/exif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index c84fc999e1..06e2aae39c 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2845,7 +2845,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;
}