[Hugin-cvs] hugin/src/include/PT RemappedPanoImage.h,1.18,1.19

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/include/PT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2802/src/include/PT

Modified Files:
	RemappedPanoImage.h 
Log Message:
added license to iccjpeg, compile fix on gcc


Index: RemappedPanoImage.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/RemappedPanoImage.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- RemappedPanoImage.h	5 Mar 2006 00:41:47 -0000	1.18
+++ RemappedPanoImage.h	5 Mar 2006 08:54:46 -0000	1.19
@@ -44,6 +44,7 @@
 #include <vigra_ext/utils.h>
 #include <vigra_ext/VignettingCorrection.h>
 #include <vigra_ext/ImageTransforms.h>
+#include <vigra_ext/FunctorAccessor.h>
 
 #include <PT/Panorama.h>
 #include <PT/PanoToolsInterface.h>
@@ -431,8 +432,8 @@
             if (m_srcImg.getGamma() != 1.0) {
                 // do gamma correction on the fly
                 double gMaxVal = vigra_ext::VigCorrTraits<image_value_type>::max();
-                GammaFunctor gf(1/m_srcImg.getGamma(), gMaxVal);
-                WriteFunctorAccessor<GammaFunctor, Base::ImageAccessor> wfa(gf, Base::m_image.accessor());
+                vigra_ext::GammaFunctor gf(1/m_srcImg.getGamma(), gMaxVal);
+                vigra_ext::WriteFunctorAccessor<vigra_ext::GammaFunctor, typename Base::ImageAccessor> wfa(gf, Base::m_image.accessor());
                 transformImageAlpha(srcImg,
                                     vigra::srcImage(alpha),
                                     vigra::destIterRange(Base::m_image.upperLeft(),
@@ -460,8 +461,8 @@
             if (m_srcImg.getGamma() != 1.0) {
                 // do gamma correction on the fly
                 double gMaxVal = vigra_ext::VigCorrTraits<image_value_type>::max();
-                GammaFunctor gf(1/m_srcImg.getGamma(), gMaxVal);
-                WriteFunctorAccessor<GammaFunctor, Base::ImageAccessor> wfa(gf, Base::m_image.accessor());
+                vigra_ext::GammaFunctor gf(1/m_srcImg.getGamma(), gMaxVal);
+                vigra_ext::WriteFunctorAccessor<vigra_ext::GammaFunctor, typename Base::ImageAccessor> wfa(gf, Base::m_image.accessor());
                 transformImage(srcImg,
                             vigra::destIterRange(Base::m_image.upperLeft(),
                                             Base::m_image.lowerRight(),
@@ -532,8 +533,8 @@
             if (m_srcImg.getGamma() != 1.0) {
                 // do gamma correction on the fly
                 double gMaxVal = vigra_ext::VigCorrTraits<image_value_type>::max();
-                GammaFunctor gf(1/m_srcImg.getGamma(), gMaxVal);
-                WriteFunctorAccessor<GammaFunctor, Base::ImageAccessor> wfa(gf, Base::m_image.accessor());
+                vigra_ext::GammaFunctor gf(1/m_srcImg.getGamma(), gMaxVal);
+                vigra_ext::WriteFunctorAccessor<vigra_ext::GammaFunctor, typename Base::ImageAccessor> wfa(gf, Base::m_image.accessor());
 
                 vigra_ext::transformImageAlpha(srcImg,
                                                 vigra::srcImage(alpha),
@@ -562,8 +563,8 @@
             if (m_srcImg.getGamma() != 1.0) {
                 // do gamma correction on the fly
                 double gMaxVal = vigra_ext::VigCorrTraits<image_value_type>::max();
-                GammaFunctor gf(1/m_srcImg.getGamma(), gMaxVal);
-                WriteFunctorAccessor<GammaFunctor, Base::ImageAccessor> wfa(gf, Base::m_image.accessor());
+                vigra_ext::GammaFunctor gf(1/m_srcImg.getGamma(), gMaxVal);
+                vigra_ext::WriteFunctorAccessor<vigra_ext::GammaFunctor, typename Base::ImageAccessor> wfa(gf, Base::m_image.accessor());
                 vigra_ext::transformImageAlpha(srcImg,
                             alphaImg,
                             vigra::destIterRange(Base::m_image.upperLeft(),