Date: Sun, 28 Aug 2016 07:42:58 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421009 - head/astro/gpsbabel/files Message-ID: <201608280742.u7S7gwEX070393@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Aug 28 07:42:58 2016 New Revision: 421009 URL: https://svnweb.freebsd.org/changeset/ports/421009 Log: Fix build with libc++ 3.8.0 PR: 210991 Submitted by: dev2@heesakkers.info (maintainer) MFH: 2016Q3 (ports-secteam build fix blanket) Added: head/astro/gpsbabel/files/patch-exif.cc (contents, props changed) Added: head/astro/gpsbabel/files/patch-exif.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpsbabel/files/patch-exif.cc Sun Aug 28 07:42:58 2016 (r421009) @@ -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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608280742.u7S7gwEX070393>