Commit 31eddbf0 authored by Matthias Andree's avatar Matthias Andree
Browse files

graphics/kphotoalbum: make compatible with exiv2 0.28 

PR:		272311
parent 77c434f5

graphics/kphotoalbum/Makefile

+1 −1
Original line number Diff line number Diff line 
PORTNAME=	kphotoalbum

DISTVERSION=	5.10.0

PORTREVISION=	1

PORTREVISION=	2

CATEGORIES=	graphics kde

MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/

DIST_SUBDIR=	KDE

graphics/kphotoalbum/files/patch-DB_FileInfo.cpp

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- DB/FileInfo.cpp.orig	2023-03-25 09:46:12 UTC

+++ DB/FileInfo.cpp

@@ -80,7 +80,7 @@ void DB::FileInfo::parseEXIV2(const DB::FileName &file

 

         int orientation = 0;

         if (datum.count() > 0)

-            orientation = datum.toLong();

+            orientation = datum.toInt64();

         m_angle = orientationToAngle(orientation);

     }

graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp

0 → 100644
+20 −0
Original line number Diff line number Diff line 
--- lib/kpaexif/Database.cpp.orig	2023-03-25 09:46:12 UTC

+++ lib/kpaexif/Database.cpp

@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName &fileName)

         return false;

 

     try {

-        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());

+        Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()) };

         Q_ASSERT(image.get() != nullptr);

         image->readMetadata();

         Exiv2::ExifData &exifData = image->exifData();

@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList &list)

 

     for (const DB::FileName &fileName : list) {

         try {

-            Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());

+            Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()) };

             Q_ASSERT(image.get() != nullptr);

             image->readMetadata();

             map << DBExifInfo(fileName, image->exifData());

graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- lib/kpaexif/DatabaseElement.cpp.orig	2023-03-25 09:46:12 UTC

+++ lib/kpaexif/DatabaseElement.cpp

@@ -77,7 +77,7 @@ QString Exif::IntExifElement::queryString() const

 QVariant Exif::IntExifElement::valueFromExif(Exiv2::ExifData &data) const

 {

     if (data[m_tag].count() > 0)

-        return QVariant { (int)data[m_tag].toLong() };

+        return QVariant { (int)data[m_tag].toInt64() };

     else

         return QVariant { (int)0 };

 }

graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp

0 → 100644
+20 −0
Original line number Diff line number Diff line 
--- lib/kpaexif/Info.cpp.orig	2023-07-02 23:13:17 UTC

+++ lib/kpaexif/Info.cpp

@@ -166,7 +166,7 @@ Info::Info()

 void Exif::writeExifInfoToFile(const DB::FileName &srcName, const QString &destName, const QString &imageDescription)

 {

     // Load Exif from source image

-    Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data());

+    Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data()) };

     image->readMetadata();

     Exiv2::ExifData data = image->exifData();

 

@@ -201,7 +201,7 @@ Exif::Metadata Exif::Info::metadata(const DB::FileName

 {

     try {

         Exif::Metadata result;

-        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data());

+        Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data()) };

         Q_ASSERT(image.get() != nullptr);

         image->readMetadata();

         result.exif = image->exifData();