Attachment #243141 for bug #272311

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

and this patch

Lines 1-6 Link Here

(-)b/graphics/hugin/Makefile (-1 / +1 lines)
1	PORTNAME= hugin	1	PORTNAME= hugin
2	DISTVERSION= 2022.0.0	2	DISTVERSION= 2022.0.0
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= graphics	4	CATEGORIES= graphics
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
6		6




--- src/hugin_base/panodata/Exiv2Helper.cpp.orig	2019-05-15 15:30:47 UTC
+++ src/hugin_base/panodata/Exiv2Helper.cpp
@@ -40,7 +40,7 @@ namespace HuginBase
             Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
             if (itr != exifData.end() && itr->count())
             {
-                value = itr->toLong();
+                value = itr->toInt64();
                 return true;
             }
             else
@@ -165,7 +165,7 @@ namespace HuginBase
         {
             if(it!=exifData.end() && it->count())
             {
-                return it->toLong();
+                return it->toInt64();
             }
             return 0;
         };
@@ -600,4 +600,4 @@ namespace HuginBase
         };
 
     }; //namespace Exiv2Helper
-}; //namespace HuginBase
\ No newline at end of file
+}; //namespace HuginBase




--- src/hugin_base/panodata/SrcPanoImage.cpp.orig	2022-05-26 16:18:56 UTC
+++ src/hugin_base/panodata/SrcPanoImage.cpp
@@ -384,7 +384,7 @@ bool SrcPanoImage::readEXIF()
                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
                     if (pos != xmpData.end())
                     {
-                        croppedWidth = pos->toLong();
+                        croppedWidth = pos->toInt64();
                     }
                     else
                     {
@@ -394,7 +394,7 @@ bool SrcPanoImage::readEXIF()
                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
                     if (pos != xmpData.end())
                     {
-                        croppedHeight = pos->toLong();
+                        croppedHeight = pos->toInt64();
                     }
                     else
                     {
@@ -408,7 +408,7 @@ bool SrcPanoImage::readEXIF()
                         double hfov = 0;
                         if (pos != xmpData.end())
                         {
-                            hfov = 360 * croppedWidth / (double)pos->toLong();
+                            hfov = 360 * croppedWidth / (double)pos->toInt64();
                         }
                         else
                         {
@@ -419,7 +419,7 @@ bool SrcPanoImage::readEXIF()
                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
                         if (pos != xmpData.end())
                         {
-                            fullHeight = pos->toLong();
+                            fullHeight = pos->toInt64();
                         }
                         else
                         {
@@ -430,7 +430,7 @@ bool SrcPanoImage::readEXIF()
                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
                         if (pos != xmpData.end())
                         {
-                            cropTop = pos->toLong();
+                            cropTop = pos->toInt64();
                         }
                         else
                         {

Return to bug 272311

Added Link Here

(-)b/graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp (+27 lines)
1	--- src/hugin_base/panodata/Exiv2Helper.cpp.orig 2019-05-15 15:30:47 UTC
2	+++ src/hugin_base/panodata/Exiv2Helper.cpp
3	@@ -40,7 +40,7 @@ namespace HuginBase
4	Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
5	if (itr != exifData.end() && itr->count())
6	{
7	- value = itr->toLong();
8	+ value = itr->toInt64();
9	return true;
10	}
11	else
12	@@ -165,7 +165,7 @@ namespace HuginBase
13	{
14	if(it!=exifData.end() && it->count())
15	{
16	- return it->toLong();
17	+ return it->toInt64();
18	}
19	return 0;
20	};
21	@@ -600,4 +600,4 @@ namespace HuginBase
22	};
23
24	}; //namespace Exiv2Helper
25	-}; //namespace HuginBase
26	\ No newline at end of file
27	+}; //namespace HuginBase

Added Link Here

(-)b/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp (-1 / +47 lines)
0	-	1	--- src/hugin_base/panodata/SrcPanoImage.cpp.orig 2022-05-26 16:18:56 UTC
		2	+++ src/hugin_base/panodata/SrcPanoImage.cpp
		3	@@ -384,7 +384,7 @@ bool SrcPanoImage::readEXIF()
		4	pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
		5	if (pos != xmpData.end())
		6	{
		7	- croppedWidth = pos->toLong();
		8	+ croppedWidth = pos->toInt64();
		9	}
		10	else
		11	{
		12	@@ -394,7 +394,7 @@ bool SrcPanoImage::readEXIF()
		13	pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
		14	if (pos != xmpData.end())
		15	{
		16	- croppedHeight = pos->toLong();
		17	+ croppedHeight = pos->toInt64();
		18	}
		19	else
		20	{
		21	@@ -408,7 +408,7 @@ bool SrcPanoImage::readEXIF()
		22	double hfov = 0;
		23	if (pos != xmpData.end())
		24	{
		25	- hfov = 360 * croppedWidth / (double)pos->toLong();
		26	+ hfov = 360 * croppedWidth / (double)pos->toInt64();
		27	}
		28	else
		29	{
		30	@@ -419,7 +419,7 @@ bool SrcPanoImage::readEXIF()
		31	pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
		32	if (pos != xmpData.end())
		33	{
		34	- fullHeight = pos->toLong();
		35	+ fullHeight = pos->toInt64();
		36	}
		37	else
		38	{
		39	@@ -430,7 +430,7 @@ bool SrcPanoImage::readEXIF()
		40	pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
		41	if (pos != xmpData.end())
		42	{
		43	- cropTop = pos->toLong();
		44	+ cropTop = pos->toInt64();
		45	}
		46	else
		47	{