(bug 31944). As a work around for bug 31944, don't extract tiff:YCbCrSubSampling...

Several files have wrong type for that property, XMPReader currently marks entire file as invalid instead of just specific property, if there is a type mismatch in XMP data.

diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php
index 1d580ff..156d9b5 100644 (file)
--- a/includes/media/XMPInfo.php
+++ b/includes/media/XMPInfo.php
@@ -631,12 +631,23 @@ class XMPInfo {
                                'validate'  => 'validateClosed',
                                'choices'   => array( '1' => true, '2' => true ),
                        ),
-                       'YCbCrSubSampling'  => array(
-                               'map_group' => 'exif',
-                               'mode'      => XMPReader::MODE_SEQ,
-                               'validate'  => 'validateClosed',
-                               'choices'   => array( '1' => true, '2' => true ),
-                       ),
+                       /********
+                        * Disable extracting this property (bug 31944)
+                        * Several files have a string instead of a Seq
+                        * for this property. XMPReader doesn't handle
+                        * mismatched types very gracefully (it marks
+                        * the entire file as invalid, instead of just
+                        * the relavent prop). Since this prop
+                        * doesn't communicate all that useful information
+                        * just disable this prop for now, until such
+                        * XMPReader is more graceful (bug 32172)
+                        * 'YCbCrSubSampling'  => array(
+                        *      'map_group' => 'exif',
+                        *      'mode'      => XMPReader::MODE_SEQ,
+                        *      'validate'  => 'validateClosed',
+                        *      'choices'   => array( '1' => true, '2' => true ),
+                        * ),
+                        */ 
                ),
                'http://ns.adobe.com/exif/1.0/aux/' => array(
                        'Lens'              => array(