diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile index 82fc7d296cb54..424647a559501 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 d697215968f17..5c67a26cc7dcd 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 #include +@@ -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 0000000000000..f250b801004f1 --- /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;