From: Kalle Sommer Nielsen <kalle@php.net>
Date: Fri, 7 Jul 2017 10:23:24 +0000 (+0200)
Subject: We currently don't use the guessing code, so don't compile it
X-Git-Tag: php-7.2.0beta1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=134047dfde1feaf664b54bb2f84324a38eced091;p=php

We currently don't use the guessing code, so don't compile it
---

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index aa903b96b0..769c8693b4 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1340,8 +1340,10 @@ typedef enum mn_byte_order_t {
 
 typedef enum mn_offset_mode_t {
 	MN_OFFSET_NORMAL,
-	MN_OFFSET_MAKER,
-	MN_OFFSET_GUESS
+	MN_OFFSET_MAKER
+#ifdef KALLE_0
+	, MN_OFFSET_GUESS
+#endif
 } mn_offset_mode_t;
 
 typedef struct {
@@ -3176,6 +3178,7 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 		case MN_OFFSET_MAKER:
 			offset_base = value_ptr;
 			break;
+#ifdef KALLE_0
 		case MN_OFFSET_GUESS:
 			if (maker_note->offset + 10 + 4 >= value_len) {
 				/* Can not read dir_start+10 since it's beyond value end */
@@ -3192,6 +3195,7 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 			}
 			offset_base = value_ptr + offset_diff;
 			break;
+#endif
 		default:
 		case MN_OFFSET_NORMAL:
 			break;