From f6363e60e5da898edca18d6cf30bf1b42944b0c3 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 16 Dec 2019 01:11:01 -0800 Subject: Merge branch 'PHP-7.3' into PHP-7.4 * PHP-7.3: Fix build - no model field anymore --- ext/exif/exif.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 831e08dd6f..b686ec2fd4 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; -- cgit v1.2.1