From d3cf0fed3e3139a8ae4b93fe661d4603e1b1115f Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Mon, 8 Mar 2021 19:01:22 +0900 Subject: android: jpeg: exif: change GPS method encoding from ASCII to NoEncoding According to the EXIF specification, the GPS method should be UNDEFINED, and the first 8 bytes will designate the type. However, CTS expects the first 8 bytes to be part of the data. Remove the 8-byte encoding designator by changing the encoding to NoEncoding to appease CTS. This is part of the fix that allows the following CTS test to pass: - android.hardware.cts.CameraTest#testJpegExif Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/android/jpeg/exif.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/android') diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp index bd359f98..922086cd 100644 --- a/src/android/jpeg/exif.cpp +++ b/src/android/jpeg/exif.cpp @@ -405,7 +405,7 @@ void Exif::setGPSLocation(const double *coords) void Exif::setGPSMethod(const std::string &method) { setString(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_PROCESSING_METHOD), - EXIF_FORMAT_UNDEFINED, method, Unicode); + EXIF_FORMAT_UNDEFINED, method, NoEncoding); } void Exif::setOrientation(int orientation) -- cgit v1.2.1