Attachment #243138 for bug #272311

View | Details | Raw Unified | Return to bug 272311 | Differences between

and this patch

Lines 1-7 Link Here

(-)b/graphics/geeqie/Makefile (-1 / +2 lines)
1	PORTNAME= geeqie	1	PORTNAME= geeqie
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.0.1	3	DISTVERSION= 2.0.1
4	PORTREVISION= 11	4	PORTREVISION= 12
5	CATEGORIES= graphics	5	CATEGORIES= graphics
6		6
7	MAINTAINER= amdmi3@FreeBSD.org	7	MAINTAINER= amdmi3@FreeBSD.org
Lines 21-26 USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 Link Here
21	USE_GITHUB= yes	21	USE_GITHUB= yes
22	GH_ACCOUNT= BestImageViewer	22	GH_ACCOUNT= BestImageViewer
23	SHEBANG_FILES= plugins//geeqie-	23	SHEBANG_FILES= plugins//geeqie-
		24	CFLAGS= -Wno-deprecated-declarations
24		25
25	PORTDOCS= *	26	PORTDOCS= *
26		27




--- src/exiv2.cc.orig	2022-08-12 09:36:37 UTC
+++ src/exiv2.cc
@@ -52,6 +52,11 @@
 #define EXV_PACKAGE "exiv2"
 #endif
 
+#if EXIV2_TEST_VERSION(0,28,0)
+#define AnyError Error
+#define AutoPtr UniquePtr
+#endif 
+
 extern "C" {
 #include <glib.h>
 
@@ -176,7 +181,7 @@ struct _ExifDataOriginal : public _ExifData (public)
 	{
 		cp_data_ = NULL;
 		cp_length_ = 0;
-		image_ = image;
+		image_ = std::move(image);
 		valid_ = TRUE;
 	}
 
@@ -364,7 +369,7 @@ struct _ExifDataProcessed : public _ExifData (public)
 			Exiv2::Image *image = imageData_->image();
 
 #ifdef HAVE_EXIV2_ERROR_CODE
-			if (!image) throw Exiv2::Error(Exiv2::kerInputDataReadFailed);
+			if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
 #else
 			if (!image) throw Exiv2::Error(21);
 #endif
@@ -388,7 +393,7 @@ struct _ExifDataProcessed : public _ExifData (public)
 			sidecar->writeMetadata();
 #else
 #ifdef HAVE_EXIV2_ERROR_CODE
-			throw Exiv2::Error(Exiv2::kerNotAnImage, "xmp");
+			throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
 #else
 			throw Exiv2::Error(3, "xmp");
 #endif
@@ -840,7 +845,7 @@ gint exif_item_get_integer(ExifItem *item, gint *value
 {
 	try {
 		if (!item || exif_item_get_elements(item) == 0) return 0;
-		*value = ((Exiv2::Metadatum *)item)->toLong();
+		*value = ((Exiv2::Metadatum *)item)->toInt64();
 		return 1;
 	}
 	catch (Exiv2::AnyError& e) {
@@ -1224,11 +1229,12 @@ guchar *exif_get_preview(ExifData *exif, guint *data_l
 
 			Exiv2::PreviewImage image = pm.getPreviewImage(*pos);
 
+			// https://github.com/BestImageViewer/geeqie/issues/1090
 			Exiv2::DataBuf buf = image.copy();
-			std::pair<Exiv2::byte*, long> p = buf.release();
-
-			*data_len = p.second;
-			return p.first;
+			*data_len = buf.size();
+			auto b = buf.data();
+			buf.reset();
+			return b;
 			}
 		return NULL;
 	}
@@ -1489,22 +1495,22 @@ unsigned long RawFile::preview_offset(void)
 	if (type == Exiv2::ImageType::cr2)
 		{
 		val = find(0x111, Group::ifd0);
-		if (val) return val->toLong();
+		if (val) return val->toInt64();
 
 		return 0;
 		}
 
 	val = find(0x201, Group::sub0_0);
-	if (val) return val->toLong();
+	if (val) return val->toInt64();
 
 	val = find(0x201, Group::ifd0);
-	if (val) return val->toLong();
+	if (val) return val->toInt64();
 
 	val = find(0x201, Group::ignr); // for PEF files, originally it was probably ifd2
-	if (val) return val->toLong();
+	if (val) return val->toInt64();
 
 	val = find(0x111, Group::sub0_1); // dng
-	if (val) return val->toLong();
+	if (val) return val->toInt64();
 
 	return 0;
 }

Return to bug 272311

Added Link Here

(-)b/graphics/geeqie/files/patch-src_exiv2.cc (-1 / +95 lines)
0	-	1	--- src/exiv2.cc.orig 2022-08-12 09:36:37 UTC
		2	+++ src/exiv2.cc
		3	@@ -52,6 +52,11 @@
		4	#define EXV_PACKAGE "exiv2"
		5	#endif
		6
		7	+#if EXIV2_TEST_VERSION(0,28,0)
		8	+#define AnyError Error
		9	+#define AutoPtr UniquePtr
		10	+#endif
		11	+
		12	extern "C" {
		13	#include <glib.h>
		14
		15	@@ -176,7 +181,7 @@ struct _ExifDataOriginal : public _ExifData (public)
		16	{
		17	cp_data_ = NULL;
		18	cp_length_ = 0;
		19	- image_ = image;
		20	+ image_ = std::move(image);
		21	valid_ = TRUE;
		22	}
		23
		24	@@ -364,7 +369,7 @@ struct _ExifDataProcessed : public _ExifData (public)
		25	Exiv2::Image *image = imageData_->image();
		26
		27	#ifdef HAVE_EXIV2_ERROR_CODE
		28	- if (!image) throw Exiv2::Error(Exiv2::kerInputDataReadFailed);
		29	+ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
		30	#else
		31	if (!image) throw Exiv2::Error(21);
		32	#endif
		33	@@ -388,7 +393,7 @@ struct _ExifDataProcessed : public _ExifData (public)
		34	sidecar->writeMetadata();
		35	#else
		36	#ifdef HAVE_EXIV2_ERROR_CODE
		37	- throw Exiv2::Error(Exiv2::kerNotAnImage, "xmp");
		38	+ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
		39	#else
		40	throw Exiv2::Error(3, "xmp");
		41	#endif
		42	@@ -840,7 +845,7 @@ gint exif_item_get_integer(ExifItem item, gint value
		43	{
		44	try {
		45	if (!item \|\| exif_item_get_elements(item) == 0) return 0;
		46	- value = ((Exiv2::Metadatum )item)->toLong();
		47	+ value = ((Exiv2::Metadatum )item)->toInt64();
		48	return 1;
		49	}
		50	catch (Exiv2::AnyError& e) {
		51	@@ -1224,11 +1229,12 @@ guchar exif_get_preview(ExifData exif, guint *data_l
		52
		53	Exiv2::PreviewImage image = pm.getPreviewImage(*pos);
		54
		55	+ // https://github.com/BestImageViewer/geeqie/issues/1090
		56	Exiv2::DataBuf buf = image.copy();
		57	- std::pair<Exiv2::byte*, long> p = buf.release();
		58	-
		59	- *data_len = p.second;
		60	- return p.first;
		61	+ *data_len = buf.size();
		62	+ auto b = buf.data();
		63	+ buf.reset();
		64	+ return b;
		65	}
66	return NULL;
67	}
68	@@ -1489,22 +1495,22 @@ unsigned long RawFile::preview_offset(void)
69	if (type == Exiv2::ImageType::cr2)
70	{
71	val = find(0x111, Group::ifd0);
72	- if (val) return val->toLong();
73	+ if (val) return val->toInt64();
74
75	return 0;
76	}
77
78	val = find(0x201, Group::sub0_0);
79	- if (val) return val->toLong();
80	+ if (val) return val->toInt64();
81
82	val = find(0x201, Group::ifd0);
83	- if (val) return val->toLong();
84	+ if (val) return val->toInt64();
85
86	val = find(0x201, Group::ignr); // for PEF files, originally it was probably ifd2
87	- if (val) return val->toLong();
88	+ if (val) return val->toInt64();
89
90	val = find(0x111, Group::sub0_1); // dng
91	- if (val) return val->toLong();
92	+ if (val) return val->toInt64();
93
94	return 0;
95	}