diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-09-08 18:48:56 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-09-08 18:48:56 +0200 |
| commit | b1cd41e23a3c71962b1573099ac99dce28a791d3 (patch) | |
| tree | 5cfdd9ad39e66c9f4390ef1e229e6014d601b58b | |
| parent | 3d26b95567404e37ea1096c663467b3bacae87ec (diff) | |
| parent | c6a06c47329d5e475dc18f6bc138594bf3693b27 (diff) | |
| download | hardware_ti_omap4-b1cd41e23a3c71962b1573099ac99dce28a791d3.tar.gz hardware_ti_omap4-b1cd41e23a3c71962b1573099ac99dce28a791d3.tar.bz2 hardware_ti_omap4-b1cd41e23a3c71962b1573099ac99dce28a791d3.zip | |
Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0003replicant-6.0-0002
| -rw-r--r-- | camera/OMXCameraAdapter/OMXExif.cpp | 6 | ||||
| -rw-r--r-- | camera/inc/Encoder_libjpeg.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXExif.cpp b/camera/OMXCameraAdapter/OMXExif.cpp index f9ed59d..81135d0 100644 --- a/camera/OMXCameraAdapter/OMXExif.cpp +++ b/camera/OMXCameraAdapter/OMXExif.cpp @@ -373,6 +373,7 @@ status_t OMXCameraAdapter::setupEXIF() exifTags->eStatusImageHeight = OMX_TI_TagUpdated; } +#ifndef CAMERAHAL_PIRANHA if ( OMX_TI_TagReadWrite == exifTags->eStatusPixelXDimension && OMX_TI_TagReadWrite == exifTags->eStatusPixelYDimension) { @@ -394,6 +395,7 @@ status_t OMXCameraAdapter::setupEXIF() exifTags->usOrientation = 0; exifTags->eStatusOrientation = OMX_TI_TagUpdated; } +#endif if ( ( OMX_TI_TagReadWrite == exifTags->eStatusGpsLatitude ) && ( mEXIFData.mGPSData.mLatValid ) ) @@ -584,18 +586,22 @@ status_t OMXCameraAdapter::setupEXIF_libjpeg(ExifElementsTable* exifTable, char temp_value[5]; snprintf(temp_value, sizeof(temp_value)/sizeof(char), "%lu", (unsigned long)capData->mWidth); ret = exifTable->insertElement(TAG_IMAGE_WIDTH, temp_value); +#ifndef CAMERAHAL_PIRANHA if ((NO_ERROR == ret)) { ret = exifTable->insertElement(TAG_EXIF_IMAGE_WIDTH, temp_value); } +#endif } if ((NO_ERROR == ret)) { char temp_value[5]; snprintf(temp_value, sizeof(temp_value)/sizeof(char), "%lu", (unsigned long)capData->mHeight); ret = exifTable->insertElement(TAG_IMAGE_LENGTH, temp_value); +#ifndef CAMERAHAL_PIRANHA if ((NO_ERROR == ret)) { ret = exifTable->insertElement(TAG_EXIF_IMAGE_LENGTH, temp_value); } +#endif } if ((NO_ERROR == ret) && (mEXIFData.mGPSData.mLatValid)) { diff --git a/camera/inc/Encoder_libjpeg.h b/camera/inc/Encoder_libjpeg.h index bb41562..3766b15 100644 --- a/camera/inc/Encoder_libjpeg.h +++ b/camera/inc/Encoder_libjpeg.h @@ -63,8 +63,10 @@ static const char TAG_FOCALLENGTH[] = "FocalLength"; static const char TAG_DATETIME[] = "DateTime"; static const char TAG_IMAGE_WIDTH[] = "ImageWidth"; static const char TAG_IMAGE_LENGTH[] = "ImageLength"; +#ifndef CAMERAHAL_PIRANHA static const char TAG_EXIF_IMAGE_WIDTH[] = "ExifImageWidth"; static const char TAG_EXIF_IMAGE_LENGTH[] = "ExifImageLength"; +#endif static const char TAG_GPS_LAT[] = "GPSLatitude"; static const char TAG_GPS_LAT_REF[] = "GPSLatitudeRef"; static const char TAG_GPS_LONG[] = "GPSLongitude"; |