Attachment 172371 Details for Bug 210991 – New patch which eliminates a warning in most build environment

[patch] New patch which eliminates a warning in most build environment

gpsbabel2.diff (text/plain), 1.81 KB, created by Oliver Heesakkers on 2016-07-11 10:49:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Heesakkers

Created: 2016-07-11 10:49:11 UTC

Size: 1.81 KB

patch

obsolete

>Index: files/patch-exif.cc
>===================================================================
>--- files/patch-exif.cc	(nonexistent)
>+++ files/patch-exif.cc	(working copy)
>@@ -0,0 +1,26 @@
>+--- exif.cc.orig	2016-01-03 02:09:17 UTC
>++++ exif.cc
>+@@ -1100,7 +1100,7 @@ exif_find_wpt_by_time(const Waypoint* wp
>+ 
>+   if (exif_wpt_ref == NULL) {
>+     exif_wpt_ref = wpt;
>+-  } else if (abs(exif_time_ref - wpt->creation_time.toTime_t()) < abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())) {
>++  } else if (qAbs(exif_time_ref - wpt->creation_time.toTime_t()) < qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())) {
>+     exif_wpt_ref = wpt;
>+   }
>+ }
>+@@ -1447,12 +1447,12 @@ exif_write(void)
>+ 
>+     if (exif_wpt_ref == NULL) {
>+       warning(MYNAME ": No point with a valid timestamp found.\n");
>+-    } else if (abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) {
>++    } else if (qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) {
>+       warning(MYNAME ": No matching point found for image date %s!\n", qPrintable(str));
>+       if (exif_wpt_ref != NULL) {
>+         QString str = exif_time_str(exif_wpt_ref->creation_time.toTime_t());
>+         warning(MYNAME ": Best is from %s, %d second(s) away.\n",
>+-                qPrintable(str), abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()));
>++                qPrintable(str), (int) qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()));
>+       }
>+       exif_wpt_ref = NULL;
>+     }
>
>Property changes on: files/patch-exif.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

dev2: maintainer-approval+

Actions: View | Diff

Attachments on bug 210991: 172361 | 172371