commit 849d782248b8c24fb538c84defc5b5d8f2a48bac
author Dichen Zhang <dichenzhang@google.com> Thu Mar 09 00:57:32 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 09 00:57:32 2023 +0000
tree 24cda006cd0c99be091af5ee7f3c6a694785a9e1
parent f6e25b8e8593663d2a263ba1de3d79da7e638e1c
parent b80e226b39421392ffe187a36dbc7df07b64c372

Merge "jpegr decoder: fill exif buffer" into udc-dev

libs/jpegrecoverymap/jpegr.cpp

diff --git a/libs/jpegrecoverymap/jpegr.cpp b/libs/jpegrecoverymap/jpegr.cpp
index a201dd9..b115750 100644
--- a/libs/jpegrecoverymap/jpegr.cpp
+++ b/libs/jpegrecoverymap/jpegr.cpp
@@ -335,8 +335,6 @@
   if (compressed_jpegr_image == nullptr || dest == nullptr) {
     return ERROR_JPEGR_INVALID_NULL_PTR;
   }
-  // TODO: fill EXIF data
-  (void) exif;
 
   if (output_format == JPEGR_OUTPUT_SDR) {
     JpegDecoderHelper jpeg_decoder;
@@ -364,6 +362,17 @@
     return ERROR_JPEGR_DECODE_ERROR;
   }
 
+  if (exif != nullptr) {
+    if (exif->data == nullptr) {
+      return ERROR_JPEGR_INVALID_NULL_PTR;
+    }
+    if (exif->length < jpeg_decoder.getEXIFSize()) {
+      return ERROR_JPEGR_BUFFER_TOO_SMALL;
+    }
+    memcpy(exif->data, jpeg_decoder.getEXIFPtr(), jpeg_decoder.getEXIFSize());
+    exif->length = jpeg_decoder.getEXIFSize();
+  }
+
   JpegDecoderHelper recovery_map_decoder;
   if (!recovery_map_decoder.decompressImage(compressed_map.data, compressed_map.length)) {
     return ERROR_JPEGR_DECODE_ERROR;