Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
graphics/hugin: make compatible with exiv2 0.28
PR: 272311
- Loading branch information
Showing
3 changed files
with
75 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
47 changes: 47 additions & 0 deletions
47
graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| { |