Date: Sun, 9 Jul 2023 22:09:42 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 738d7427d670 - main - graphics/photivo: make compatible with exiv2 0.28 Message-ID: <202307092209.369M9guN034320@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=738d7427d67024949b1541cf2968f16aa3b6f384 commit 738d7427d67024949b1541cf2968f16aa3b6f384 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2023-07-02 14:48:40 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2023-07-09 22:08:10 +0000 graphics/photivo: make compatible with exiv2 0.28 PR: 272311 --- graphics/photivo/Makefile | 2 +- .../photivo/files/patch-Sources_ptImageHelper.cpp | 52 +++++++++++++++++++++- graphics/photivo/files/patch-Sources_ptMain.cpp | 11 +++++ 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile index 82fc7d296cb5..424647a55950 100644 --- a/graphics/photivo/Makefile +++ b/graphics/photivo/Makefile @@ -1,6 +1,6 @@ PORTNAME= photivo PORTVERSION= 0.0.2015.03.21 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${PORTNAME}/ DISTNAME= source-archive diff --git a/graphics/photivo/files/patch-Sources_ptImageHelper.cpp b/graphics/photivo/files/patch-Sources_ptImageHelper.cpp index d697215968f1..5c67a26cc7dc 100644 --- a/graphics/photivo/files/patch-Sources_ptImageHelper.cpp +++ b/graphics/photivo/files/patch-Sources_ptImageHelper.cpp @@ -1,4 +1,4 @@ ---- Sources/ptImageHelper.cpp.orig 2019-07-07 08:34:52 UTC +--- Sources/ptImageHelper.cpp.orig 2023-07-02 14:41:47 UTC +++ Sources/ptImageHelper.cpp @@ -34,6 +34,7 @@ #pragma GCC diagnostic pop @@ -8,3 +8,53 @@ #include <vector> #include <QStringList> +@@ -106,7 +107,7 @@ bool ptImageHelper::WriteExif(const QString + if (!AFileName.endsWith(JpegExtensions.at(i))) deleteDNGdata = true; + } + +- Exiv2::Image::AutoPtr Exiv2Image = Exiv2::ImageFactory::open(AFileName.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr Exiv2Image = Exiv2::ImageFactory::open(AFileName.toLocal8Bit().data()); + + Exiv2Image->readMetadata(); + Exiv2::ExifData outExifData = Exiv2Image->exifData(); +@@ -176,7 +177,7 @@ bool ptImageHelper::WriteExif(const QString + Exiv2Image->writeMetadata(); + return true; + #endif +- } catch (Exiv2::AnyError& Error) { ++ } catch (Exiv2::Error& Error) { + if (Settings->GetInt("JobMode") == 0) { + ptMessageBox::warning(0 ,"Exiv2 Error","No exif data written!\nCaught Exiv2 exception '" + QString(Error.what()) + "'\n"); + } else { +@@ -198,7 +199,7 @@ bool ptImageHelper::ReadExif(const QString &AFi + if (Exiv2::ImageFactory::getType(AFileName.toLocal8Bit().data()) == Exiv2::ImageType::none) + return false; + +- Exiv2::Image::AutoPtr hImage = Exiv2::ImageFactory::open(AFileName.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr hImage = Exiv2::ImageFactory::open(AFileName.toLocal8Bit().data()); + + if (!hImage.get()) return false; + +@@ -295,19 +296,19 @@ bool ptImageHelper::TransferExif(const QString ASource + if (Exiv2::ImageFactory::getType(ASourceFile.toLocal8Bit().data()) == Exiv2::ImageType::none) + return false; + +- Exiv2::Image::AutoPtr hSourceImage = Exiv2::ImageFactory::open(ASourceFile.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr hSourceImage = Exiv2::ImageFactory::open(ASourceFile.toLocal8Bit().data()); + + if (!hSourceImage.get()) return false; + + hSourceImage->readMetadata(); + +- Exiv2::Image::AutoPtr hTargetImage = Exiv2::ImageFactory::open(ATargetFile.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr hTargetImage = Exiv2::ImageFactory::open(ATargetFile.toLocal8Bit().data()); + + hTargetImage->clearMetadata(); + hTargetImage->setMetadata(*hSourceImage); + hTargetImage->writeMetadata(); + return true; +- } catch (Exiv2::AnyError& Error) { ++ } catch (Exiv2::Error& Error) { + if (Settings->GetInt("JobMode") == 0) { + ptMessageBox::warning(0 ,"Exiv2 Error","No exif data written!\nCaught Exiv2 exception '" + QString(Error.what()) + "'\n"); + } else { diff --git a/graphics/photivo/files/patch-Sources_ptMain.cpp b/graphics/photivo/files/patch-Sources_ptMain.cpp new file mode 100644 index 000000000000..f250b801004f --- /dev/null +++ b/graphics/photivo/files/patch-Sources_ptMain.cpp @@ -0,0 +1,11 @@ +--- Sources/ptMain.cpp.orig 2016-03-22 03:34:55 UTC ++++ Sources/ptMain.cpp +@@ -5325,7 +5325,7 @@ void ReadSidecar(const QString& Sidecar) + return; + } + +- Exiv2::Image::AutoPtr hImage = Exiv2::ImageFactory::open(Sidecar.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr hImage = Exiv2::ImageFactory::open(Sidecar.toLocal8Bit().data()); + + if (!hImage.get()) { + return;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307092209.369M9guN034320>