diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-12-16 01:11:01 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2019-12-16 01:11:01 -0800 |
| commit | c85a877577838554df65b2a340caec5b2f73f920 (patch) | |
| tree | ede8ea691329c33ad2036f7d7bbaedfaab157fb4 | |
| parent | d9f57e8316808341a849b38b2034348bea332982 (diff) | |
| parent | b74a300edf9ee1cd33edbafd9f3aec37ff4bf004 (diff) | |
| download | php-git-c85a877577838554df65b2a340caec5b2f73f920.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix build - no model field anymore
| -rw-r--r-- | ext/exif/exif.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index f9320df6b4..cfd48f6722 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3129,8 +3129,6 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu /*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "check (%s)", maker_note->make?maker_note->make:"");*/ if (maker_note->make && (!ImageInfo->make || strcmp(maker_note->make, ImageInfo->make))) continue; - if (maker_note->model && (!ImageInfo->model || strcmp(maker_note->model, ImageInfo->model))) - continue; if (maker_note->id_string && value_len >= maker_note->id_string_len && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len)) continue; |