{"id":11533,"url":"https://patchwork.libcamera.org/api/1.1/patches/11533/?format=json","web_url":"https://patchwork.libcamera.org/patch/11533/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210309085235.106691-3-paul.elder@ideasonboard.com>","date":"2021-03-09T08:52:33","name":"[libcamera-devel,v2,2/4] android: jpeg: exif: Simplify setGPSDateTimestamp and setGPSDMS","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"686a3575e4a1a01d78cc30f4be3ea40d7fe18632","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11533/mbox/","series":[{"id":1776,"url":"https://patchwork.libcamera.org/api/1.1/series/1776/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1776","date":"2021-03-09T08:52:31","name":"android: jpeg: exif: Fix GPS altitude","version":2,"mbox":"https://patchwork.libcamera.org/series/1776/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11533/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11533/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 216A6BD1F1\n\tfor ;\n\tTue, 9 Mar 2021 08:52:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D6B3768AAA;\n\tTue, 9 Mar 2021 09:52:52 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E8E6B6051F\n\tfor ;\n\tTue, 9 Mar 2021 09:52:50 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0C6ACE9;\n\tTue, 9 Mar 2021 09:52:48 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"RdWEs5zX\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615279970;\n\tbh=C4hqdlpSYb4dsLo6isL7YvbpbWEdY1MG8rHWrr+uiQ0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=RdWEs5zXiKAqlDPo2GFUx+zoGoczTlNhhmfWUOMiNx61rzkEECaKkfUmFAozRYPfL\n\tUeUf9o8N98Ep2mo8+KVwKkUJfOtMPV2FL8mY8E7mw7W/FelCI1Bc+qLo5nEzcQjd3p\n\tJstfqjyrjdXdXOB1IcRA1eVYZb8ACo4kUHvh7C1o=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 9 Mar 2021 17:52:33 +0900","Message-Id":"<20210309085235.106691-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210309085235.106691-1-paul.elder@ideasonboard.com>","References":"<20210309085235.106691-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/4] android: jpeg: exif: Simplify\n\tsetGPSDateTimestamp and setGPSDMS","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that setRational() supports setting multiple rational values, use\nthat in setGPSDateTimestamp and setGPSDMS which previously set every\nrational manually.\n\nSigned-off-by: Paul Elder \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n\n---\nChanges in v2:\n- use Span\n---\n src/android/jpeg/exif.cpp | 25 +++----------------------\n 1 file changed, 3 insertions(+), 22 deletions(-)","diff":"diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\nindex 929ac542..cf9e632a 100644\n--- a/src/android/jpeg/exif.cpp\n+++ b/src/android/jpeg/exif.cpp\n@@ -347,24 +347,14 @@ void Exif::setGPSDateTimestamp(time_t timestamp)\n \t\t EXIF_FORMAT_ASCII, tsStr);\n \n \t/* Set GPS_TIME_STAMP */\n-\tExifEntry *entry =\n-\t\tcreateEntry(EXIF_IFD_GPS,\n-\t\t\t static_cast(EXIF_TAG_GPS_TIME_STAMP),\n-\t\t\t EXIF_FORMAT_RATIONAL, 3, 3 * sizeof(ExifRational));\n-\tif (!entry)\n-\t\treturn;\n-\n \tExifRational ts[] = {\n \t\t{ static_cast(tm.tm_hour), 1 },\n \t\t{ static_cast(tm.tm_min), 1 },\n \t\t{ static_cast(tm.tm_sec), 1 },\n \t};\n \n-\tfor (int i = 0; i < 3; i++)\n-\t\texif_set_rational(entry->data + i * sizeof(ExifRational),\n-\t\t\t\t order_, ts[i]);\n-\n-\texif_entry_unref(entry);\n+\tsetRational(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_TIME_STAMP),\n+\t\t Span{ ts, 3 });\n }\n \n std::tuple Exif::degreesToDMS(double decimalDegrees)\n@@ -378,22 +368,13 @@ std::tuple Exif::degreesToDMS(double decimalDegrees)\n \n void Exif::setGPSDMS(ExifIfd ifd, ExifTag tag, int deg, int min, int sec)\n {\n-\tExifEntry *entry = createEntry(ifd, tag, EXIF_FORMAT_RATIONAL, 3,\n-\t\t\t\t 3 * sizeof(ExifRational));\n-\tif (!entry)\n-\t\treturn;\n-\n \tExifRational coords[] = {\n \t\t{ static_cast(deg), 1 },\n \t\t{ static_cast(min), 1 },\n \t\t{ static_cast(sec), 1 },\n \t};\n \n-\tfor (int i = 0; i < 3; i++)\n-\t\texif_set_rational(entry->data + i * sizeof(ExifRational),\n-\t\t\t\t order_, coords[i]);\n-\n-\texif_entry_unref(entry);\n+\tsetRational(ifd, tag, Span{ coords, 3 });\n }\n \n /*\n","prefixes":["libcamera-devel","v2","2/4"]}