sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/luminance-qt5: make compatible with exiv2 0.28

Browse source 
PR:		272311
This commit is contained in:
Matthias Andree 2023-07-03 01:23:59 +02:00
parent cac713a28e
commit 8b78f1c8e4
4 changed files with 129 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/luminance-qt5/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= luminance-hdr
DISTVERSION= 2.6.1.1
PORTREVISION= 20
PORTREVISION= 21
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}

88
graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp Normal file
View file

@ -0,0 +1,88 @@
--- src/Exif/ExifOperations.cpp.orig 2021-01-11 09:41:28 UTC
+++ src/Exif/ExifOperations.cpp
@@ -108,12 +108,12 @@ void copyExifData(const std::string &from, const std::
#endif
try {
- Exiv2::Image::AutoPtr sourceImage;
+ Exiv2::Image::UniquePtr sourceImage;
Exiv2::ExifData srcExifData;
if (!from.empty()) {
// get source exif data
- sourceImage = Exiv2::ImageFactory::open(from);
+ sourceImage = std::move(Exiv2::ImageFactory::open(from));
sourceImage->readMetadata();
srcExifData = sourceImage->exifData();
@@ -128,7 +128,7 @@ void copyExifData(const std::string &from, const std::
}
// get destination exif data
- Exiv2::Image::AutoPtr destinationImage = Exiv2::ImageFactory::open(to);
+ Exiv2::Image::UniquePtr destinationImage = Exiv2::ImageFactory::open(to);
if (dontOverwrite) {
// doesn't throw anything if it is empty
@@ -212,7 +212,7 @@ void copyExifData(const std::string &from, const std::
destinationImage->setExifData(srcExifData);
}
destinationImage->writeMetadata();
- } catch (Exiv2::AnyError &e) {
+ } catch (Exiv2::Error &e) {
#ifndef NDEBUG
qDebug() << e.what();
#endif
@@ -250,7 +250,7 @@ float obtain_avg_lum(const std::string& filename)
{
try
{
- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
if (exifData.empty())
@@ -329,7 +329,7 @@ allowed for ev computation purposes.
return -1;
}
}
- catch (Exiv2::AnyError& e)
+ catch (Exiv2::Error& e)
{
return -1;
}
@@ -338,7 +338,7 @@ allowed for ev computation purposes.
float getExposureTime(const std::string &filename) {
try {
- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
if (exifData.empty()) return -1;
@@ -374,14 +374,14 @@ float getExposureTime(const std::string &filename) {
} else {
return -1;
}
- } catch (Exiv2::AnyError &e) {
+ } catch (Exiv2::Error &e) {
return -1;
}
}
float getAverageLuminance(const std::string &filename) {
try {
- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
@@ -403,7 +403,7 @@ float getAverageLuminance(const std::string &filename)
<< std::endl;
return -1.0;
- } catch (Exiv2::AnyError &e) {
+ } catch (Exiv2::Error &e) {
return -1.0;
}
}

29
graphics/luminance-qt5/files/patch-src_Libpfs_exif_exifdata.cpp Normal file
View file

@ -0,0 +1,29 @@
--- src/Libpfs/exif/exifdata.cpp.orig 2021-01-11 09:41:28 UTC
+++ src/Libpfs/exif/exifdata.cpp
@@ -52,7 +52,7 @@ ExifData::ExifData(const std::string &filename) { from
void ExifData::fromFile(const std::string &filename) {
reset();
try {
- ::Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+ ::Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
image->readMetadata();
::Exiv2::ExifData &exifData = image->exifData();
@@ -121,7 +121,7 @@ void ExifData::fromFile(const std::string &filename) {
*/
if ((it = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) !=
exifData.end()) {
- long rotation = it->toLong();
+ long rotation = it->toInt64();
switch (rotation) {
case 3:
m_orientation = 180;
@@ -134,7 +134,7 @@ void ExifData::fromFile(const std::string &filename) {
break;
}
}
- } catch (Exiv2::AnyError &e) {
+ } catch (Exiv2::Error &e) {
return;
}
}

11
graphics/luminance-qt5/files/patch-src_TransplantExif_TransplantExifDialog.cpp Normal file
View file

@ -0,0 +1,11 @@
--- src/TransplantExif/TransplantExifDialog.cpp.orig 2021-01-11 09:41:28 UTC
+++ src/TransplantExif/TransplantExifDialog.cpp
@@ -347,7 +347,7 @@ void TransplantExifDialog::transplant_requested() {
QFile::encodeName((*i_dest)).constData(),
m_Ui->checkBox_dont_overwrite->isChecked());
m_Ui->rightlist->item(index)->setBackground(QBrush("#a0ff87"));
- } catch (Exiv2::AnyError &e) {
+ } catch (Exiv2::Error &e) {
add_log_message("ERROR:" + QString::fromStdString(e.what()));
m_Ui->rightlist->item(index)->setBackground(QBrush("#ff743d"));
}