Attachment 243144 Details for Bug 272311 – astro/merkaartor: make compatible with exiv2 0.28

[patch] astro/merkaartor: make compatible with exiv2 0.28

0015-astro-merkaartor-make-compatible-with-exiv2-0.28.patch (text/plain), 2.49 KB, created by Matthias Andree on 2023-07-02 14:57:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-02 14:57:29 UTC

Size: 2.49 KB

patch

obsolete

>From 2303ce32503371100a09f72b5d004faf51449f1b Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sun, 2 Jul 2023 16:00:58 +0200
>Subject: [PATCH 15/20] astro/merkaartor: make compatible with exiv2 0.28
>
>PR:		272311
>---
> astro/merkaartor/Makefile                     |  2 +-
> .../files/patch-src_Docks_GeoImageDock.cpp    | 38 +++++++++++++++++++
> 2 files changed, 39 insertions(+), 1 deletion(-)
> create mode 100644 astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp
>
>diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
>index 815ed9425877..a36ac1d643dc 100644
>--- 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
>new file mode 100644
>index 000000000000..498ceed7afb0
>--- /dev/null
>+++ 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());
>-- 
>2.41.0
>

Flags:

dev2: maintainer-approval+

Actions: View | Diff

Attachments on bug 272311: 243098 | 243100 | 243103 | 243104 | 243106 | 243111 | 243124 | 243125 | 243135 | 243136 | 243137 | 243138 | 243139 | 243140 | 243141 | 243142 | 243143 | 243144 | 243145 | 243146 | 243147 | 243148 | 243154 | 243155 | 243156 | 243157 | 243158 | 243159 | 243160 | 243166 | 243167 | 243168 | 243169 | 243170 | 243171 | 243172 | 243175 | 243176