commit 2fc666fb49fe45438cd30ff69d7ea81692d4ed07
author android-build-team Robot <android-build-team-robot@google.com> Thu Mar 05 00:11:34 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 05 00:11:34 2020 +0000
tree 120c191031960562ca1a04d067e38c538dd7db03
parent 19dcf8e9afd8d8b95f843abdba55060de5b9e1fc
parent 06b7522331a2ba20ee63aabee21c29ecc7287394

Snap for 6263749 from 06b7522331a2ba20ee63aabee21c29ecc7287394 to qt-d4-release

Change-Id: I0fa691a5021f397d017b1267b56911dec76fc2bc

services/camera/libcameraservice/utils/ExifUtils.cpp

diff --git a/services/camera/libcameraservice/utils/ExifUtils.cpp b/services/camera/libcameraservice/utils/ExifUtils.cpp
index c0afdc1..8a0303a 100644
--- a/services/camera/libcameraservice/utils/ExifUtils.cpp
+++ b/services/camera/libcameraservice/utils/ExifUtils.cpp
@@ -603,13 +603,13 @@
 }
 
 bool ExifUtilsImpl::setImageHeight(uint32_t length) {
-    SET_LONG(EXIF_IFD_0, EXIF_TAG_IMAGE_LENGTH, length);
+    SET_SHORT(EXIF_IFD_0, EXIF_TAG_IMAGE_LENGTH, length);
     SET_LONG(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_Y_DIMENSION, length);
     return true;
 }
 
 bool ExifUtilsImpl::setImageWidth(uint32_t width) {
-    SET_LONG(EXIF_IFD_0, EXIF_TAG_IMAGE_WIDTH, width);
+    SET_SHORT(EXIF_IFD_0, EXIF_TAG_IMAGE_WIDTH, width);
     SET_LONG(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_X_DIMENSION, width);
     return true;
 }