From 2ed2aecf5abca549c0f065f9b0fe043f325e42a8 Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Tue, 9 Oct 2012 12:10:49 -0700 Subject: [PATCH] Revert "STOPSHIP libcamera2: remove device metadata" This reverts commit 1d47061ad52ca8f85ccd22e891f9427d020d9a0f. Bug: 7065917 Change-Id: Iddcb2e0a89625c438516b1d7a01ca039d078b677 --- libcamera2/ExynosCameraHWInterface2.cpp | 2 -- libcamera2/ExynosJpegEncoderForCamera.cpp | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp index cf5ed6f..ecfd430 100644 --- a/libcamera2/ExynosCameraHWInterface2.cpp +++ b/libcamera2/ExynosCameraHWInterface2.cpp @@ -5668,7 +5668,6 @@ void ExynosCameraHWInterface2::m_setExifFixedAttribute(void) char property[PROPERTY_VALUE_MAX]; //2 0th IFD TIFF Tags -#if 0 // STOPSHIP TODO(aray): remove before launch, but for now don't leak product data //3 Maker property_get("ro.product.brand", property, EXIF_DEF_MAKER); strncpy((char *)mExifInfo.maker, property, @@ -5684,7 +5683,6 @@ void ExynosCameraHWInterface2::m_setExifFixedAttribute(void) strncpy((char *)mExifInfo.software, property, sizeof(mExifInfo.software) - 1); mExifInfo.software[sizeof(mExifInfo.software) - 1] = '\0'; -#endif //3 YCbCr Positioning mExifInfo.ycbcr_positioning = EXIF_DEF_YCBCR_POSITIONING; diff --git a/libcamera2/ExynosJpegEncoderForCamera.cpp b/libcamera2/ExynosJpegEncoderForCamera.cpp index 4524942..d47b41b 100644 --- a/libcamera2/ExynosJpegEncoderForCamera.cpp +++ b/libcamera2/ExynosJpegEncoderForCamera.cpp @@ -351,7 +351,6 @@ int ExynosJpegEncoderForCamera::makeExif (unsigned char *exifOut, 1, exifInfo->width); writeExifIfd(&pCur, EXIF_TAG_IMAGE_HEIGHT, EXIF_TYPE_LONG, 1, exifInfo->height); -#if 0 // STOPSHIP TODO(aray): remove before launch, but don't leak product data writeExifIfd(&pCur, EXIF_TAG_MAKE, EXIF_TYPE_ASCII, strlen((char *)exifInfo->maker) + 1, exifInfo->maker, &LongerTagOffest, pIfdStart); writeExifIfd(&pCur, EXIF_TAG_MODEL, EXIF_TYPE_ASCII, @@ -360,7 +359,6 @@ int ExynosJpegEncoderForCamera::makeExif (unsigned char *exifOut, 1, exifInfo->orientation); writeExifIfd(&pCur, EXIF_TAG_SOFTWARE, EXIF_TYPE_ASCII, strlen((char *)exifInfo->software) + 1, exifInfo->software, &LongerTagOffest, pIfdStart); -#endif writeExifIfd(&pCur, EXIF_TAG_DATE_TIME, EXIF_TYPE_ASCII, 20, exifInfo->date_time, &LongerTagOffest, pIfdStart); writeExifIfd(&pCur, EXIF_TAG_YCBCR_POSITIONING, EXIF_TYPE_SHORT, @@ -1012,3 +1010,4 @@ void ExynosJpegEncoderForCamera::initJpegMemory(struct stJpegMem *pstMem, int iM } pstMem->ionClient = 0; } + -- 2.20.1