Improve XMP parsing #1679
Merged
Improve XMP parsing #1679
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lgritz
force-pushed
the
lg-xmp
branch
2 times, most recently
from
fdbfcea
to
27c2f6d
Compare
1. If pugi load_buffer finds syntax errors in the XML it is parsing, it returns an error code, which caused us to ignore the XMP block entirely. It turns out that's a poor strategy, because lots of files have XMP that is ever so slightly malformed, so we weren't picking up their XMP at all! So, just ignore the fact there was a parsing error, go ahead and try to make sense of whatever portion (maybe all?) of the block was able to be parsed. It works! 2. Added a additional XMP tags for GPano, Google's Photo Sphere metadata schema. 3. Replace linear search of the XMP tag list with a flat_map::find (which underneath is a sorted vector with binary search). 4. Also add a bunch of camera raw (crs: prefix) XMP tags to the table.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If pugi load_buffer finds syntax errors in the XML it is parsing, it returns an error code, which caused us to ignore the XMP block entirely, even the parts that were successfully parsed. It turns out that's a poor strategy, because lots of files have XMP that is ever so slightly malformed, so we weren't picking up their XMP at all! So, just ignore the fact there was a parsing error, go ahead and try to make sense of whatever portion (maybe all?) of the block was able to be parsed. It works!
Added additional XMP tags for GPano, Google's Photo Sphere metadata schema.
Replace linear search of the XMP tag list with a flat_map::find (which underneath is a sorted vector with binary search).
Also add a bunch of camera raw (crs: prefix) XMP tags to the table.
Upgrade our embedded PugiXML from 1.2 to 1.8.1.