View | Details | Raw Unified | Return to bug 272311 | Differences between
and this patch

Collapse All | Expand All

(-)b/graphics/kphotoalbum/Makefile (-1 / +1 lines)
Lines 1-6 Link Here
1 
PORTNAME=	kphotoalbum
 1 
PORTNAME=	kphotoalbum
2 
DISTVERSION=	5.10.0
 2 
DISTVERSION=	5.10.0
3 
PORTREVISION=	1
 3 
PORTREVISION=	2
4 
CATEGORIES=	graphics kde
 4 
CATEGORIES=	graphics kde
5 
MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
 5 
MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
6 
DIST_SUBDIR=	KDE
 6 
DIST_SUBDIR=	KDE
(-)b/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp (+11 lines)
Added Link Here
1 
--- DB/FileInfo.cpp.orig	2023-03-25 09:46:12 UTC
2 
+++ DB/FileInfo.cpp
3 
@@ -80,7 +80,7 @@ void DB::FileInfo::parseEXIV2(const DB::FileName &file
4
5 
         int orientation = 0;
6 
         if (datum.count() > 0)
7 
-            orientation = datum.toLong();
8 
+            orientation = datum.toInt64();
9 
         m_angle = orientationToAngle(orientation);
10 
     }
11
(-)b/graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp (+20 lines)
Added Link Here
1 
--- lib/kpaexif/Database.cpp.orig	2023-03-25 09:46:12 UTC
2 
+++ lib/kpaexif/Database.cpp
3 
@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName &fileName)
4 
         return false;
5
6 
     try {
7 
-        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
8 
+        Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()) };
9 
         Q_ASSERT(image.get() != nullptr);
10 
         image->readMetadata();
11 
         Exiv2::ExifData &exifData = image->exifData();
12 
@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList &list)
13
14 
     for (const DB::FileName &fileName : list) {
15 
         try {
16 
-            Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
17 
+            Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()) };
18 
             Q_ASSERT(image.get() != nullptr);
19 
             image->readMetadata();
20 
             map << DBExifInfo(fileName, image->exifData());
(-)b/graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp (+11 lines)
Added Link Here
1 
--- lib/kpaexif/DatabaseElement.cpp.orig	2023-03-25 09:46:12 UTC
2 
+++ lib/kpaexif/DatabaseElement.cpp
3 
@@ -77,7 +77,7 @@ QString Exif::IntExifElement::queryString() const
4 
 QVariant Exif::IntExifElement::valueFromExif(Exiv2::ExifData &data) const
5 
 {
6 
     if (data[m_tag].count() > 0)
7 
-        return QVariant { (int)data[m_tag].toLong() };
8 
+        return QVariant { (int)data[m_tag].toInt64() };
9 
     else
10 
         return QVariant { (int)0 };
11 
 }
(-)b/graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp (-1 / +20 lines)
Added Link Here
0 
-
1 
--- lib/kpaexif/Info.cpp.orig	2023-07-02 23:13:17 UTC
2 
+++ lib/kpaexif/Info.cpp
3 
@@ -166,7 +166,7 @@ Info::Info()
4 
 void Exif::writeExifInfoToFile(const DB::FileName &srcName, const QString &destName, const QString &imageDescription)
5 
 {
6 
     // Load Exif from source image
7 
-    Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data());
8 
+    Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data()) };
9 
     image->readMetadata();
10 
     Exiv2::ExifData data = image->exifData();
11
12 
@@ -201,7 +201,7 @@ Exif::Metadata Exif::Info::metadata(const DB::FileName
13 
 {
14 
     try {
15 
         Exif::Metadata result;
16 
-        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data());
17 
+        Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data()) };
18 
         Q_ASSERT(image.get() != nullptr);
19 
         image->readMetadata();
20 
         result.exif = image->exifData();

Return to bug 272311