View | Details | Raw Unified | Return to bug 272311 | Differences between
and this patch

Collapse All | Expand All

(-)b/astro/merkaartor/Makefile (-1 / +1 lines)
Lines 1-6 Link Here
1
PORTNAME=	merkaartor
1
PORTNAME=	merkaartor
2
PORTVERSION=	0.19.0
2
PORTVERSION=	0.19.0
3
PORTREVISION=	13
3
PORTREVISION=	14
4
CATEGORIES=	astro
4
CATEGORIES=	astro
5
5
6
MAINTAINER=	dev2@heesakkers.info
6
MAINTAINER=	dev2@heesakkers.info
(-)b/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp (-1 / +38 lines)
Added Link Here
0
- 
1
--- src/Docks/GeoImageDock.cpp.orig	2021-08-27 12:34:31 UTC
2
+++ src/Docks/GeoImageDock.cpp
3
@@ -456,7 +456,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
4
     Document *theDocument = Main->document();
5
     MapView *theView = Main->view();
6
 
7
-    Exiv2::Image::AutoPtr image;
8
+    Exiv2::Image::UniquePtr image;
9
     Exiv2::ExifData exifData;
10
     bool positionValid = false;
11
 
12
@@ -868,7 +868,7 @@ void GeoImageDock::saveImage()
13
 //    fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn, tr("JPEG Images (*.jpg)"));
14
     qDebug() << fn;
15
     if (!fn.isEmpty()) {
16
-        Exiv2::Image::AutoPtr imageIn, imageOut;
17
+        Exiv2::Image::UniquePtr imageIn, imageOut;
18
         Exiv2::ExifData exifData;
19
         try {
20
             imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString());
21
@@ -892,7 +892,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
22
 {
23
     Coord pos;
24
     double lat = 0.0, lon = 0.0;
25
-    Exiv2::Image::AutoPtr image;
26
+    Exiv2::Image::UniquePtr image;
27
     Exiv2::ExifData exifData;
28
     bool positionValid = false;
29
 
30
@@ -932,7 +932,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
31
 
32
 void GeoImageDock::addGeoDataToImage(Coord position, const QString & file)
33
 {
34
-    Exiv2::Image::AutoPtr image;
35
+    Exiv2::Image::UniquePtr image;
36
 
37
     try {
38
         image = Exiv2::ImageFactory::open(file.toStdString());

Return to bug 272311