commit b50dad2dae6bb914a34aead2d1cc698c4edc2b3d
author Alex Ray <aray@google.com> Tue Oct 09 18:22:24 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 09 18:22:24 2012 -0700
tree 17382640ecf67c8ab84c00ddfb8999cba47ea5ea
parent 1b46bc036c963f2d7675d234acca2bf03c009ece
parent 7d0efc0fc33cc12e51698d91112c2b9186cf8631

am 7d0efc0f: am 3db6fe61: libcamera2: Round instead of truncate GPS Coords

* commit '7d0efc0fc33cc12e51698d91112c2b9186cf8631':
  libcamera2: Round instead of truncate GPS Coords

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index 1269ffd..73061d8 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -34,6 +34,7 @@
 //#define LOG_NDEBUG 0
 #define LOG_TAG "ExynosCameraHAL2"
 #include <utils/Log.h>
+#include <math.h>
 
 #include "ExynosCameraHWInterface2.h"
 #include "exynos_format.h"
@@ -5899,7 +5900,7 @@
         exifInfo->gps_latitude[0].den = 1;
         exifInfo->gps_latitude[1].num = (uint32_t)((latitude - exifInfo->gps_latitude[0].num) * 60);
         exifInfo->gps_latitude[1].den = 1;
-        exifInfo->gps_latitude[2].num = (uint32_t)((((latitude - exifInfo->gps_latitude[0].num) * 60)
+        exifInfo->gps_latitude[2].num = (uint32_t)round((((latitude - exifInfo->gps_latitude[0].num) * 60)
                                         - exifInfo->gps_latitude[1].num) * 60);
         exifInfo->gps_latitude[2].den = 1;
 
@@ -5907,11 +5908,11 @@
         exifInfo->gps_longitude[0].den = 1;
         exifInfo->gps_longitude[1].num = (uint32_t)((longitude - exifInfo->gps_longitude[0].num) * 60);
         exifInfo->gps_longitude[1].den = 1;
-        exifInfo->gps_longitude[2].num = (uint32_t)((((longitude - exifInfo->gps_longitude[0].num) * 60)
+        exifInfo->gps_longitude[2].num = (uint32_t)round((((longitude - exifInfo->gps_longitude[0].num) * 60)
                                         - exifInfo->gps_longitude[1].num) * 60);
         exifInfo->gps_longitude[2].den = 1;
 
-        exifInfo->gps_altitude.num = (uint32_t)altitude;
+        exifInfo->gps_altitude.num = (uint32_t)round(altitude);
         exifInfo->gps_altitude.den = 1;
 
         struct tm tm_data;