diff options
| author | Nikita Popov <nikic@php.net> | 2017-01-05 11:38:05 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2017-01-05 11:38:05 +0100 |
| commit | 2022dacb9997df2391866df99eb1592a1527fc27 (patch) | |
| tree | 484e6b302c77c7d5dc7b78b05ecfc11a9d8060af | |
| parent | b037c434979fb0bd2ad1960b85a8aa2989fc09e6 (diff) | |
| parent | 900b17b15fd5d29b6575b175b2b120ffab3adc96 (diff) | |
| download | php-git-2022dacb9997df2391866df99eb1592a1527fc27.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | ext/exif/exif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index a0ad5e7896..ca0190754f 100644 --- 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; } |