Skip to content

Support Exiv2 0.28+ #30

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
pinotree wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support Exiv2 0.28+ #30

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
9 changes: 9 additions & 0 deletions src/gimplensfun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <exiv2/error.hpp>
#include <exiv2/image.hpp>
#include <exiv2/exif.hpp>
#include <exiv2/version.hpp>

#define VERSIONSTR "0.2.5-dev"

Expand Down Expand Up @@ -1034,7 +1035,11 @@ static void process_image (GimpDrawable *drawable) {
//
static int read_opts_from_exif(const char *filename) {

#if EXIV2_TEST_VERSION(0,28,0)
Exiv2::Image::UniquePtr Exiv2image;
#else
Exiv2::Image::AutoPtr Exiv2image;
#endif
Exiv2::ExifData exifData;

const lfCamera **cameras = 0;
Expand Down Expand Up @@ -1062,7 +1067,11 @@ static int read_opts_from_exif(const char *filename) {
return -1;
}
}
#if EXIV2_TEST_VERSION(0,28,0)
catch (Exiv2::Error& e) {
#else
catch (Exiv2::AnyError& e) {
#endif
if (DEBUG) {
g_print ("exception on reading data. \n");
}
Expand Down