summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-03-05 00:13:39 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-03-05 00:13:39 +0000
commitdf7c20294973408fda0e07f16c3380a5e47862d9 (patch)
tree120c191031960562ca1a04d067e38c538dd7db03
parente72b2a0766034bcb686a8bf6df6d7a0ab9d349b6 (diff)
parent06b7522331a2ba20ee63aabee21c29ecc7287394 (diff)
downloadframeworks_av-df7c20294973408fda0e07f16c3380a5e47862d9.tar.gz
frameworks_av-df7c20294973408fda0e07f16c3380a5e47862d9.tar.bz2
frameworks_av-df7c20294973408fda0e07f16c3380a5e47862d9.zip
Snap for 6263357 from 06b7522331a2ba20ee63aabee21c29ecc7287394 to qt-qpr3-release
Change-Id: Ie2d6bfe296242adf6489e1fb48d855b631dbc1a5
-rw-r--r--services/camera/libcameraservice/utils/ExifUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/utils/ExifUtils.cpp b/services/camera/libcameraservice/utils/ExifUtils.cpp
index c0afdc18ca..8a0303a8e0 100644
--- a/services/camera/libcameraservice/utils/ExifUtils.cpp
+++ b/services/camera/libcameraservice/utils/ExifUtils.cpp
@@ -603,13 +603,13 @@ bool ExifUtilsImpl::setGpsTimestamp(const struct tm& t) {
}
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;
}