Attachment #243140 for bug #272311

View | Details | Raw Unified | Return to bug 272311 | Differences between

and this patch

Lines 1-6 Link Here

(-)b/astro/gpscorrelate/Makefile (-3 / +8 lines)
1	PORTNAME= gpscorrelate	1	PORTNAME= gpscorrelate
2	PORTVERSION= 1.6.1	2	PORTVERSION= 1.6.1
3	PORTREVISION= 9	3	PORTREVISION= 10
4	CATEGORIES= astro geography	4	CATEGORIES= astro geography
5		5
6	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= ports@FreeBSD.org
Lines 12-24 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
12		12
13	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \	13	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
14	libgtkmm-2.4.so:x11-toolkits/gtkmm24	14	libgtkmm-2.4.so:x11-toolkits/gtkmm24
		15	LIB_DEPENDS+= libatk-1.0.so:accessibility/at-spi2-core
		16	LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig
		17	LIB_DEPENDS+= libfreetype.so:print/freetype2
		18	LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz
15		19
16	USES= compiler:c++11-lang gmake gnome pkgconfig	20	USES= compiler:c++11-lang gettext-runtime gmake gnome pkgconfig
17	USE_GNOME= libxml2
18		21
19	USE_GITHUB= yes	22	USE_GITHUB= yes
20	GH_ACCOUNT= freefoote	23	GH_ACCOUNT= freefoote
21		24
		25	USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 libxml2 pango
		26
22	PLIST_FILES= bin/gpscorrelate bin/gpscorrelate-gui \	27	PLIST_FILES= bin/gpscorrelate bin/gpscorrelate-gui \
23	man/man1/gpscorrelate.1.gz man/man1/gpscorrelate-gui.1.gz	28	man/man1/gpscorrelate.1.gz man/man1/gpscorrelate-gui.1.gz
24	PORTDOCS= *	29	PORTDOCS= *




--- exif-gps.cpp.orig	2012-08-14 10:11:01 UTC
+++ exif-gps.cpp
@@ -40,10 +40,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-
-#include "exiv2/image.hpp"
-#include "exiv2/exif.hpp"
+#include <exiv2/exiv2.hpp>
 
-#include "exiv2/image.hpp"
-#include "exiv2/exif.hpp"
-
 #include "gpsstructure.h"
 #include "exif-gps.h"
 
@@ -87,7 +85,7 @@ char* ReadExifDate(char* File, int* IncludesGPS)
 {
 	// Open and read the file.
 	Exiv2::ExifData ExifRead;
-	Exiv2::Image::AutoPtr Image;
+	Exiv2::Image::UniquePtr Image;
 
 	try {
 		Image = Exiv2::ImageFactory::open(File);
@@ -150,7 +148,7 @@ char* ReadExifData(char* File, double* Lat, double* Lo
 	// for display purposes. For the GUI version.
 	// Open and read the file.
 	Exiv2::ExifData ExifRead;
-	Exiv2::Image::AutoPtr Image;
+	Exiv2::Image::UniquePtr Image;
 
 	try {
 		Image = Exiv2::ImageFactory::open(File);
@@ -268,7 +266,7 @@ char* ReadExifData(char* File, double* Lat, double* Lo
 
 		// Is the altitude below sea level? If so, negate the value.
 		GPSData = ExifRead["Exif.GPSInfo.GPSAltitudeRef"];
-		if (GPSData.count() >= 1 && GPSData.toLong() == 1)
+		if (GPSData.count() >= 1 && GPSData.toInt64() == 1)
 		{
 			// Negate the elevation.
 			*Elev = -*Elev;
@@ -289,7 +287,7 @@ char* ReadGPSTimestamp(char* File, char* DateStamp, ch
 	// for display purposes. For the GUI version.
 	// Open and read the file.
 	Exiv2::ExifData ExifRead;
-	Exiv2::Image::AutoPtr Image;
+	Exiv2::Image::UniquePtr Image;
 
 	try {
 		Image = Exiv2::ImageFactory::open(File);
@@ -445,7 +443,7 @@ int WriteGPSData(char* File, struct GPSPoint* Point, c
 	struct utimbuf utb;
 	if (NoChangeMtime)
 		stat(File, &statbuf);
-	Exiv2::Image::AutoPtr Image;
+	Exiv2::Image::UniquePtr Image;
 
 	try {
 		Image = Exiv2::ImageFactory::open(File);
@@ -473,7 +471,7 @@ int WriteGPSData(char* File, struct GPSPoint* Point, c
 	// Do all the easy constant ones first.
 	// GPSVersionID tag: standard says is should be four bytes: 02 00 00 00
 	//  (and, must be present).
-	Exiv2::Value::AutoPtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
+	Exiv2::Value::UniquePtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
 	Value->read("2 0 0 0");
 	ExifToWrite.add(Exiv2::ExifKey("Exif.GPSInfo.GPSVersionID"), Value.get());
 	// Datum: the datum of the measured data. If not given, we insert WGS-84.
@@ -660,7 +658,7 @@ int WriteFixedDatestamp(char* File, time_t Time)
 	struct utimbuf utb;
 	stat(File, &statbuf);
 
-	Exiv2::Image::AutoPtr Image;
+	Exiv2::Image::UniquePtr Image;
 
 	try {
 		Image = Exiv2::ImageFactory::open(File);
@@ -699,7 +697,7 @@ int WriteFixedDatestamp(char* File, time_t Time)
 
 	char ScratchBuf[100];
 
-	Exiv2::Value::AutoPtr Value;
+	Exiv2::Value::UniquePtr Value;
 	Value = Exiv2::Value::create(Exiv2::signedRational);
 	snprintf(ScratchBuf, 100, "%d/1 %d/1 %d/1",
 			TimeStamp.tm_year + 1900,
@@ -737,7 +735,7 @@ int RemoveGPSExif(char* File, int NoChangeMtime)
 		stat(File, &statbuf);
 
 	// Open the file and start reading.
-	Exiv2::Image::AutoPtr Image;
+	Exiv2::Image::UniquePtr Image;
 	
 	try {
 		Image = Exiv2::ImageFactory::open(File);

Return to bug 272311

Lines 1-13 Link Here

(-)b/astro/gpscorrelate/files/patch-exif-gps.cpp (-6 / +87 lines)
1	--- exif-gps.cpp.orig 2019-07-07 08:26:16 UTC	1	--- exif-gps.cpp.orig 2012-08-14 10:11:01 UTC
2	+++ exif-gps.cpp	2	+++ exif-gps.cpp
3	@@ -40,9 +40,7 @@	3	@@ -40,10 +40,8 @@
4	#include <sys/stat.h>	4	#include <sys/stat.h>
5	#include <unistd.h>	5	#include <unistd.h>
6		6
7	-
8	-#include "exiv2/image.hpp"
9	-#include "exiv2/exif.hpp"
10	+#include <exiv2/exiv2.hpp>	7	+#include <exiv2/exiv2.hpp>
11		8
		9	-#include "exiv2/image.hpp"
		10	-#include "exiv2/exif.hpp"
		11	-
12	#include "gpsstructure.h"	12	#include "gpsstructure.h"
13	#include "exif-gps.h"	13	#include "exif-gps.h"
14	-	14
		15	@@ -87,7 +85,7 @@ char* ReadExifDate(char* File, int* IncludesGPS)
		16	{
		17	// Open and read the file.
		18	Exiv2::ExifData ExifRead;
		19	- Exiv2::Image::AutoPtr Image;
		20	+ Exiv2::Image::UniquePtr Image;
		21
		22	try {
		23	Image = Exiv2::ImageFactory::open(File);
		24	@@ -150,7 +148,7 @@ char* ReadExifData(char* File, double* Lat, double* Lo
		25	// for display purposes. For the GUI version.
		26	// Open and read the file.
		27	Exiv2::ExifData ExifRead;
		28	- Exiv2::Image::AutoPtr Image;
		29	+ Exiv2::Image::UniquePtr Image;
		30
		31	try {
		32	Image = Exiv2::ImageFactory::open(File);
		33	@@ -268,7 +266,7 @@ char* ReadExifData(char* File, double* Lat, double* Lo
		34
		35	// Is the altitude below sea level? If so, negate the value.
		36	GPSData = ExifRead["Exif.GPSInfo.GPSAltitudeRef"];
		37	- if (GPSData.count() >= 1 && GPSData.toLong() == 1)
		38	+ if (GPSData.count() >= 1 && GPSData.toInt64() == 1)
		39	{
		40	// Negate the elevation.
		41	Elev = -Elev;
		42	@@ -289,7 +287,7 @@ char* ReadGPSTimestamp(char* File, char* DateStamp, ch
		43	// for display purposes. For the GUI version.
		44	// Open and read the file.
		45	Exiv2::ExifData ExifRead;
		46	- Exiv2::Image::AutoPtr Image;
		47	+ Exiv2::Image::UniquePtr Image;
		48
		49	try {
		50	Image = Exiv2::ImageFactory::open(File);
		51	@@ -445,7 +443,7 @@ int WriteGPSData(char* File, struct GPSPoint* Point, c
		52	struct utimbuf utb;
		53	if (NoChangeMtime)
		54	stat(File, &statbuf);
		55	- Exiv2::Image::AutoPtr Image;
		56	+ Exiv2::Image::UniquePtr Image;
		57
		58	try {
		59	Image = Exiv2::ImageFactory::open(File);
		60	@@ -473,7 +471,7 @@ int WriteGPSData(char* File, struct GPSPoint* Point, c
		61	// Do all the easy constant ones first.
		62	// GPSVersionID tag: standard says is should be four bytes: 02 00 00 00
		63	// (and, must be present).
		64	- Exiv2::Value::AutoPtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
		65	+ Exiv2::Value::UniquePtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
		66	Value->read("2 0 0 0");
		67	ExifToWrite.add(Exiv2::ExifKey("Exif.GPSInfo.GPSVersionID"), Value.get());
		68	// Datum: the datum of the measured data. If not given, we insert WGS-84.
		69	@@ -660,7 +658,7 @@ int WriteFixedDatestamp(char* File, time_t Time)
		70	struct utimbuf utb;
		71	stat(File, &statbuf);
		72
		73	- Exiv2::Image::AutoPtr Image;
		74	+ Exiv2::Image::UniquePtr Image;
		75
		76	try {
		77	Image = Exiv2::ImageFactory::open(File);
		78	@@ -699,7 +697,7 @@ int WriteFixedDatestamp(char* File, time_t Time)
79
80	char ScratchBuf[100];
81
82	- Exiv2::Value::AutoPtr Value;
83	+ Exiv2::Value::UniquePtr Value;
84	Value = Exiv2::Value::create(Exiv2::signedRational);
85	snprintf(ScratchBuf, 100, "%d/1 %d/1 %d/1",
86	TimeStamp.tm_year + 1900,
87	@@ -737,7 +735,7 @@ int RemoveGPSExif(char* File, int NoChangeMtime)
88	stat(File, &statbuf);
89
90	// Open the file and start reading.
91	- Exiv2::Image::AutoPtr Image;
92	+ Exiv2::Image::UniquePtr Image;
93
94	try {
95	Image = Exiv2::ImageFactory::open(File);