From: Ladislav Láska <krakonos@krakonos.org>
Date: Wed, 13 Mar 2024 14:22:13 +0000 (+0100)
Subject: Replaced use of AutoPtr with std::unique_ptr in GeoImageDock.cpp.
X-Git-Tag: archive/raspbian/0.19.0+ds-5+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0111069503131ca8b4f91945e62bd1d530bdc757;p=merkaartor.git

Replaced use of AutoPtr with std::unique_ptr in GeoImageDock.cpp.

Origin: https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd
Forwarded: not-needed


Gbp-Pq: Name upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch
---

diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
index 97bdd4c..28f330a 100644
--- a/src/Docks/GeoImageDock.cpp
+++ b/src/Docks/GeoImageDock.cpp
@@ -457,7 +457,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
     Document *theDocument = Main->document();
     MapView *theView = Main->view();
 
-    Exiv2::Image::AutoPtr image;
+    std::unique_ptr<Exiv2::Image> image;
     Exiv2::ExifData exifData;
     bool positionValid = false;
 
@@ -869,7 +869,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;
+        std::unique_ptr<Exiv2::Image> imageIn, imageOut;
         Exiv2::ExifData exifData;
         try {
             imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString());
@@ -893,7 +893,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
 {
     Coord pos;
     double lat = 0.0, lon = 0.0;
-    Exiv2::Image::AutoPtr image;
+    std::unique_ptr<Exiv2::Image> image;
     Exiv2::ExifData exifData;
     bool positionValid = false;
 
@@ -933,7 +933,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
 
 void GeoImageDock::addGeoDataToImage(Coord position, const QString & file)
 {
-    Exiv2::Image::AutoPtr image;
+    std::unique_ptr<Exiv2::Image> image;
 
     try {
         image = Exiv2::ImageFactory::open(file.toStdString());