/*
- * Geeqie
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: Vladimir Nadvornik
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include <config.h>
#ifdef HAVE_EXIV2
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+// Don't include the <exiv2/version.hpp> file directly
+// Early Exiv2 versions didn't have version.hpp and the macros.
+#include <exiv2/exiv2.hpp>
#include <iostream>
+#include <string>
// EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
+#ifdef EXIV2_VERSION
#ifndef EXIV2_TEST_VERSION
-# define EXIV2_TEST_VERSION(major,minor,patch) \
+#define EXIV2_TEST_VERSION(major,minor,patch) \
( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
#endif
+#else
+#define EXIV2_TEST_VERSION(major,minor,patch) (false)
+#endif
+#if EXIV2_TEST_VERSION(0,27,0)
+#define HAVE_EXIV2_ERROR_CODE
+#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
-#if !EXIV2_TEST_VERSION(0,17,90)
-#include <exiv2/tiffparser.hpp>
-#include <exiv2/tiffcomposite.hpp>
-#include <exiv2/tiffvisitor.hpp>
-#include <exiv2/tiffimage.hpp>
-#include <exiv2/cr2image.hpp>
-#include <exiv2/crwimage.hpp>
-#if EXIV2_TEST_VERSION(0,16,0)
-#include <exiv2/orfimage.hpp>
-#endif
-#if EXIV2_TEST_VERSION(0,13,0)
-#include <exiv2/rafimage.hpp>
-#endif
-#include <exiv2/futils.hpp>
-#else
-#include <exiv2/preview.hpp>
+#if EXIV2_TEST_VERSION(0,27,0)
+#define EXV_PACKAGE "exiv2"
#endif
-#if EXIV2_TEST_VERSION(0,17,0)
-#include <exiv2/convert.hpp>
-#include <exiv2/xmpsidecar.hpp>
-#endif
-
-extern "C" {
#include <glib.h>
#include "main.h"
#include "exif.h"
#include "filefilter.h"
-#include "ui_fileops.h"
+#include "ui-fileops.h"
#include "misc.h"
-}
typedef struct _AltKey AltKey;
{
}
- virtual void writeMetadata(gchar *path = NULL)
+ virtual void writeMetadata(gchar *UNUSED(path) = NULL)
{
g_critical("Unsupported method of writing metadata");
}
virtual void add_jpeg_color_profile(unsigned char *cp_data, guint cp_length) = 0;
virtual guchar *get_jpeg_color_profile(guint *data_len) = 0;
+
+ virtual std::string image_comment() const = 0;
+
+ virtual void set_image_comment(const std::string& comment) = 0;
};
// This allows read-only access to the original metadata
unsigned char *cp_data_;
guint cp_length_;
gboolean valid_;
+ gchar *pathl_;
Exiv2::ExifData emptyExifData_;
Exiv2::IptcData emptyIptcData_;
cp_length_ = 0;
valid_ = TRUE;
- gchar *pathl = path_from_utf8(path);
+ pathl_ = path_from_utf8(path);
try
{
- image_ = Exiv2::ImageFactory::open(pathl);
+ image_ = Exiv2::ImageFactory::open(pathl_);
// g_assert (image.get() != 0);
image_->readMetadata();
{
valid_ = FALSE;
}
- g_free(pathl);
}
virtual ~_ExifDataOriginal()
{
if (cp_data_) g_free(cp_data_);
+ if (pathl_) g_free(pathl_);
}
virtual Exiv2::Image *image()
if (cp_data_)
{
if (data_len) *data_len = cp_length_;
+#if GLIB_CHECK_VERSION(2,68,0)
+ return (unsigned char *) g_memdup2(cp_data_, cp_length_);
+#else
return (unsigned char *) g_memdup(cp_data_, cp_length_);
+#endif
}
return NULL;
}
+
+ virtual std::string image_comment() const
+ {
+ return image_.get() ? image_->comment() : "";
+ }
+
+ virtual void set_image_comment(const std::string& comment)
+ {
+ if (image_.get())
+ image_->setComment(comment);
+ }
};
-extern "C" {
static void _ExifDataProcessed_update_xmp(gpointer key, gpointer value, gpointer data);
-}
// This allows read-write access to the metadata
struct _ExifDataProcessed : public _ExifData
#endif
Exiv2::Image *image = imageData_->image();
- if (!image) Exiv2::Error(21);
+#ifdef HAVE_EXIV2_ERROR_CODE
+ if (!image) throw Exiv2::Error(Exiv2::kerInputDataReadFailed);
+#else
+ if (!image) throw Exiv2::Error(21);
+#endif
image->setExifData(exifData_);
image->setIptcData(iptcData_);
#if EXIV2_TEST_VERSION(0,16,0)
sidecar->setXmpData(xmpData_);
sidecar->writeMetadata();
+#else
+#ifdef HAVE_EXIV2_ERROR_CODE
+ throw Exiv2::Error(Exiv2::kerNotAnImage, "xmp");
#else
throw Exiv2::Error(3, "xmp");
+#endif
#endif
}
}
{
return imageData_->get_jpeg_color_profile(data_len);
}
+
+ virtual std::string image_comment() const
+ {
+ return imageData_->image_comment();
+ }
+
+ virtual void set_image_comment(const std::string& comment)
+ {
+ imageData_->set_image_comment(comment);
+ }
};
-extern "C" {
void exif_init(void)
#ifdef EXV_ENABLE_NLS
bind_textdomain_codeset (EXV_PACKAGE, "UTF-8");
#endif
+
+#ifdef EXV_ENABLE_BMFF
+ Exiv2::enableBMFF(TRUE);
+#endif
}
}
}
-const char *exif_item_get_format_name(ExifItem *item, gboolean brief)
+const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief))
{
try {
if (!item) return NULL;
#if EXIV2_TEST_VERSION(0,16,0)
std::string str = em->toString(idx);
#else
- std::string str = em->toString(); // FIXME
+ std::string str = em->toString(); /**< @FIXME ?? */
#endif
if (idx == 0 && str == "") str = em->toString();
if (str.length() > 5 && str.substr(0, 5) == "lang=")
TRUE || /* no conversion support */
#endif
!values || /* deleting item */
- !ret /* writing to the explicitely given xmp tag failed */
+ !ret /* writing to the explicitly given xmp tag failed */
)
{
/* deleted xmp metadatum can't be converted, we have to delete also the corresponding legacy tag */
return ret;
}
+gchar* exif_get_image_comment(FileData* fd)
+{
+ if (!fd || !fd->exif)
+ return g_strdup("");
+
+ return g_strdup(fd->exif->image_comment().c_str());
+}
+
+void exif_set_image_comment(FileData* fd, const gchar* comment)
+{
+ if (!fd || !fd->exif)
+ return;
+
+ fd->exif->set_image_comment(comment ? comment : "");
+}
+
+
#if EXIV2_TEST_VERSION(0,17,90)
guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, gint requested_height)
if (!exif->image()) return NULL;
- const char* path = exif->image()->io().path().c_str();
+ std::string const path = exif->image()->io().path();
/* given image pathname, first do simple (and fast) file extension test */
- gboolean is_raw = filter_file_class(path, FORMAT_CLASS_RAWIMAGE);
+ gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE);
if (!is_raw && requested_width == 0) return NULL;
}
#endif
-}
#if !EXIV2_TEST_VERSION(0,17,90)
/* This is a dirty hack to support raw file preview, bassed on
static GList *exif_unmap_list = 0;
-extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, gint requested_height)
+guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, gint requested_height)
{
unsigned long offset;
if (!exif) return NULL;
if (!exif->image()) return NULL;
- const char* path = exif->image()->io().path().c_str();
+ std::string const path = exif->image()->io().path();
/* given image pathname, first do simple (and fast) file extension test */
- if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL;
+ if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL;
try {
struct stat st;
RawFile rf(exif->image()->io());
offset = rf.preview_offset();
- DEBUG_1("%s: offset %lu", path, offset);
+ DEBUG_1("%s: offset %lu", path.c_str(), offset);
- fd = open(path, O_RDONLY);
+ fd = open(path.c_str(), O_RDONLY);
if (fd == -1)
{
return NULL;
projects / geeqie.git / blobdiff