commit a6544e3bf7de17f104d5fb509d6cb7f6d90dc79f
author Nadav Bar <nadavbar@google.com> Thu Mar 05 11:58:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 05 11:58:52 2020 +0000
tree ee479d8aad59e8b6e78e83a789c187fe41798ecd
parent 06b7522331a2ba20ee63aabee21c29ecc7287394
parent 56d4183046837973efe9daa210edb9444d97dfd4

Merge "Check if calling uid is system uid for setAllowedPolicyCapture." into qt-qpr1-dev

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;
 }