Skip to content

Fix build with >=exiv2-0.28.0, raise minimum to 0.27.0 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eclipseo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build with >=exiv2-0.28.0, raise minimum to 0.27.0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ AS_IF([test "x$with_cfitsio" != xno],
[ have_cfitsio=no
AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] ) ] )

PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.20,
PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.27,
[ have_exiv2=yes
AC_DEFINE(HAVE_EXIV2, 1, have the exiv2 library) ],
[ have_exiv2=no
Expand Down
30 changes: 18 additions & 12 deletions ufraw_exiv2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,17 @@
#include <exiv2/exiv2.hpp>
#include <sstream>
#include <cassert>
#include <cinttypes>
#include <iostream>
#include <memory>

#if EXIV2_TEST_VERSION(0,28,0)
typedef Exiv2::Error Exiv2Error;
typedef Exiv2::Image::UniquePtr ImagePtr;
#else
typedef Exiv2::AnyError Exiv2Error;
typedef Exiv2::Image::AutoPtr ImagePtr;
#endif

/*
* Helper function to copy a string to a buffer, converting it from
Expand Down Expand Up @@ -50,7 +60,7 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
uf->inputExifBuf = NULL;
uf->inputExifBufLen = 0;

Exiv2::Image::AutoPtr image;
ImagePtr image;
if (uf->unzippedBuf != NULL) {
image = Exiv2::ImageFactory::open(
(const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen);
Expand All @@ -66,11 +76,7 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
if (exifData.empty()) {
std::string error(uf->filename);
error += ": No Exif data found in the file";
#if EXIV2_TEST_VERSION(0,27,0)
throw Exiv2::Error(Exiv2::kerErrorMessage, error);
#else
throw Exiv2::Error(1, error);
#endif
throw Exiv2Error(Exiv2::ErrorCode::kerErrorMessage, error);
}

/* List of tag names taken from exiv2's printSummary() in actions.cpp */
Expand Down Expand Up @@ -135,7 +141,7 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str());

return UFRAW_SUCCESS;
} catch (Exiv2::AnyError& e) {
} catch (Exiv2Error& e) {
std::cerr.rdbuf(savecerr);
std::string s(e.what());
ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str());
Expand All @@ -155,8 +161,8 @@ static Exiv2::ExifData ufraw_prepare_exifdata(ufraw_data *uf)
/* Reset orientation tag since UFRaw already rotates the image */
if ((pos = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation")))
!= exifData.end()) {
ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%d' to '1'\n",
pos->key().c_str(), pos->value().toLong());
ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%" PRId64 "' to '1'\n",
pos->key().c_str(), pos->value().toInt64());
pos->setValue("1"); /* 1 = Normal orientation */
}
}
Expand Down Expand Up @@ -327,7 +333,7 @@ extern "C" int ufraw_exif_prepare_output(ufraw_data *uf)
ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str());

return UFRAW_SUCCESS;
} catch (Exiv2::AnyError& e) {
} catch (Exiv2Error& e) {
std::cerr.rdbuf(savecerr);
std::string s(e.what());
ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str());
Expand All @@ -347,7 +353,7 @@ extern "C" int ufraw_exif_write(ufraw_data *uf)

char *filename =
uf_win32_locale_filename_from_utf8(uf->conf->outputFilename);
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
ImagePtr image = Exiv2::ImageFactory::open(filename);
uf_win32_locale_filename_free(filename);
assert(image.get() != 0);

Expand All @@ -367,7 +373,7 @@ extern "C" int ufraw_exif_write(ufraw_data *uf)
ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str());

return UFRAW_SUCCESS;
} catch (Exiv2::AnyError& e) {
} catch (Exiv2Error& e) {
std::cerr.rdbuf(savecerr);
std::string s(e.what());
ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str());
Expand Down