commit e286f1c7e2bbb0036b31875e51a8735cb163ccd2
author Dichen Zhang <dichenzhang@google.com> Tue Mar 14 00:22:00 2023 +0000
committer Dichen Zhang <dichenzhang@google.com> Tue Mar 14 17:27:44 2023 +0000
tree 0d670d2c60b037332721df6dc8fd112640577f1f
parent e32fafd3df16b0e4435d8921407ea280d99696af

JPEG/R: minor update for decoder.

Expose metadata for the decoder
Updata document
Rename "jpegr_metadata" to "jpegr_metadata_struct"

Bug: b/264715926
Test: jpegr_test

Change-Id: I6d97209453b2338996f5dc2aabfbdbe3e8a8c20c

libs/jpegrecoverymap/jpegrutils.cpp

diff --git a/libs/jpegrecoverymap/jpegrutils.cpp b/libs/jpegrecoverymap/jpegrutils.cpp
index 38b78ad..ff96447 100644
--- a/libs/jpegrecoverymap/jpegrutils.cpp
+++ b/libs/jpegrecoverymap/jpegrutils.cpp
@@ -253,7 +253,7 @@
 const string XMPXmlHandler::minContentBoostAttrName = kMapGainMapMin;
 const string XMPXmlHandler::maxContentBoostAttrName = kMapGainMapMax;
 
-bool getMetadataFromXMP(uint8_t* xmp_data, size_t xmp_size, jpegr_metadata* metadata) {
+bool getMetadataFromXMP(uint8_t* xmp_data, size_t xmp_size, jpegr_metadata_struct* metadata) {
     string nameSpace = "http://ns.adobe.com/xap/1.0/\0";
 
     if (xmp_size < nameSpace.size()+2) {
@@ -327,7 +327,7 @@
   return ss.str();
 }
 
-string generateXmpForSecondaryImage(jpegr_metadata& metadata) {
+string generateXmpForSecondaryImage(jpegr_metadata_struct& metadata) {
   const vector<string> kConDirSeq({kConDirectory, string("rdf:Seq")});
   const vector<string> kLiItem({string("rdf:li"), kConItem});