diff options
Diffstat (limited to 'media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch')
-rw-r--r-- | media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch deleted file mode 100644 index dff74132b48f..000000000000 --- a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch +++ /dev/null @@ -1,99 +0,0 @@ -Patch originally taken from ArchLinux, modified to be backwards compatible. - -diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp ---- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 24 19:13:20 2023 +0200 -+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Mon Jun 05 00:31:19 2023 +0200 -@@ -40,7 +40,11 @@ - Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName)); - if (itr != exifData.end() && itr->count()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ value = itr->toUint32(); -+#else - value = itr->toLong(); -+#endif - return true; - } - else -@@ -165,7 +169,11 @@ - { - if(it!=exifData.end() && it->count()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ return it->toUint32(); -+#else - return it->toLong(); -+#endif - } - return 0; - }; -@@ -600,4 +608,4 @@ - }; - - }; //namespace Exiv2Helper --}; //namespace HuginBase -\ No newline at end of file -+}; //namespace HuginBase -diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp ---- a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 24 19:13:20 2023 +0200 -+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Mon Jun 05 00:31:19 2023 +0200 -@@ -384,7 +384,11 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels")); - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ croppedWidth = pos->toUint32(); -+#else - croppedWidth = pos->toLong(); -+#endif - } - else - { -@@ -394,7 +398,11 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels")); - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ croppedHeight = pos->toUint32(); -+#else - croppedHeight = pos->toLong(); -+#endif - } - else - { -@@ -408,7 +416,11 @@ - double hfov = 0; - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ hfov = 360 * croppedWidth / (double)pos->toUint32(); -+#else - hfov = 360 * croppedWidth / (double)pos->toLong(); -+#endif - } - else - { -@@ -419,7 +431,11 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels")); - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ fullHeight = pos->toUint32(); -+#else - fullHeight = pos->toLong(); -+#endif - } - else - { -@@ -430,7 +446,11 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels")); - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ cropTop = pos->toUint32(); -+#else - cropTop = pos->toLong(); -+#endif - } - else - { |