Skip to content

Fix trace for Extended XMP chunks #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cjee21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix trace for Extended XMP chunks #2648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Source/MediaInfo/Image/File_Jpeg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1798,6 +1798,8 @@ void File_Jpeg::APP1_XMP_Extension()
Item->second.LastOffset += (int32u)(Element_Size - Element_Offset);
auto& MI = *(File_Xmp*)Item->second.Parser.get();
MI.Wait = Item->second.LastOffset < Size;
auto Element_Offset_Sav = Element_Offset;
MI.NoTrace = true; // Handle trace here to see each chunk
gc_items GContainerItems;
MI.GContainerItems = &GContainerItems;
Open_Buffer_Continue(&MI);
Expand All @@ -1821,9 +1823,10 @@ void File_Jpeg::APP1_XMP_Extension()
ImgOffset += Entry.Padding;
}
}
#else
Skip_UTF8(Element_Size - Element_Offset, "XMP metadata");
Element_Offset = Element_Offset_Sav;
Element_Show();
#endif
Skip_UTF8(Element_Size - Element_Offset, "XMP metadata");
return;
}

Expand Down