From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Tue, 27 Aug 2019 20:31:43 +0000 (+0200)
Subject: Recognize exif values for Apple iOS photo modes
X-Git-Tag: 1.34.0-rc.0~544^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=7c68604e4c5e3f61884d529a37a2878c3155d343;p=lhc%2Fweb%2Fwiklou.git

Recognize exif values for Apple iOS photo modes

CustomRendered value 2-8 are used by Apple to indicate the processing
modes used like HDR, Portrait and Panorama.

Bug: T231385
Change-Id: I767a81a8bebdf25c230b104d35236a4b38cbe4ed
---

diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php
index 333c610375..f328760827 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -490,8 +490,16 @@ class FormatMetadata extends ContextSource {
 
 					case 'CustomRendered':
 						switch ( $val ) {
-							case 0:
-							case 1:
+							case 0: /* normal */
+							case 1: /* custom */
+								/* The following are unofficial Apple additions */
+							case 2: /* HDR (no original saved) */
+							case 3: /* HDR (original saved) */
+							case 4: /* Original (for HDR) */
+								/* Yes 5 is not present ;) */
+							case 6: /* Panorama */
+							case 7: /* Portrait HDR */
+							case 8: /* Portrait */
 								$val = $this->exifMsg( $tag, $val );
 								break;
 							default:
diff --git a/languages/i18n/exif/en.json b/languages/i18n/exif/en.json
index eeeb77e396..23d5755191 100644
--- a/languages/i18n/exif/en.json
+++ b/languages/i18n/exif/en.json
@@ -295,6 +295,12 @@
 	"exif-scenetype-1": "A directly photographed image",
 	"exif-customrendered-0": "Normal process",
 	"exif-customrendered-1": "Custom process",
+	"exif-customrendered-2": "HDR (no original saved)",
+	"exif-customrendered-3": "HDR (original saved)",
+	"exif-customrendered-4": "Original (for HDR)",
+	"exif-customrendered-6": "Panorama",
+	"exif-customrendered-7": "Portrait HDR",
+	"exif-customrendered-8": "Portrait",
 	"exif-exposuremode-0": "Auto exposure",
 	"exif-exposuremode-1": "Manual exposure",
 	"exif-exposuremode-2": "Auto bracket",
diff --git a/languages/i18n/exif/qqq.json b/languages/i18n/exif/qqq.json
index 2a55eb36ee..10dbb80d1b 100644
--- a/languages/i18n/exif/qqq.json
+++ b/languages/i18n/exif/qqq.json
@@ -497,6 +497,12 @@
 	"exif-scenetype-1": "See also:\n* {{msg-mw|Exif-scenetype}}\n* {{msg-mw|Exif-scenetype-1}}",
 	"exif-customrendered-0": "{{exif-qqq}}\n\nSee also:\n* {{msg-mw|Exif-customrendered}}\n* {{msg-mw|Exif-customrendered-0}}\n* {{msg-mw|Exif-customrendered-1}}",
 	"exif-customrendered-1": "{{exif-qqq}}\n\nSee also:\n* {{msg-mw|Exif-customrendered}}\n* {{msg-mw|Exif-customrendered-0}}\n* {{msg-mw|Exif-customrendered-1}}",
+	"exif-customrendered-2": "{{exif-qqq}}\n\nSee also:\n* {{msg-mw|Exif-customrendered}}",
+	"exif-customrendered-3": "{{exif-qqq}}\n\nSee also:\n* {{msg-mw|Exif-customrendered}}",
+	"exif-customrendered-4": "{{exif-qqq}}\n\nSee also:\n* {{msg-mw|Exif-customrendered}}",
+	"exif-customrendered-6": "{{exif-qqq}}\n\nSee also:\n* {{msg-mw|Exif-customrendered}}",
+	"exif-customrendered-7": "{{exif-qqq}}\n\nSee also:\n* {{msg-mw|Exif-customrendered}}",
+	"exif-customrendered-8": "{{exif-qqq}}\n\nSee also:\n* {{msg-mw|Exif-customrendered}}",
 	"exif-exposuremode-0": "{{exif-qqq}}\n{{Related|Exif-exposuremode}}",
 	"exif-exposuremode-1": "{{exif-qqq}}\n{{Related|Exif-exposuremode}}",
 	"exif-exposuremode-2": "{{exif-qqq}}\n\nA type of exposure mode shown as part of the metadata on image description pages. The Wikipedia article on [[w:Bracketing#Exposure_bracketing|bracketing]] says that 'auto bracket' is a camera exposure setting which automatically takes a series of pictures at slightly different light exposures.\n\n{{Related|Exif-exposuremode}}",