-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi guys,
Could I ask for the following patch to be applied to the hugin code?
When compiling under the current Debian with clang++ 3.5, I get a number
of compile errors which the patch fixes.
cheers, lukas
- --
Do not believe the naysayers who say it cannot be done.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAlUGSjUACgkQ1m2kmG8CIy2NgACgqe9XtDIh7ukcU1Klu5ZatmUr
WSwAoLhzWo202PkFq5dqYdlRYx6YJ5Ej
=uc9j
-----END PGP SIGNATURE-----
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/55064A3A.9030201%40lukas-wirz.de.
For more options, visit https://groups.google.com/d/optout.
diff -r 4708aa71c5fd src/hugin1/hugin/PreviewDifferenceTool.cpp
--- a/src/hugin1/hugin/PreviewDifferenceTool.cpp Sun Mar 15 16:05:32 2015 +0100
+++ b/src/hugin1/hugin/PreviewDifferenceTool.cpp Mon Mar 16 16:06:35 2015 +1300
@@ -132,9 +132,9 @@
float viewer_exposure = 1.0 / pow(2.0,
helper->GetPanoramaPtr()->getOptions().outputExposureValue);
float es = viewer_exposure / img->getExposure();
- float scale[3] = {es / img->getWhiteBalanceRed(),
+ float scale[3] = {static_cast<float>(es / img->getWhiteBalanceRed()),
es,
- es / img->getWhiteBalanceBlue()};
+ static_cast<float>(es / img->getWhiteBalanceBlue())};
// now we draw repeatedly until the image has been exposed properly.
while (scale[0] > 0.0 && scale[1] > 0.0 && scale[2] > 0.0)
{
diff -r 4708aa71c5fd src/hugin1/hugin/TextureManager.cpp
--- a/src/hugin1/hugin/TextureManager.cpp Sun Mar 15 16:05:32 2015 +0100
+++ b/src/hugin1/hugin/TextureManager.cpp Mon Mar 16 16:06:35 2015 +1300
@@ -104,9 +104,9 @@
HuginBase::SrcPanoImage *img = view_state->GetSrcImage(image_number);
// we adjust the intensity by using a darker colour
float es = viewer_exposure / img->getExposure();
- float scale[4] = {es / img->getWhiteBalanceRed(),
+ float scale[4] = {static_cast<float>(es / img->getWhiteBalanceRed()),
es,
- es / img->getWhiteBalanceBlue(),
+ static_cast<float>(es / img->getWhiteBalanceBlue()),
1.0};
glColor3fv(scale);
glCallList(display_list);
diff -r 4708aa71c5fd src/hugin_base/hugin_utils/openmp_lock.h
--- a/src/hugin_base/hugin_utils/openmp_lock.h Sun Mar 15 16:05:32 2015 +0100
+++ b/src/hugin_base/hugin_utils/openmp_lock.h Mon Mar 16 16:06:35 2015 +1300
@@ -64,7 +64,7 @@
{
public:
ScopedLock(Lock& lock):m_lock(lock) {m_lock.Set();}
- ~ScopedLock() {m_lock.Unset();}
+ ~ScopedLock() {m_lock.UnSet();}
private:
ScopedLock(const ScopedLock&);
ScopedLock&operator=(const ScopedLock&);
diff -r 4708aa71c5fd src/hugin_base/vigra_ext/openmp_vigra.h
--- a/src/hugin_base/vigra_ext/openmp_vigra.h Sun Mar 15 16:05:32 2015 +0100
+++ b/src/hugin_base/vigra_ext/openmp_vigra.h Mon Mar 16 16:06:35 2015 +1300
@@ -322,7 +322,7 @@
DestImageIterator dest_upperleft, DestAccessor dest_acc,
ValueType background, int norm)
{
- vigra::distanceTransform(src_upperleft, src_lowerright, src_acc,
+ distanceTransform(src_upperleft, src_lowerright, src_acc,
dest_upperleft, dest_acc,
background, norm);
}
