astro/merkaartor: make compatible with exiv2 0.28

PR: 272311
freebsd · Jul 9, 2023 · b6555cf · b6555cf
1 parent c18dfc5
commit b6555cf
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info

diff --git a/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp b/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp
@@ -0,0 +1,38 @@
+--- src/Docks/GeoImageDock.cpp.orig	2021-08-27 12:34:31 UTC
++++ src/Docks/GeoImageDock.cpp
+@@ -456,7 +456,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
+     Document *theDocument = Main->document();
+     MapView *theView = Main->view();
+
+-    Exiv2::Image::AutoPtr image;
++    Exiv2::Image::UniquePtr image;
+     Exiv2::ExifData exifData;
+     bool positionValid = false;
+
+@@ -868,7 +868,7 @@ void GeoImageDock::saveImage()
+ //    fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn, tr("JPEG Images (*.jpg)"));
+     qDebug() << fn;
+     if (!fn.isEmpty()) {
+-        Exiv2::Image::AutoPtr imageIn, imageOut;
++        Exiv2::Image::UniquePtr imageIn, imageOut;
+         Exiv2::ExifData exifData;
+         try {
+             imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString());
+@@ -892,7 +892,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
+ {
+     Coord pos;
+     double lat = 0.0, lon = 0.0;
+-    Exiv2::Image::AutoPtr image;
++    Exiv2::Image::UniquePtr image;
+     Exiv2::ExifData exifData;
+     bool positionValid = false;
+
+@@ -932,7 +932,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
+
+ void GeoImageDock::addGeoDataToImage(Coord position, const QString & file)
+ {
+-    Exiv2::Image::AutoPtr image;
++    Exiv2::Image::UniquePtr image;
+
+     try {
+         image = Exiv2::ImageFactory::open(file.toStdString());