Attachment 243141 Details for Bug 272311 – graphics/hugin: make compatible with exiv2 0.28

[patch] graphics/hugin: make compatible with exiv2 0.28

0012-graphics-hugin-make-compatible-with-exiv2-0.28.patch (text/plain), 4.66 KB, created by Matthias Andree on 2023-07-02 14:55:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-02 14:55:39 UTC

Size: 4.66 KB

patch

obsolete

>From fb7ba0b35fe1283cdd52e4c6d19cdb439bea4635 Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sun, 2 Jul 2023 15:19:50 +0200
>Subject: [PATCH 12/20] graphics/hugin: make compatible with exiv2 0.28
>
>PR:		272311
>---
> graphics/hugin/Makefile                       |  2 +-
> ...h-src_hugin__base_panodata_Exiv2Helper.cpp | 27 +++++++++++
> ...-src_hugin__base_panodata_SrcPanoImage.cpp | 47 +++++++++++++++++++
> 3 files changed, 75 insertions(+), 1 deletion(-)
> create mode 100644 graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp
> create mode 100644 graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp
>
>diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
>index 87d244130551..3c5bbd84d9b5 100644
>--- a/graphics/hugin/Makefile
>+++ b/graphics/hugin/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	hugin
> DISTVERSION=	2022.0.0
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	graphics
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
> 
>diff --git a/graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp b/graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp
>new file mode 100644
>index 000000000000..c383922e90da
>--- /dev/null
>+++ b/graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp
>@@ -0,0 +1,27 @@
>+--- 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
>diff --git a/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp b/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp
>new file mode 100644
>index 000000000000..b097a4a9939b
>--- /dev/null
>+++ b/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp
>@@ -0,0 +1,47 @@
>+--- 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
>+                         {
>-- 
>2.41.0
>

Flags:

mandree: maintainer-approval? (fuz)

Actions: View | Diff

Attachments on bug 272311: 243098 | 243100 | 243103 | 243104 | 243106 | 243111 | 243124 | 243125 | 243135 | 243136 | 243137 | 243138 | 243139 | 243140 | 243141 | 243142 | 243143 | 243144 | 243145 | 243146 | 243147 | 243148 | 243154 | 243155 | 243156 | 243157 | 243158 | 243159 | 243160 | 243166 | 243167 | 243168 | 243169 | 243170 | 243171 | 243172 | 243175 | 243176