* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include <config.h>
#ifdef HAVE_EXIV2
#define EXV_PACKAGE "exiv2"
#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");
}
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;
}
}
};
-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
-extern "C" {
void exif_init(void)
}
}
-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;
}
#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;