| Index: trunk/phase3/includes/media/XMPInfo.php |
| — | — | @@ -631,12 +631,23 @@ |
| 632 | 632 | 'validate' => 'validateClosed', |
| 633 | 633 | 'choices' => array( '1' => true, '2' => true ), |
| 634 | 634 | ), |
| 635 | | - 'YCbCrSubSampling' => array( |
| 636 | | - 'map_group' => 'exif', |
| 637 | | - 'mode' => XMPReader::MODE_SEQ, |
| 638 | | - 'validate' => 'validateClosed', |
| 639 | | - 'choices' => array( '1' => true, '2' => true ), |
| 640 | | - ), |
| | 635 | + /******** |
| | 636 | + * Disable extracting this property (bug 31944) |
| | 637 | + * Several files have a string instead of a Seq |
| | 638 | + * for this property. XMPReader doesn't handle |
| | 639 | + * mismatched types very gracefully (it marks |
| | 640 | + * the entire file as invalid, instead of just |
| | 641 | + * the relavent prop). Since this prop |
| | 642 | + * doesn't communicate all that useful information |
| | 643 | + * just disable this prop for now, until such |
| | 644 | + * XMPReader is more graceful (bug 32172) |
| | 645 | + * 'YCbCrSubSampling' => array( |
| | 646 | + * 'map_group' => 'exif', |
| | 647 | + * 'mode' => XMPReader::MODE_SEQ, |
| | 648 | + * 'validate' => 'validateClosed', |
| | 649 | + * 'choices' => array( '1' => true, '2' => true ), |
| | 650 | + * ), |
| | 651 | + */ |
| 641 | 652 | ), |
| 642 | 653 | 'http://ns.adobe.com/exif/1.0/aux/' => array( |
| 643 | 654 | 'Lens' => array( |