Attachment #243176 for bug #272311

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

and this patch

Lines 1-6 Link Here

(-)b/graphics/filmulator/Makefile (-1 / +1 lines)
1	PORTNAME= filmulator	1	PORTNAME= filmulator
2	PORTVERSION= 0.11.1	2	PORTVERSION= 0.11.1
3	PORTREVISION= 1	3	PORTREVISION= 2
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	CATEGORIES= graphics	5	CATEGORIES= graphics
6		6

Added Link Here

(-)b/graphics/filmulator/files/patch-core_imwriteJpeg.cpp (+11 lines)
1	--- core/imwriteJpeg.cpp.orig 2021-03-05 05:27:44 UTC
2	+++ core/imwriteJpeg.cpp
3	@@ -186,7 +186,7 @@ static void remove_exif_keys(Exiv2::ExifData &exifData
4	{
5	exifData.erase(pos);
6	}
7	- } catch (Exiv2::AnyError &e) {
8	+ } catch (Exiv2::Error &e) {
9	//catch invalid tag
10	}
11	}




--- database/exifFunctions.cpp.orig	2021-03-05 05:27:44 UTC
+++ database/exifFunctions.cpp
@@ -123,7 +123,7 @@ int exifDefaultRotation(const std::string fullFilename
         int exifOrientation;
         try
         {
-            exifOrientation = (int) exifData["Exif.Image.Orientation"].value().toLong();
+            exifOrientation = (int) exifData["Exif.Image.Orientation"].value().toInt64();
         }
         catch (...)
         {
@@ -295,7 +295,7 @@ int exifRating(const std::string fullFilename)
         std::string maker = exifData["Exif.Image.Make"].toString();
         if (maker.compare("Canon") == 0)
         {
-            return min(5,max(0,(int) xmpData["Xmp.xmp.Rating"].toLong()));
+            return min(5,max(0,(int) xmpData["Xmp.xmp.Rating"].toInt64()));
         }
         return 0;
     }

Return to bug 272311

Added Link Here

(-)b/graphics/filmulator/files/patch-database_exifFunctions.cpp (-1 / +20 lines)
0	-	1	--- database/exifFunctions.cpp.orig 2021-03-05 05:27:44 UTC
		2	+++ database/exifFunctions.cpp
		3	@@ -123,7 +123,7 @@ int exifDefaultRotation(const std::string fullFilename
		4	int exifOrientation;
		5	try
		6	{
		7	- exifOrientation = (int) exifData["Exif.Image.Orientation"].value().toLong();
		8	+ exifOrientation = (int) exifData["Exif.Image.Orientation"].value().toInt64();
		9	}
		10	catch (...)
		11	{
		12	@@ -295,7 +295,7 @@ int exifRating(const std::string fullFilename)
		13	std::string maker = exifData["Exif.Image.Make"].toString();
		14	if (maker.compare("Canon") == 0)
		15	{
		16	- return min(5,max(0,(int) xmpData["Xmp.xmp.Rating"].toLong()));
		17	+ return min(5,max(0,(int) xmpData["Xmp.xmp.Rating"].toInt64()));
		18	}
		19	return 0;
		20	}