diff --git a/packages/graphics/photivo/files/photivo-scm-lf_fov1_removed.patch b/packages/graphics/photivo/files/photivo-scm-lf_fov1_removed.patch new file mode 100644 index 0000000..3129908 --- /dev/null +++ b/packages/graphics/photivo/files/photivo-scm-lf_fov1_removed.patch @@ -0,0 +1,51 @@ +Upstream: https://code.google.com/p/photivo/issues/detail?id=140 + +diff -r 2debcb532cbd Sources/ptConstants.h +--- a/Sources/ptConstants.h Sun May 25 15:40:27 2014 +0700 ++++ b/Sources/ptConstants.h Mon Dec 01 21:52:31 2014 +0100 +@@ -222,7 +222,6 @@ + const short ptLfunDistModel_None = LF_DIST_MODEL_NONE; + const short ptLfunDistModel_Poly3 = LF_DIST_MODEL_POLY3; + const short ptLfunDistModel_Poly5 = LF_DIST_MODEL_POLY5; +-const short ptLfunDistModel_Fov1 = LF_DIST_MODEL_FOV1; + const short ptLfunDistModel_PTLens = LF_DIST_MODEL_PTLENS; + + +diff -r 2debcb532cbd Sources/ptGuiOptions.cpp +--- a/Sources/ptGuiOptions.cpp Sun May 25 15:40:27 2014 +0700 ++++ b/Sources/ptGuiOptions.cpp Mon Dec 01 21:52:31 2014 +0100 +@@ -177,7 +177,6 @@ + {ptLfunDistModel_None, QObject::tr("None") }, + {ptLfunDistModel_Poly3, QObject::tr("3rd order polynomial") }, + {ptLfunDistModel_Poly5, QObject::tr("5th order polynomial") }, +- {ptLfunDistModel_Fov1, QObject::tr("1st order field of view") }, + {ptLfunDistModel_PTLens, QObject::tr("Panotools lens model") }, + {-1,NULL}}; + +diff -r 2debcb532cbd Sources/ptMainWindow.cpp +--- a/Sources/ptMainWindow.cpp Sun May 25 15:40:27 2014 +0700 ++++ b/Sources/ptMainWindow.cpp Mon Dec 01 21:52:31 2014 +0100 +@@ -3067,7 +3067,6 @@ + short DistModel = Settings->GetInt("LfunDistModel"); + LfunDistPoly3Container->setVisible(DistModel == ptLfunDistModel_Poly3); + LfunDistPoly5Container->setVisible(DistModel == ptLfunDistModel_Poly5); +- LfunDistFov1Container->setVisible(DistModel == ptLfunDistModel_Fov1); + LfunDistPTLensContainer->setVisible(DistModel == ptLfunDistModel_PTLens); + } + +diff -r 2debcb532cbd Sources/ptProcessor.cpp +--- a/Sources/ptProcessor.cpp Sun May 25 15:40:27 2014 +0700 ++++ b/Sources/ptProcessor.cpp Mon Dec 01 21:52:31 2014 +0100 +@@ -2238,12 +2238,6 @@ + DistortionData.Terms[1] = Settings->GetDouble("LfunDistPoly5K2"); + DistortionData.Terms[2] = 0.0; + break; +- case LF_DIST_MODEL_FOV1: +- modflags |= LF_MODIFY_DISTORTION; +- DistortionData.Terms[0] = Settings->GetDouble("LfunDistFov1Omega"); +- DistortionData.Terms[1] = 0.0; +- DistortionData.Terms[2] = 0.0; +- break; + case LF_DIST_MODEL_PTLENS: + modflags |= LF_MODIFY_DISTORTION; + DistortionData.Terms[0] = Settings->GetDouble("LfunDistPTLensA"); diff --git a/packages/graphics/photivo/photivo-scm.exheres-0 b/packages/graphics/photivo/photivo-scm.exheres-0 index 3880187..4708e21 100644 --- a/packages/graphics/photivo/photivo-scm.exheres-0 +++ b/packages/graphics/photivo/photivo-scm.exheres-0 @@ -25,4 +25,5 @@ DEPENDENCIES=" " DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-cmake.patch" + "${FILES}/${PNV}-lf_fov1_removed.patch" )