Hugin

Update of /cvsroot/hugin/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1167

Modified Files:
	configure.ac 
Log Message:
previous change always disabled hugin and nona_gui


Index: configure.ac
===================================================================
RCS file: /cvsroot/hugin/hugin/configure.ac,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- configure.ac	8 Jun 2006 20:15:40 -0000	1.31
+++ configure.ac	8 Jun 2006 21:59:17 -0000	1.32
@@ -67,11 +67,10 @@
 
 
 dnl Whether GCJ_PROPERTIES is used depends on the target.
-if test -n "$enable_gio"; then
-	with_gui='yes'
-fi
-if test "$enable_gui" = no; then
+if test "x$enable_gui" = 'xno'; then
 	with_gui='no'
+else
+	with_gui='yes'
 fi
 
 AM_CONDITIONAL(BuildGUI, test "x$with_gui" = 'xyes')

Update of /cvsroot/hugin/hugin/src
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21725/src

Modified Files:
	Makefile.am 
Log Message:
added --disable-gui configure option, for people that just want to build
fulla and nona. This does not require wxWidgets.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	8 Jan 2006 15:11:43 -0000	1.6
+++ Makefile.am	8 Jun 2006 20:15:41 -0000	1.7
@@ -1,7 +1,11 @@
 # Over-ride default includes so that we have finer control in the makefiles
 DEFAULT_INCLUDES="-I."
 
-SUBDIRS=jhead common foreign vigra_ext Panorama hugin tools nona_gui
+if BuildGUI
+  MAYBE_HUGIN = hugin
+  MAYBE_NONA_GUI = nona_gui
+endif
+SUBDIRS=jhead common foreign vigra_ext Panorama tools $(MAYBE_HUGIN) $(MAYBE_NONA_GUI)
 
 dist-hook:
 	rm -rf `find $(distdir)/include $(distdir)/dox $(distdir)/tests $(distdir)/build_msvc -name CVS`

Update of /cvsroot/hugin/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21725

Modified Files:
	configure.ac 
Log Message:
added --disable-gui configure option, for people that just want to build
fulla and nona. This does not require wxWidgets.


Index: configure.ac
===================================================================
RCS file: /cvsroot/hugin/hugin/configure.ac,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- configure.ac	19 Apr 2006 20:30:59 -0000	1.30
+++ configure.ac	8 Jun 2006 20:15:40 -0000	1.31
@@ -61,6 +61,22 @@
 
 AM_CONDITIONAL(HAVE_AMD64, test "${HCPU}" = "amd64")
 
+AC_ARG_ENABLE(gui,
+          AC_HELP_STRING([--disable-gui],
+		         [disable gui (compile only nona and fulla)]))
+
+
+dnl Whether GCJ_PROPERTIES is used depends on the target.
+if test -n "$enable_gio"; then
+	with_gui='yes'
+fi
+if test "$enable_gui" = no; then
+	with_gui='no'
+fi
+
+AM_CONDITIONAL(BuildGUI, test "x$with_gui" = 'xyes')
+
+
 dnl --- look for "ZIP", required for building the help file
 AC_PATH_PROG(ZIP, zip, no)
 if [[ $ZIP = "no" ]] ; then
@@ -209,6 +225,8 @@
 dnl     ])
 dnl fi
 
+if test "x$with_gui" = 'xyes' ; then
+
 if test "x$with_unicode" = 'xyes' ; then
   AM_PATH_WXCONFIG(2.4.2, wxWin=1,,, --unicode=yes)
 else
@@ -238,6 +256,8 @@
   fi
 fi
 
+fi
+
 AC_DEFINE_UNQUOTED(HUGIN_VERSION, $PACKAGE_VERSION)
 
 case "$HSYS" in
@@ -323,6 +343,7 @@
 echo "BOOST            --with-boost=$with_boost		have_boost = $have_boost"
 echo "Unicode          --with-unicode=$with_unicode"
 echo "Debug enabled?   $enable_debug"
+echo "compile GUI programs hugin and nona_gui:    $with_gui"
 echo ""
 echo "Options used to compile and link:"
 echo "  PREFIX           = $prefix"

Update of /cvsroot/hugin/hugin/src/tools
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32048

Modified Files:
	fulla.cpp 
Log Message:
bugfix: gamma setting doesn't enforce PTLens lookup


Index: fulla.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/tools/fulla.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fulla.cpp	7 Jun 2006 06:12:50 -0000	1.13
+++ fulla.cpp	8 Jun 2006 06:08:29 -0000	1.14
@@ -556,6 +556,7 @@
         case 'i':
             gamma = atof(optarg);
             c.setGamma(gamma);
+            break;
         case 'p':
             doPTLens = true;
             break;

Update of /cvsroot/hugin/hugin/src/tools
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22267/src/tools

Modified Files:
	fulla.cpp 
Log Message:
fulla: minor speedup by incoporating scaling into first distortion
correction.


Index: fulla.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/tools/fulla.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fulla.cpp	4 Jun 2006 23:17:36 -0000	1.12
+++ fulla.cpp	7 Jun 2006 06:12:50 -0000	1.13
@@ -60,7 +60,7 @@
 template <class SrcImgType, class FlatImgType, class DestImgType>
 void correctImage(SrcImgType & srcImg,
                   const FlatImgType & srcFlat,
-                  const PT::SrcPanoImage & src,
+                  PT::SrcPanoImage src,
                   vigra_ext::Interpolator interpolator,
                   DestImgType & destImg,
                   bool doCrop,
@@ -75,8 +75,8 @@
     bool vigCorrDivision = (src.getVigCorrMode() & PT::SrcPanoImage::VIGCORR_DIV)>0;
 
     RSrcPixelType ka,kb;
-    bool doBrightnessConversion = convertKParams(src.getBrightnessFactor(),
-                                                 src.getBrightnessOffset(),
+    bool doBrightnessConversion = convertKParams(src.getBrightnessFactor(),
+                                                 src.getBrightnessOffset(),
                                                  ka, kb);
     bool dither = vigra_ext::ditheringNeeded(SrcPixelType());
 
@@ -115,7 +115,16 @@
     if (doCrop) {
         scaleFactor=estScaleFactorForFullFrame(src);
         DEBUG_DEBUG("Black border correction scale factor: " << scaleFactor);
+        double sf=scaleFactor;
+        vector<double> radGreen = src.getRadialDistortion();
+        for (int i=0; i < 4; i++) {
+            radGreen[3-i] *=sf;
+            sf *=scaleFactor;
+        }
+        src.setRadialDistortion(radGreen);
     }
+
+
     // hmm, dummy alpha image...
     BImage alpha(srcImg.size());
 
@@ -128,9 +137,9 @@
                 << "b: " << radBlue[0] << " " << radBlue[1] << " " << radBlue[2] << " " << radBlue[3] << endl);
         */
         // remap individual channels
-        SpaceTransform transf;
-        transf.InitRadialCorrect(src, 0, scaleFactor);
-        if (transf.isIdentity()) {
+        SpaceTransform transfr;
+        transfr.InitRadialCorrect(src, 0);
+        if (transfr.isIdentity()) {
             vigra::copyImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), RedAccessor<SrcPixelType>()),
                              destIter(destImg.upperLeft(), RedAccessor<DestPixelType>()));
         } else {
@@ -138,14 +147,15 @@
                            destIterRange(destImg.upperLeft(), destImg.lowerRight(), RedAccessor<DestPixelType>()),
                            destImage(alpha),
                            vigra::Diff2D(0,0),
-                           transf,
+                           transfr,
                            false,
                            vigra_ext::INTERP_SPLINE_16,
                            progress);
         }
 
-        transf.InitRadialCorrect(src, 1, scaleFactor);
-        if (transf.isIdentity()) {
+        SpaceTransform transfg;
+        transfg.InitRadialCorrect(src, 1);
+        if (transfg.isIdentity()) {
             vigra::copyImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), GreenAccessor<SrcPixelType>()),
                              destIter(destImg.upperLeft(), GreenAccessor<DestPixelType>()));
         } else {
@@ -153,14 +163,15 @@
                            destIterRange(destImg.upperLeft(), destImg.lowerRight(), GreenAccessor<DestPixelType>()),
                            destImage(alpha),
                            vigra::Diff2D(0,0),
-                           transf,
+                           transfg,
                            false,
                            vigra_ext::INTERP_SPLINE_16,
                            progress);
         }
 
-        transf.InitRadialCorrect(src, 2, scaleFactor);
-        if (transf.isIdentity()) {
+        SpaceTransform transfb;
+        transfb.InitRadialCorrect(src, 2);
+        if (transfb.isIdentity()) {
             vigra::copyImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), BlueAccessor<SrcPixelType>()),
                              destIter(destImg.upperLeft(), BlueAccessor<DestPixelType>()));
         } else {
@@ -168,7 +179,7 @@
                            destIterRange(destImg.upperLeft(), destImg.lowerRight(), BlueAccessor<DestPixelType>()),
                            destImage(alpha),
                            vigra::Diff2D(0,0),
-                           transf,
+                           transfb,
                            false,
                            vigra_ext::INTERP_SPLINE_16,
                            progress);
@@ -176,7 +187,7 @@
     } else {
         // remap with the same coefficient.
         SpaceTransform transf;
-        transf.InitRadialCorrect(src, 2, scaleFactor);
+        transf.InitRadialCorrect(src, 1);
         vector <double> radCoeff = src.getRadialDistortion();
         if (transf.isIdentity() || 
             (radCoeff[0] == 0.0 && radCoeff[1] == 0.0 && radCoeff[2] == 0.0 && radCoeff[3] == 1.0))
@@ -681,7 +692,6 @@
                 if (strcmp(pixelType, "UINT8") == 0) {
                     correctRGB<RGBValue<UInt8> >(c, info, outIt->c_str(), doCropBorders, pdisp);
                 }
-                /*
                 else if (strcmp(pixelType, "UINT16") == 0) {
                     correctRGB<RGBValue<UInt16> >(c, info, outIt->c_str(), doCropBorders, pdisp);
                 } else if (strcmp(pixelType, "INT16") == 0) {
@@ -693,7 +703,6 @@
                 } else if (strcmp(pixelType, "DOUBLE") == 0) {
                     correctRGB<RGBValue<double> >(c, info, outIt->c_str(), doCropBorders, pdisp);
                 }
-                */
             } else {
                 DEBUG_ERROR("unsupported depth, only 3 channel images are supported");
                 throw std::runtime_error("unsupported depth, only 3 channels images are supported");

Update of /cvsroot/hugin/hugin/src/Panorama
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22267/src/Panorama

Modified Files:
	SpaceTransform.cpp 
Log Message:
fulla: minor speedup by incoporating scaling into first distortion
correction.


Index: SpaceTransform.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/SpaceTransform.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SpaceTransform.cpp	4 Jun 2006 21:48:19 -0000	1.13
+++ SpaceTransform.cpp	7 Jun 2006 06:12:49 -0000	1.14
@@ -1072,7 +1072,7 @@
 }
 
 /** Create a transform stack for distortion & TCA correction only */
-void SpaceTransform::InitInvRadialCorrect(const SrcPanoImage & src, int channel, double scale)
+void SpaceTransform::InitInvRadialCorrect(const SrcPanoImage & src, int channel)
 {
     double mprad[6];
 
@@ -1126,15 +1126,11 @@
     if ( mprad[0] != 1.0 || mprad[1] != 0.0 || mprad[2] != 0.0 || mprad[3] != 0.0) {
         AddTransform (&inv_radial, mprad[0], mprad[1], mprad[2], mprad[3], mprad[4], mprad[5]);
     }
-
-    if (scale != 1.0) {
-        AddTransform(&resize, 1/scale, 1/scale);
-    }
 }
 
 
 /** Create a transform stack for distortion & TCA correction only */
-void SpaceTransform::InitRadialCorrect(const SrcPanoImage & src, int channel, double scale)
+void SpaceTransform::InitRadialCorrect(const SrcPanoImage & src, int channel)
 {
     double mprad[6];
 
@@ -1147,10 +1143,6 @@
     m_destTX = src.getSize().x/2.0;
     m_destTY = src.getSize().y/2.0;
 
-    if (scale != 1.0) {
-        AddTransform(&resize, scale, scale);
-    }
-
     // green channel, always correct
     for (int i=0; i < 4; i++) {
         mprad[3-i] = src.getRadialDistortion()[i];
@@ -1162,6 +1154,9 @@
     // radial correction if nonzero radial coefficients
     if ( mprad[0] != 1.0 || mprad[1] != 0.0 || mprad[2] != 0.0 || mprad[3] != 0.0) {
         AddTransform (&radial, mprad[0], mprad[1], mprad[2], mprad[3], mprad[4], mprad[5]);
+        DEBUG_DEBUG("Init Radial (green): " 
+                << "g: " << mprad[0] << " " << mprad[1] << " " << mprad[2] 
+                << " " << mprad[3] << " " << mprad[4] << " " << mprad[5]);
     }
 
     if (src.getCorrectTCA() && (channel == 0 || channel == 2)) {
@@ -1181,6 +1176,9 @@
         // radial correction if nonzero radial coefficients
         if ( mprad[0] != 1.0 || mprad[1] != 0.0 || mprad[2] != 0.0 || mprad[3] != 0.0) {
             AddTransform (&radial, mprad[0], mprad[1], mprad[2], mprad[3], mprad[4], mprad[5]);
+            DEBUG_DEBUG("Init Radial (channel " << channel << "): " 
+                    << "g: " << mprad[0] << " " << mprad[1] << " " << mprad[2] 
+                    << " " << mprad[3] << " " << mprad[4] << " " << mprad[5]);
         }
     }

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

Modified Files:
	SpaceTransform.h 
Log Message:
fulla: minor speedup by incoporating scaling into first distortion
correction.


Index: SpaceTransform.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/SpaceTransform.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SpaceTransform.h	4 Jun 2006 21:48:20 -0000	1.13
+++ SpaceTransform.h	7 Jun 2006 06:12:50 -0000	1.14
@@ -129,9 +129,9 @@
     /** init radial correction from pano image description and selected channel
      *  (R=0, G=1, B=2), (TCA corr)
      */
-    void InitRadialCorrect(const SrcPanoImage & src, int channel=1, double scale=1.0);
+    void InitRadialCorrect(const SrcPanoImage & src, int channel=1);
 
-    void InitInvRadialCorrect(const SrcPanoImage & src, int channel=1, double scale=1.0);
+    void InitInvRadialCorrect(const SrcPanoImage & src, int channel=1);
 
     void createTransform(const PT::SrcPanoImage & src, const PT::PanoramaOptions & dest);
     void createInvTransform(const PT::SrcPanoImage & src, const PT::PanoramaOptions & dest);
@@ -272,28 +272,28 @@
     // left
     for (y=0; y < sz.y; y++) {
         transf.transformImgCoord(xd,yd, x,y);
-        boundingBox |= vigra::Point2D(utils::round(xd), utils::round(yd));
+        boundingBox |= vigra::Point2D(utils::roundi(xd), utils::roundi(yd));
         left = std::max(utils::roundi(xd), left);
     }
     // right
     x = sz.x-1;
     for (y=0; y < sz.y; y++) {
         transf.transformImgCoord(xd,yd, x,y);
-        boundingBox |= vigra::Point2D(utils::round(xd), utils::round(yd));
+        boundingBox |= vigra::Point2D(utils::roundi(xd), utils::roundi(yd));
         right = std::min(utils::roundi(xd), right);
     }
     // bottom
     y=sz.y-1;
     for (x=0; x < sz.x; x++) {
         transf.transformImgCoord(xd,yd, x,y);
-        boundingBox |= vigra::Point2D(utils::round(xd), utils::round(yd));
+        boundingBox |= vigra::Point2D(utils::roundi(xd), utils::roundi(yd));
         bottom = std::min(utils::roundi(yd), bottom);
     }
     // top
     y=0;
     for (x=0; x < sz.x; x++) {
         transf.transformImgCoord(xd,yd, x,y);
-        boundingBox |= vigra::Point2D(utils::round(xd), utils::round(yd));
+        boundingBox |= vigra::Point2D(utils::roundi(xd), utils::roundi(yd));
         top = std::max(utils::roundi(yd), top);
     }
     inside.setUpperLeft(vigra::Point2D(left, top));

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

Modified Files:
	SpaceTransform.h 
Log Message:
fixed serious bug in fulla that lead to wrong tca correction coefficients being used. Now TCA & distortion correction should work at the same time.


Index: SpaceTransform.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/SpaceTransform.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- SpaceTransform.h	28 Apr 2006 07:11:49 -0000	1.11
+++ SpaceTransform.h	4 Jun 2006 12:51:57 -0000	1.12
@@ -218,15 +218,24 @@
     void AddTransform( PT::trfn function_name, Matrix3 m, double var0, double var1=0.0f, double var2=0.0f, double var3=0.0f);
 };
 
-/** combine 3rd degree polynomials.
+/** combine 4rd degree polynomials
  *
  *  Computes new polynomial so that:
  *   c(x) ~= q(p(x))
- *  c is also a 3rd degree polynomial, and the expansion is cut after x^3
+ *  c is also a 4rd degree polynomial, and the expansion is cut after x^4
+ *  constant term is assumed to be 0, and not included in p,q and c
  */
 template <class VECTOR>
-void combinePolynom3(const VECTOR & p, const VECTOR & q, VECTOR & c)
+void combinePolynom4(const VECTOR & p, const VECTOR & q, VECTOR & c)
 {
+    double d3 = p[3]*p[3]*p[3];
+    c[0] = (3*q[1]*p[3]*p[3]*p[2]+q[3]*p[0]+q[2]*(2*p[3]*p[1]+p[2]*p[2])+q[0]*d3);
+    c[1] = (2*q[2]*p[3]*p[2]+q[1]*d3+q[3]*p[1]);
+    c[2] = (q[3]*p[2]+q[2]*p[3]*p[3]);
+    c[3] = q[3]*p[3];
+
+    /*
+    old code for polynoms of up to x^3
     c[0] = q[0]*(p[2]*(2*p[3]*p[1]+p[2]*p[2])+p[3]*(2*p[3]*p[0]+2*p[2]*p[1])+p[0]*p[3]*p[3]+2*p[1]*p[3]*p[2])
            +q[1]*(2*p[3]*p[0]+2*p[2]*p[1])+q[2]*p[0];
 
@@ -235,6 +244,7 @@
 
     c[2] = 3*q[0]*p[3]*p[3]*p[2]+2*q[1]*p[3]*p[2]+q[2]*p[2];
     c[3] = q[0]*p[3]*p[3]*p[3]+q[1]*p[3]*p[3]+q[2]*p[3]+q[3];
+    */
 }

Update of /cvsroot/hugin/hugin/src/tools
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28834/src/tools

Modified Files:
	fulla.cpp 
Log Message:
fixed serious bug in fulla that lead to wrong tca correction coefficients being used. Now TCA & distortion correction should work at the same time.


Index: fulla.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/tools/fulla.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fulla.cpp	19 Apr 2006 20:35:50 -0000	1.9
+++ fulla.cpp	4 Jun 2006 12:51:57 -0000	1.10
@@ -113,12 +113,23 @@
     // correct image
     // check if image should be tca corrected, and calculate scale factor accordingly.
     double scaleFactor=1;
-    vector<double> radGreen(4);
-    radGreen = src.getRadialDistortion();
-    vector<double> radRed(4);
-    combinePolynom3(radGreen , src.getRadialDistortionRed(), radRed);
-    vector<double> radBlue(4);
-    combinePolynom3(radGreen, src.getRadialDistortionBlue(), radBlue);
+    vector<double> radGreen = src.getRadialDistortion();
+    vector<double> radRed   = src.getRadialDistortionRed();
+    vector<double> radBlue  = src.getRadialDistortionBlue();
+
+    DEBUG_DEBUG("Initial distortion correction parameters:" << endl
+            << "r: " << radRed[0] << " " << radRed[1] << " " << radRed[2] << " " << radRed[3] << endl
+            << "g: " << radGreen[0] << " " << radGreen[1] << " " << radGreen[2] << " " << radGreen[3] << endl
+            << "b: " << radBlue[0] << " " << radBlue[1] << " " << radBlue[2] << " " << radBlue[3] <<endl);
+
+    combinePolynom4(radGreen , src.getRadialDistortionRed(), radRed);
+    combinePolynom4(radGreen, src.getRadialDistortionBlue(), radBlue);
+
+    DEBUG_DEBUG("after applying g correction parameters to r and b:" << endl
+            << "r: " << radRed[0] << " " << radRed[1] << " " << radRed[2] << " " << radRed[3]  << endl
+            << "g: " << radGreen[0] << " " << radGreen[1] << " " << radGreen[2] << " " << radGreen[3] << endl
+            << "b: " << radBlue[0] << " " << radBlue[1] << " " << radBlue[2] << " " << radBlue[3] << endl);
+
     if (src.getCorrectTCA())
     {
         // calculate scaling factor required to avoid black borders.
@@ -141,8 +152,18 @@
         sf *=scaleFactor;
     }
 
+    DEBUG_DEBUG("after scaling for border correction:" << endl
+            << "r: " << radRed[0] << " " << radRed[1] << " " << radRed[2] << " " << radRed[3]  << endl
+            << "g: " << radGreen[0] << " " << radGreen[1] << " " << radGreen[2] << " " << radGreen[3] << endl
+            << "b: " << radBlue[0] << " " << radBlue[1] << " " << radBlue[2] << " " << radBlue[3] << endl);
+
     if (src.getCorrectTCA())
     {
+        DEBUG_DEBUG("Final distortion correction parameters:" << endl
+                << "r: " << radRed[0] << " " << radRed[1] << " " << radRed[2] << " " << radRed[3]  << endl
+                << "g: " << radGreen[0] << " " << radGreen[1] << " " << radGreen[2] << " " << radGreen[3] << endl
+                << "b: " << radBlue[0] << " " << radBlue[1] << " " << radBlue[2] << " " << radBlue[3] << endl);
+
         // remap individual channels
         SpaceTransform transf;
         transf.InitRadialCorrect(src.getSize(), radRed, FDiff2D(0,0));
@@ -191,6 +212,8 @@
         }
     } else {
         // remap with the same coefficient.
+        DEBUG_DEBUG("Final distortion correction parameters: r: " 
+                << "g: " << radGreen[0] << " " << radGreen[1] << " " << radGreen[2] << " " << radGreen[3] );
         SpaceTransform transf;
         transf.InitRadialCorrect(src.getSize(), radGreen, FDiff2D(0,0));
         if (transf.isIdentity()) {

Update of /cvsroot/hugin/hugin/src/build_msvc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23763/src/build_msvc

Modified Files:
	Hugin.sln 
Log Message:
fulla:
* improved merging of green and (red,blue) correction coefficients.
  The previous scheme was an approximation and could lead to
  errors of 0.2 pixels in a 6 megapixel image.
* added option to output unscaled output with black borders.


Index: Hugin.sln
===================================================================
RCS file: /cvsroot/hugin/hugin/src/build_msvc/Hugin.sln,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Hugin.sln	7 May 2006 13:29:53 -0000	1.12
+++ Hugin.sln	4 Jun 2006 21:48:20 -0000	1.13
@@ -139,6 +139,7 @@
 		{E974EF12-9647-400A-AF30-1D0E70D1C32C}.Release Unicode.ActiveCfg = Release Unicode|Win32
 		{E974EF12-9647-400A-AF30-1D0E70D1C32C}.Release Unicode.Build.0 = Release Unicode|Win32
 		{AAAA17E6-3037-47E7-B556-DE1112D3237A}.Debug.ActiveCfg = Debug|Win32
+		{AAAA17E6-3037-47E7-B556-DE1112D3237A}.Debug.Build.0 = Debug|Win32
 		{AAAA17E6-3037-47E7-B556-DE1112D3237A}.Release.ActiveCfg = Release|Win32
 		{AAAA17E6-3037-47E7-B556-DE1112D3237A}.Release.Build.0 = Release|Win32
 		{AAAA17E6-3037-47E7-B556-DE1112D3237A}.Release Unicode.ActiveCfg = Release|Win32

Update of /cvsroot/hugin/hugin/src/tools
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31003/src/tools

Modified Files:
	fulla.cpp fulla.vcproj 
Log Message:
fulla: fixed radial vignetting correction, added gamma option


Index: fulla.vcproj
===================================================================
RCS file: /cvsroot/hugin/hugin/src/tools/fulla.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fulla.vcproj	4 Jun 2006 21:48:20 -0000	1.2
+++ fulla.vcproj	4 Jun 2006 23:17:36 -0000	1.3
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\foreign\getopt\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"

Index: fulla.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/tools/fulla.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fulla.cpp	4 Jun 2006 21:48:20 -0000	1.11
+++ fulla.cpp	4 Jun 2006 23:17:36 -0000	1.12
@@ -75,18 +75,23 @@
     bool vigCorrDivision = (src.getVigCorrMode() & PT::SrcPanoImage::VIGCORR_DIV)>0;
 
     RSrcPixelType ka,kb;
-    bool doBrightnessConversion = convertKParams(src.getBrightnessFactor(),
-            src.getBrightnessOffset(),
-            ka, kb);
+    bool doBrightnessConversion = convertKParams(src.getBrightnessFactor(),
+                                                 src.getBrightnessOffset(),
+                                                 ka, kb);
     bool dither = vigra_ext::ditheringNeeded(SrcPixelType());
 
     double gMaxVal = vigra_ext::VigCorrTraits<typename DestImgType::value_type>::max();
 
+    bool doGammaConv = false;
+    progress.pushTask(utils::ProgressTask("correcting image", ""));
+
     if (src.getVigCorrMode() & SrcPanoImage::VIGCORR_FLATFIELD) {
+        progress.setMessage(std::string("flatfield vignetting correction ") + utils::stripPath(src.getFilename()));
         vigra_ext::flatfieldVigCorrection(vigra::srcImageRange(srcImg),
                                           vigra::srcImage(srcFlat), 
                                           vigra::destImage(srcImg), src.getGamma(), gMaxVal,
                                           vigCorrDivision, ka, kb, dither);
+        doGammaConv = true;
     } else if (src.getVigCorrMode() & SrcPanoImage::VIGCORR_RADIAL) {
         progress.setMessage(std::string("radial vignetting correction ") + utils::stripPath(src.getFilename()));
 
@@ -95,18 +100,14 @@
                                        src.getRadialVigCorrCoeff(), 
                                        src.getRadialVigCorrCenter(),
                                        vigCorrDivision, ka, kb, dither);
-    } else if (src.getGamma() != 1.0 && doBrightnessConversion ) {
-        progress.setMessage(std::string("inverse gamma & brightness corr") + utils::stripPath(src.getFilename()));
-        vigra_ext::applyGammaAndBrightCorrection(srcImageRange(srcImg), destImage(srcImg),
-                src.getGamma(), gMaxVal, ka,kb);
-    } else if (doBrightnessConversion ) {
-        progress.setMessage(std::string("brightness correction ") + utils::stripPath(src.getFilename()));
-        vigra_ext::applyBrightnessCorrection(srcImageRange(srcImg), destImage(srcImg),
-                                             ka,kb);
-    } else if (src.getGamma() != 1.0 ) {
-        progress.setMessage(std::string("inverse gamma correction ") + utils::stripPath(src.getFilename()));
+        doGammaConv = true;
+    }
+
+    // undo inverse gamma correction that might have been applied during vignetting correction
+    if (src.getGamma() != 1.0 && doGammaConv) {
+        progress.setMessage(std::string("gamma correction ") + utils::stripPath(src.getFilename()));
         vigra_ext::applyGammaCorrection(srcImageRange(srcImg), destImage(srcImg),
-                                        src.getGamma(), gMaxVal);
+                                        1.0/src.getGamma(), gMaxVal);
     }
 
     double scaleFactor=1.0;
@@ -176,7 +177,10 @@
         // remap with the same coefficient.
         SpaceTransform transf;
         transf.InitRadialCorrect(src, 2, scaleFactor);
-        if (transf.isIdentity()) {
+        vector <double> radCoeff = src.getRadialDistortion();
+        if (transf.isIdentity() || 
+            (radCoeff[0] == 0.0 && radCoeff[1] == 0.0 && radCoeff[2] == 0.0 && radCoeff[3] == 1.0))
+        {
             vigra::copyImage(srcImageRange(srcImg),
                              destImage(destImg));
         } else {
@@ -191,6 +195,7 @@
         }
     }
 
+
     /*
     // correct image
     // check if image should be tca corrected, and calculate scale factor accordingly.
@@ -323,7 +328,7 @@
     vigra::BasicImage<PIXELTYPE> output(info.size());
     importImage(info, destImage(srcImg));
     FImage flatfield;
-    if (src.getVigCorrMode() & SrcPanoImage::VIGCORR_RADIAL) {
+    if (src.getVigCorrMode() & SrcPanoImage::VIGCORR_FLATFIELD) {
         ImageImportInfo finfo(src.getFlatfieldFilename().c_str());
         flatfield.resize(finfo.size());
         importImage(finfo, destImage(flatfield));
@@ -343,8 +348,8 @@
     if (profilePath == NULL)
     {
         cerr << "ERROR: " << endl
-                << " You specify where \"profile.txt\" is!" << endl
-                << " Use PTLENS_PROFILE environment variable, example:" << endl
+                << " You need to specify the location of \"profile.txt\"." << endl
+                << " Please set the PTLENS_PROFILE environment variable, for example:" << endl
                 << " PTLENS_PROFILE=$HOME/.ptlens/profile.txt" << endl;
         return false;
     }
@@ -459,6 +464,8 @@
          << "                        I = I / c,    c = a + b*r^2 + c*r^4 + d*r^6" << std::endl
          << "      -a               Correct vignetting by addition, rather than by division" << std::endl
          << "                        I = I + c" << std::endl
+         << "      -i value         gamma of input data. used for gamma correction" << std::endl
+         << "                        before and after flatfield correction" << std::endl
          << "      -t n             Number of threads that should be used during processing" << std::endl
          << "      -h               Display help (this text)" << std::endl
          << "      -o name          set output filename. If more than one image is given," << std::endl
@@ -470,7 +477,7 @@
 int main(int argc, char *argv[])
 {
     // parse arguments
-    const char * optstring = "g:b:r:pm:n:l:d:sf:c:at:ho:v";
+    const char * optstring = "g:b:r:pm:n:l:d:sf:c:ai:t:ho:v";
     int o;
     bool verbose_flag = true;
 
@@ -491,6 +498,7 @@
     std::string cameraName;
     std::string lensName;
     float focalLength=0;
+    double gamma = 1.0;
     SrcPanoImage c;
     while ((o = getopt (argc, argv, optstring)) != -1)
         switch (o) {
@@ -534,6 +542,9 @@
         case 'a':
             doVigAddition = true;
             break;
+        case 'i':
+            gamma = atof(optarg);
+            c.setGamma(gamma);
         case 'p':
             doPTLens = true;
             break;
@@ -561,6 +572,7 @@
                 return 1;
             }
             c.setRadialVigCorrCoeff(vec4);
+            doVigRadial=true;
             break;
         case '?':
         case 'h':

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

Modified Files:
	SpaceTransform.h 
Log Message:
fulla:
* improved merging of green and (red,blue) correction coefficients.
  The previous scheme was an approximation and could lead to
  errors of 0.2 pixels in a 6 megapixel image.
* added option to output unscaled output with black borders.


Index: SpaceTransform.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/SpaceTransform.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- SpaceTransform.h	4 Jun 2006 12:51:57 -0000	1.12
+++ SpaceTransform.h	4 Jun 2006 21:48:20 -0000	1.13
@@ -123,13 +123,15 @@
 
     /** transformation for radial correction only
      */
-    void InitRadialCorrect(const vigra::Size2D & sz, std::vector<double> & radDist, 
+    void InitRadialCorrect(const vigra::Size2D & sz, const std::vector<double> & radDist, 
                            const FDiff2D & centerShift);
 
     /** init radial correction from pano image description and selected channel
      *  (R=0, G=1, B=2), (TCA corr)
      */
-    void InitRadialCorrect(const SrcPanoImage & src, int channel=1);
+    void InitRadialCorrect(const SrcPanoImage & src, int channel=1, double scale=1.0);
+
+    void InitInvRadialCorrect(const SrcPanoImage & src, int channel=1, double scale=1.0);
 
     void createTransform(const PT::SrcPanoImage & src, const PT::PanoramaOptions & dest);
     void createInvTransform(const PT::SrcPanoImage & src, const PT::PanoramaOptions & dest);
@@ -229,7 +231,7 @@
 void combinePolynom4(const VECTOR & p, const VECTOR & q, VECTOR & c)
 {
     double d3 = p[3]*p[3]*p[3];
-    c[0] = (3*q[1]*p[3]*p[3]*p[2]+q[3]*p[0]+q[2]*(2*p[3]*p[1]+p[2]*p[2])+q[0]*d3);
+    c[0] = (3*q[1]*p[3]*p[3]*p[2]+q[3]*p[0]+q[2]*(2*p[3]*p[1]+p[2]*p[2])+q[0]*d3*p[3]);
     c[1] = (2*q[2]*p[3]*p[2]+q[1]*d3+q[3]*p[1]);
     c[2] = (q[3]*p[2]+q[2]*p[3]*p[3]);
     c[3] = q[3]*p[3];
@@ -248,6 +250,60 @@
 }
 
 
+/** Internal function to estimate the image scaling required to avoid
+ *  black stripes at the image borders
+ */
+template <class TRANSFORM>
+void traceImageOutline(vigra::Size2D sz, TRANSFORM & transf, vigra::Rect2D & inside, vigra::Rect2D & boundingBox)
+{
+    boundingBox = vigra::Rect2D();
+    inside = vigra::Rect2D();
+    int x=0;
+    int y=0;
+    double xd;
+    double yd;
+    transf.transformImgCoord(xd,yd, x,y);
+    // calculate scaling factor that would be required to avoid black borders
+    double scale = std::max((-sz.x/2)/(xd-sz.x/2), (-sz.y/2)/(yd-sz.y/2));
+    int left = 0;
+    int right = sz.x;
+    int top = 0;
+    int bottom = sz.y;
+    // left
+    for (y=0; y < sz.y; y++) {
+        transf.transformImgCoord(xd,yd, x,y);
+        boundingBox |= vigra::Point2D(utils::round(xd), utils::round(yd));
+        left = std::max(utils::roundi(xd), left);
+    }
+    // right
+    x = sz.x-1;
+    for (y=0; y < sz.y; y++) {
+        transf.transformImgCoord(xd,yd, x,y);
+        boundingBox |= vigra::Point2D(utils::round(xd), utils::round(yd));
+        right = std::min(utils::roundi(xd), right);
+    }
+    // bottom
+    y=sz.y-1;
+    for (x=0; x < sz.x; x++) {
+        transf.transformImgCoord(xd,yd, x,y);
+        boundingBox |= vigra::Point2D(utils::round(xd), utils::round(yd));
+        bottom = std::min(utils::roundi(yd), bottom);
+    }
+    // top
+    y=0;
+    for (x=0; x < sz.x; x++) {
+        transf.transformImgCoord(xd,yd, x,y);
+        boundingBox |= vigra::Point2D(utils::round(xd), utils::round(yd));
+        top = std::max(utils::roundi(yd), top);
+    }
+    inside.setUpperLeft(vigra::Point2D(left, top));
+    inside.setLowerRight(vigra::Point2D(right, bottom));
+}
+
+/** \brief Calculate effective scaling factor for a given source image.
+ */
+double estScaleFactorForFullFrame(const PT::SrcPanoImage & src);
+
 /**
  * \brief Calculate effective scaling factor.
  *
@@ -264,7 +320,7 @@
  * \return smallest r_corr / r_orig in areas that might lead to black borders.
  *
  *****************************************************/
-double estRadialScaleCrop(std::vector<double> coeff, int width, int height);
+double estRadialScaleCrop(const std::vector<double> & coeff, int width, int height);
 
 
 } // namespace PT

Update of /cvsroot/hugin/hugin/src/tools
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23763/src/tools

Modified Files:
	fulla.cpp fulla.vcproj 
Log Message:
fulla:
* improved merging of green and (red,blue) correction coefficients.
  The previous scheme was an approximation and could lead to
  errors of 0.2 pixels in a 6 megapixel image.
* added option to output unscaled output with black borders.


Index: fulla.vcproj
===================================================================
RCS file: /cvsroot/hugin/hugin/src/tools/fulla.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fulla.vcproj	3 May 2006 16:19:55 -0000	1.1
+++ fulla.vcproj	4 Jun 2006 21:48:20 -0000	1.2
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib pano12.lib comctl32.lib user32.lib gdi32.lib comdlg32.lib"
+				AdditionalDependencies="wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib comctl32.lib user32.lib gdi32.lib comdlg32.lib"
 				OutputFile="$(OutDir)/fulla.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12;..\..\..\libs\boost\stage\lib"

Index: fulla.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/tools/fulla.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fulla.cpp	4 Jun 2006 12:51:57 -0000	1.10
+++ fulla.cpp	4 Jun 2006 21:48:20 -0000	1.11
@@ -63,6 +63,7 @@
                   const PT::SrcPanoImage & src,
                   vigra_ext::Interpolator interpolator,
                   DestImgType & destImg,
+                  bool doCrop,
                   utils::MultiProgressDisplay & progress)
 {
     typedef typename SrcImgType::value_type SrcPixelType;
@@ -108,8 +109,89 @@
                                         src.getGamma(), gMaxVal);
     }
 
+    double scaleFactor=1.0;
+    // radial distortion correction
+    if (doCrop) {
+        scaleFactor=estScaleFactorForFullFrame(src);
+        DEBUG_DEBUG("Black border correction scale factor: " << scaleFactor);
+    }
     // hmm, dummy alpha image...
     BImage alpha(srcImg.size());
+
+    if (src.getCorrectTCA())
+    {
+        /*
+        DEBUG_DEBUG("Final distortion correction parameters:" << endl
+                << "r: " << radRed[0] << " " << radRed[1] << " " << radRed[2] << " " << radRed[3]  << endl
+                << "g: " << radGreen[0] << " " << radGreen[1] << " " << radGreen[2] << " " << radGreen[3] << endl
+                << "b: " << radBlue[0] << " " << radBlue[1] << " " << radBlue[2] << " " << radBlue[3] << endl);
+        */
+        // remap individual channels
+        SpaceTransform transf;
+        transf.InitRadialCorrect(src, 0, scaleFactor);
+        if (transf.isIdentity()) {
+            vigra::copyImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), RedAccessor<SrcPixelType>()),
+                             destIter(destImg.upperLeft(), RedAccessor<DestPixelType>()));
+        } else {
+            transformImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), RedAccessor<SrcPixelType>()),
+                           destIterRange(destImg.upperLeft(), destImg.lowerRight(), RedAccessor<DestPixelType>()),
+                           destImage(alpha),
+                           vigra::Diff2D(0,0),
+                           transf,
+                           false,
+                           vigra_ext::INTERP_SPLINE_16,
+                           progress);
+        }
+
+        transf.InitRadialCorrect(src, 1, scaleFactor);
+        if (transf.isIdentity()) {
+            vigra::copyImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), GreenAccessor<SrcPixelType>()),
+                             destIter(destImg.upperLeft(), GreenAccessor<DestPixelType>()));
+        } else {
+            transformImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), GreenAccessor<SrcPixelType>()),
+                           destIterRange(destImg.upperLeft(), destImg.lowerRight(), GreenAccessor<DestPixelType>()),
+                           destImage(alpha),
+                           vigra::Diff2D(0,0),
+                           transf,
+                           false,
+                           vigra_ext::INTERP_SPLINE_16,
+                           progress);
+        }
+
+        transf.InitRadialCorrect(src, 2, scaleFactor);
+        if (transf.isIdentity()) {
+            vigra::copyImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), BlueAccessor<SrcPixelType>()),
+                             destIter(destImg.upperLeft(), BlueAccessor<DestPixelType>()));
+        } else {
+            transformImage(srcIterRange(srcImg.upperLeft(), srcImg.lowerRight(), BlueAccessor<SrcPixelType>()),
+                           destIterRange(destImg.upperLeft(), destImg.lowerRight(), BlueAccessor<DestPixelType>()),
+                           destImage(alpha),
+                           vigra::Diff2D(0,0),
+                           transf,
+                           false,
+                           vigra_ext::INTERP_SPLINE_16,
+                           progress);
+        }
+    } else {
+        // remap with the same coefficient.
+        SpaceTransform transf;
+        transf.InitRadialCorrect(src, 2, scaleFactor);
+        if (transf.isIdentity()) {
+            vigra::copyImage(srcImageRange(srcImg),
+                             destImage(destImg));
+        } else {
+            transformImage(srcImageRange(srcImg),
+                           destImageRange(destImg),
+                           destImage(alpha),
+                           vigra::Diff2D(0,0),
+                           transf,
+                           false,
+                           vigra_ext::INTERP_SPLINE_16,
+                           progress);
+        }
+    }
+
+    /*
     // correct image
     // check if image should be tca corrected, and calculate scale factor accordingly.
     double scaleFactor=1;
@@ -151,7 +233,6 @@
         radBlue[3-i] *=sf;
         sf *=scaleFactor;
     }
-
     DEBUG_DEBUG("after scaling for border correction:" << endl
             << "r: " << radRed[0] << " " << radRed[1] << " " << radRed[2] << " " << radRed[3]  << endl
             << "g: " << radGreen[0] << " " << radGreen[1] << " " << radGreen[2] << " " << radGreen[3] << endl
@@ -230,12 +311,13 @@
                            progress);
         }
     }
+    */
 }
 
 //void correctRGB(SrcImageInfo & src, ImageImportInfo & info, const char * outfile)
 template <class PIXELTYPE>
 void correctRGB(SrcPanoImage & src, ImageImportInfo & info, const char * outfile,
-                utils::MultiProgressDisplay & progress)
+                bool crop, utils::MultiProgressDisplay & progress)
 {
     vigra::BasicImage<RGBValue<float> > srcImg(info.size());
     vigra::BasicImage<PIXELTYPE> output(info.size());
@@ -246,7 +328,7 @@
         flatfield.resize(finfo.size());
         importImage(finfo, destImage(flatfield));
     }
-    correctImage(srcImg, flatfield, src, vigra_ext::INTERP_SPLINE_16, output, progress);
+    correctImage(srcImg, flatfield, src, vigra_ext::INTERP_SPLINE_16, output, crop, progress);
     ImageExportInfo outInfo(outfile);
     outInfo.setICCProfile(info.getICCProfile());
     exportImage(srcImageRange(output), outInfo);
@@ -357,21 +439,26 @@
          << "   option are: " << std::endl
          << "      -g a:b:c:d       Radial distortion coefficient for all channels, (a, b, c, d)" << std::endl
          << "      -b a:b:c:d       Radial distortion coefficents for blue channel, (a, b, c, d)" << std::endl
-         << "                        this is applied on top of the -g distortion coefficients, use for TCA corr" << std::endl
+         << "                        this is applied on top of the -g distortion coefficients," << endl
+         << "                        use for TCA corr" << std::endl
          << "      -r a:b:c:d       Radial distortion coefficents for red channel, (a, b, c, d)" << std::endl
-         << "                        this is applied on top of the -g distortion coefficients, use for TCA corr" << std::endl
+         << "                        this is applied on top of the -g distortion coefficients," << endl
+         << "                        use for TCA corr" << std::endl
+         << "      -p               Try to read radial distortion coefficients for green" << endl
+         << "                         channel from PTLens database" << std::endl
+         << "      -m Canon         Camera manufacturer, for PTLens database query" << std::endl
+         << "      -n Camera        Camera name, for PTLens database query" << std::endl
+         << "      -l Lens          Lens name, for PTLens database query" << std::endl
+         << "                        if not specified, a list of possible lenses is displayed" << std::endl
+         << "      -d 50            specify focal length in mm, for PTLens database query" << std::endl
+         << "      -s               do not rescale the image to avoid black borders." << std::endl
+         << endl
          << "      -f filename      Vignetting correction by flatfield division" << std::endl
          << "                        I = I / c,    c = flatfield / mean(flatfield)" << std::endl
          << "      -c a:b:c:d       radial vignetting correction by division:" << std::endl
          << "                        I = I / c,    c = a + b*r^2 + c*r^4 + d*r^6" << std::endl
          << "      -a               Correct vignetting by addition, rather than by division" << std::endl
          << "                        I = I + c" << std::endl
-         << "      -p               Try to read radial distortion coefficients (-g) from PTLens database " << std::endl
-         << "      -m Canon         Camera manufacturer, for PTLens database query" << std::endl
-         << "      -n Camera        Camera name, for PTLens database query" << std::endl
-         << "      -l Lens          Lens name, for PTLens database query" << std::endl
-         << "                        if not specified, a list of possible lenses is displayed" << std::endl
-         << "      -d 50            specify focal length in mm, for PTLens database query" << std::endl
          << "      -t n             Number of threads that should be used during processing" << std::endl
          << "      -h               Display help (this text)" << std::endl
          << "      -o name          set output filename. If more than one image is given," << std::endl
@@ -383,7 +470,7 @@
 int main(int argc, char *argv[])
 {
     // parse arguments
-    const char * optstring = "g:r:b:f:apm:n:l:d:c:t:vho:";
+    const char * optstring = "g:b:r:pm:n:l:d:sf:c:at:ho:v";
     int o;
     bool verbose_flag = true;
 
@@ -393,6 +480,7 @@
     bool doFlatfield = false;
     bool doVigRadial = false;
     bool doVigAddition = false;
+    bool doCropBorders = true;
     unsigned nThreads=1;
     unsigned verbose = 0;
     
@@ -436,6 +524,9 @@
             c.setRadialDistortionBlue(vec4);
             //            c.radDistBlue[3] = 1 - c.radDistBlue[0] - c.radDistBlue[1] - c.radDistBlue[2];
             break;
+        case 's':
+            doCropBorders = false;
+            break;
         case 'f':
             c.setFlatfieldFilename(optarg);
             doFlatfield = true;
@@ -576,18 +667,21 @@
             if (bands == 3 || bands == 4 && extraBands == 1) {
                 // TODO: add more cases
                 if (strcmp(pixelType, "UINT8") == 0) {
-                    correctRGB<RGBValue<UInt8> >(c, info, outIt->c_str(), pdisp);
-                } else if (strcmp(pixelType, "UINT16") == 0) {
-                    correctRGB<RGBValue<UInt16> >(c, info, outIt->c_str(), pdisp);
+                    correctRGB<RGBValue<UInt8> >(c, info, outIt->c_str(), doCropBorders, pdisp);
+                }
+                /*
+                else if (strcmp(pixelType, "UINT16") == 0) {
+                    correctRGB<RGBValue<UInt16> >(c, info, outIt->c_str(), doCropBorders, pdisp);
                 } else if (strcmp(pixelType, "INT16") == 0) {
-                    correctRGB<RGBValue<Int16> >(c, info, outIt->c_str(), pdisp);
+                    correctRGB<RGBValue<Int16> >(c, info, outIt->c_str(), doCropBorders, pdisp);
                 } else if (strcmp(pixelType, "UINT32") == 0) {
-                    correctRGB<RGBValue<UInt32> >(c, info, outIt->c_str(), pdisp);
+                    correctRGB<RGBValue<UInt32> >(c, info, outIt->c_str(), doCropBorders, pdisp);
                 } else if (strcmp(pixelType, "FLOAT") == 0) {
-                    correctRGB<RGBValue<float> >(c, info, outIt->c_str(), pdisp);
+                    correctRGB<RGBValue<float> >(c, info, outIt->c_str(), doCropBorders, pdisp);
                 } else if (strcmp(pixelType, "DOUBLE") == 0) {
-                    correctRGB<RGBValue<double> >(c, info, outIt->c_str(), pdisp);
+                    correctRGB<RGBValue<double> >(c, info, outIt->c_str(), doCropBorders, pdisp);
                 }
+                */
             } else {
                 DEBUG_ERROR("unsupported depth, only 3 channel images are supported");
                 throw std::runtime_error("unsupported depth, only 3 channels images are supported");

Update of /cvsroot/hugin/hugin/src/Panorama
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23763/src/Panorama

Modified Files:
	SpaceTransform.cpp 
Log Message:
fulla:
* improved merging of green and (red,blue) correction coefficients.
  The previous scheme was an approximation and could lead to
  errors of 0.2 pixels in a 6 megapixel image.
* added option to output unscaled output with black borders.


Index: SpaceTransform.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/SpaceTransform.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- SpaceTransform.cpp	28 Apr 2006 07:11:49 -0000	1.12
+++ SpaceTransform.cpp	4 Jun 2006 21:48:19 -0000	1.13
@@ -938,7 +938,33 @@
     *y_src = y_dest * scale  + params.var7;
 }
 
-double estRadialScaleCrop(vector<double> coeff, int width, int height)
+
+
+double estScaleFactorForFullFrame(const PT::SrcPanoImage & src)
+{
+    SpaceTransform transf;
+    transf.InitInvRadialCorrect(src, 1);
+    vigra::Rect2D inside;
+    vigra::Rect2D insideTemp;
+    vigra::Rect2D boundingBox;
+    traceImageOutline(src.getSize(), transf, inside, boundingBox);
+    if (src.getCorrectTCA()) {
+        transf.InitInvRadialCorrect(src, 0);
+        traceImageOutline(src.getSize(), transf, insideTemp, boundingBox);
+        inside &= insideTemp;
+        transf.InitInvRadialCorrect(src, 2);
+        traceImageOutline(src.getSize(), transf, insideTemp, boundingBox);
+        inside &= insideTemp;
+    }
+    double width2 = src.getSize().x/2.0;
+    double height2 = src.getSize().y/2.0;
+    double sx = std::max(width2/(width2-inside.left()), width2/(inside.right()-width2));
+    double sy = std::max(height2/(height2-inside.top()), height2/(inside.bottom()-height2));
+    return 1/std::max(sx,sy);
+}
+
+
+double estRadialScaleCrop(const vector<double> &coeff, int width, int height)
 {
     double r_test[4];
     double p, r;
@@ -1016,7 +1042,7 @@
 
 
 /** Create a transform stack for radial distortion correction only */
-void SpaceTransform::InitRadialCorrect(const Size2D & sz, vector<double> & radDist, 
+void SpaceTransform::InitRadialCorrect(const Size2D & sz, const vector<double> & radDist, 
                                  const FDiff2D & centerShift)
 {
     double mprad[6];
@@ -1046,7 +1072,69 @@
 }
 
 /** Create a transform stack for distortion & TCA correction only */
-void SpaceTransform::InitRadialCorrect(const SrcPanoImage & src, int channel)
+void SpaceTransform::InitInvRadialCorrect(const SrcPanoImage & src, int channel, double scale)
+{
+    double mprad[6];
+
+//    double  imwidth = src.getSize().x;
+//    double  imheight= src.getSize().y;
+
+    m_Stack.clear();
+    m_srcTX = src.getSize().x/2.0;
+    m_srcTY = src.getSize().y/2.0;
+    m_destTX = src.getSize().x/2.0;
+    m_destTY = src.getSize().y/2.0;
+
+    if (src.getRadialDistortionCenterShift().x != 0.0) {
+        AddTransform(&horiz, -src.getRadialDistortionCenterShift().x);
+    }
+
+    // shift optical center if needed
+    if (src.getRadialDistortionCenterShift().y != 0.0) {
+        AddTransform(&vert, -src.getRadialDistortionCenterShift().y);
+    }
+
+    if (src.getCorrectTCA() && (channel == 0 || channel == 2)) {
+        for (int i=0; i < 4; i++) {
+            if (channel == 0) {
+                // correct red channel (TCA)
+                mprad[3-i] = src.getRadialDistortionRed()[i];
+            } else {
+                // correct blue channel (TCA)
+                mprad[3-i] = src.getRadialDistortionBlue()[i];
+            }
+        }
+        mprad[4] = ( src.getSize().x < src.getSize().y ? src.getSize().x: src.getSize().y)  / 2.0;
+        // calculate the correction radius.
+        mprad[5] = CalcCorrectionRadius_copy(mprad);
+
+        // radial correction if nonzero radial coefficients
+        if ( mprad[0] != 1.0 || mprad[1] != 0.0 || mprad[2] != 0.0 || mprad[3] != 0.0) {
+            AddTransform (&inv_radial, mprad[0], mprad[1], mprad[2], mprad[3], mprad[4], mprad[5]);
+        }
+    }
+
+    // green channel, always correct
+    for (int i=0; i < 4; i++) {
+        mprad[3-i] = src.getRadialDistortion()[i];
+    }
+    mprad[4] = ( src.getSize().x < src.getSize().y ? src.getSize().x: src.getSize().y)  / 2.0;
+    // calculate the correction radius.
+    mprad[5] = CalcCorrectionRadius_copy(mprad);
+
+    // radial correction if nonzero radial coefficients
+    if ( mprad[0] != 1.0 || mprad[1] != 0.0 || mprad[2] != 0.0 || mprad[3] != 0.0) {
+        AddTransform (&inv_radial, mprad[0], mprad[1], mprad[2], mprad[3], mprad[4], mprad[5]);
+    }
+
+    if (scale != 1.0) {
+        AddTransform(&resize, 1/scale, 1/scale);
+    }
+}
+
+
+/** Create a transform stack for distortion & TCA correction only */
+void SpaceTransform::InitRadialCorrect(const SrcPanoImage & src, int channel, double scale)
 {
     double mprad[6];
 
@@ -1059,6 +1147,10 @@
     m_destTX = src.getSize().x/2.0;
     m_destTY = src.getSize().y/2.0;
 
+    if (scale != 1.0) {
+        AddTransform(&resize, scale, scale);
+    }
+
     // green channel, always correct
     for (int i=0; i < 4; i++) {
         mprad[3-i] = src.getRadialDistortion()[i];

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23763/src/hugin

Modified Files:
	hugin.vcproj 
Log Message:
fulla:
* improved merging of green and (red,blue) correction coefficients.
  The previous scheme was an approximation and could lead to
  errors of 0.2 pixels in a 6 megapixel image.
* added option to output unscaled output with black borders.


Index: hugin.vcproj
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/hugin.vcproj,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- hugin.vcproj	1 Jun 2006 19:02:03 -0000	1.21
+++ hugin.vcproj	4 Jun 2006 21:48:20 -0000	1.22
@@ -61,7 +61,8 @@
 				Name="VCPostBuildEventTool"
 				CommandLine="xcopy xrc Debug\xrc /I /Y
 xcopy xrc\data Debug\xrc\data /I /Y
-xcopy "..\..\..\libs\libpano\pano12\DLL Debug\pano12d.dll" Debug\"/>
+xcopy "..\..\..\libs\libpano\pano12\DLL Debug\pano12d.dll" Debug\ /I /Y
+"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool

Update of /cvsroot/hugin/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28400

Modified Files:
	ChangeLog 
Log Message:
updated changelog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/hugin/hugin/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- ChangeLog	11 Feb 2006 21:29:51 -0000	1.60
+++ ChangeLog	4 Jun 2006 12:47:56 -0000	1.61
@@ -1,3 +1,922 @@
+2006-06-01 21:03  dangelo
+
+	* src/: include/PT/PanoToolsInterface.h,
+	  include/vigra_ext/VigQuotientEstimator.h, common/lu.c,
+	  include/common/lu.h: silence MSVC warnings
+
+2006-06-01 21:03  dangelo
+
+	* src/hugin/ImageCenter.cpp: maximise crop dialog window by default
+
+2006-06-01 21:01  dangelo
+
+	* src/: common/common.vcproj, hugin/hugin.vcproj: updated MSVC
+	  build files
+
+2006-05-21 21:04  dangelo
+
+	* src/hugin/PTWXDlg.cpp: libpano error reporting interface changed
+
+2006-05-07 15:29  dangelo
+
+	* src/build_msvc/Hugin.sln: removed vig_optimize from project
+
+2006-05-05 08:18  dangelo
+
+	* src/hugin/ImageCenter.cpp: allow dragging a rectangular crop area
+	  from bottom right to upper left.
+
+2006-05-04 08:25  dangelo
+
+	* src/: hugin/ImagesList.cpp, hugin/ImagesPanel.cpp,
+	  hugin/LensPanel.cpp, hugin/xrc/images_panel-2.5.xrc,
+	  hugin/xrc/lens_panel-2.5.xrc, hugin/xrc/lens_panel.xrc,
+	  include/hugin/ImagesPanel.h, include/hugin/LensPanel.h: moved
+	  crop button back to lens panel. crop is mainly used with circular
+	  fisheye images.  slight reorganisation of edit controls in lens
+	  tab
+
+2006-05-04 08:23  dangelo
+
+	* src/hugin/po/: fr.po, ru.po: updated translations
+
+2006-05-03 18:19  dangelo
+
+	* src/tools/: fulla.vcproj, vig_optimize.vcproj: added missing
+	  visual c project files
+
+2006-04-29 19:52  ippei
+
+	* src/hugin/xrc/: nona_panel.xrc, pano_panel-2.5.xrc: Fixed some
+	  spacing.
+
+2006-04-29 19:50  ippei
+
+	* src/hugin/: ImagesList.cpp, xrc/images_panel-2.5.xrc,
+	  xrc/lens_panel-2.5.xrc: The new interface completed.
+
+2006-04-28 09:45  dangelo
+
+	* m4/ax_check_panotools.m4: check for libpano with
+	  execute_stack_new (first appeared in 2.8.1)
+
+2006-04-28 09:14  dangelo
+
+	* src/: include/vigra_ext/Correlation.h,
+	  include/vigra_ext/ImageTransforms.h, tools/zhang_undistort.cpp:
+	  honor return value of coordinate transforms
+
+2006-04-28 09:11  dangelo
+
+	* src/: Panorama/SpaceTransform.cpp, include/PT/SpaceTransform.h:
+	  modify for compatibility with panotools based coordinate
+	  transform
+
+2006-04-28 09:11  dangelo
+
+	* src/: Panorama/PanoramaMemento.cpp, include/PT/PanoramaMemento.h:
+	  use same output projection numbering scheme as pano12
+
+2006-04-28 09:03  dangelo
+
+	* src/hugin/OptimizePanel.cpp: check if the user is trying to
+	  optimize an unsupported projection.
+
+2006-04-28 09:02  dangelo
+
+	* src/hugin/PanoPanel.cpp: bugfix: new hfov and vfov input boxes
+	  did not work properly
+
+2006-04-28 08:59  dangelo
+
+	* src/hugin/VigCorrDialog.cpp: better default value for number of
+	  samples for vignetting correction coefficient estimation
+
+2006-04-28 08:57  dangelo
+
+	* src/hugin/xrc/: pano_panel-2.5.xrc, pano_panel.xrc: removed
+	  transversal cylindrical entry (not supported)
+
+2006-04-28 08:55  dangelo
+
+	* src/include/PT/PanoToolsInterface.h: updated hugin to use the new
+	  transform function with return code
+
+2006-04-25 01:36  ippei
+
+	* src/hugin/xrc/lens_panel-2.5.xrc: the new interface.
+
+2006-04-25 00:01  dangelo
+
+	* m4/ax_check_panotools.m4: do not abort, if panotools was found in
+	  path specified by CPPFLAGS and LDFLAGS.
+
+2006-04-23 17:45  ippei
+
+	* mac/config.h: New command line tools require package information
+	  defined.
+
+2006-04-23 17:44  ippei
+
+	* mac/HuginOSX.xcodeproj/project.pbxproj: Xcode projects updated
+	  for the current source
+
+2006-04-23 17:42  ippei
+
+	* mac/localised.sh: wxMac went 2.6.3
+
+2006-04-23 17:42  ippei
+
+	* mac/Notes/scripts/: boost.sh, SetEnv-ppc.txt,
+	  SetEnv-universal.txt, enblend.sh, libjpeg.sh, libpng.sh,
+	  libtiff.sh, pano12.sh, wxconfig.sh: Revised the scripts for
+	  building libraries and tools.
+
+2006-04-21 16:21  dangelo
+
+	* src/hugin/xrc/data/help_common/: Makefile.am, hugin.png:
+	  committed missing files
+
+2006-04-21 00:05  dangelo
+
+	* src/hugin/xrc/data/: help_en_EN/.cvsignore,
+	  help_en_EN/Makefile.am, help_fr_FR/.cvsignore,
+	  help_fr_FR/Makefile.am: [no log message]
+
+2006-04-20 01:13  dangelo
+
+	* src/: common/Makefile.am, common/lu.c, hugin/VigCorrDialog.cpp,
+	  include/common/lu.h, include/vigra_ext/VigQuotientEstimator.h:
+	  removed dependancy on boost ublas. Hopefully this will allow
+	  compilation with gcc 3.2 (or 3.3) on OSX
+
+2006-04-19 22:35  dangelo
+
+	* src/: Panorama/PanoToolsInterface.cpp, Panorama/Panorama.cpp,
+	  Panorama/PanoramaMemento.cpp, Panorama/SpaceTransform.cpp,
+	  Panorama/Stitcher.cpp, build_msvc/Hugin.sln,
+	  hugin/ImageCache.cpp, hugin/PanoPanel.cpp,
+	  hugin/PreviewFrame.cpp, hugin/VigCorrDialog.cpp,
+	  hugin/hugin.vcproj, include/PT/PanoToolsInterface.h,
+	  include/PT/Panorama.h, include/PT/PanoramaMemento.h,
+	  include/PT/RandomPointSampler.h, include/PT/RemappedPanoImage.h,
+	  include/PT/SpaceTransform.h, include/hugin/PanoPanel.h,
+	  nona_gui/nona_gui.vcproj, tools/fulla.cpp, tools/nona.vcproj:
+	  added new panorama projections. cleaned up transformation
+	  functions.  auto size and auto fov calculation should work
+	  properly for all projections.
+
+2006-04-19 22:32  dangelo
+
+	* src/foreign/vigra_impex/: Makefile.am, iccjpeg.c, iccjpeg.h: only
+	  build icc jpeg support if libjpeg is available
+
+2006-04-19 22:30  dangelo
+
+	* configure.ac, src/hugin/xrc/pano_panel-2.5.xrc,
+	  src/hugin/xrc/pano_panel.xrc, src/hugin/xrc/data/Makefile.am,
+	  src/hugin/xrc/data/help_en_EN/contents.html: do not use .htb
+	  files for help documents, because all images would have to be
+	  duplicated inside each version of the documentation
+
+2006-04-14 02:34  dangelo
+
+	* src/hugin/MainFrame.cpp: applied patch by Michal Marek, fixes
+	  crash if file selector is closed with the window manager close
+	  event ( only on wxGTK).
+
+2006-04-13 00:31  dangelo
+
+	* src/tools/fulla.cpp: added "batch" mode to fulla, where a postfix
+	  is appended to the corrected images can be used to convert large
+	  amounts of images without shell programming
+
+2006-04-06 01:05  dangelo
+
+	* src/: hugin/Makefile.am, hugin/OptimizePanel.cpp,
+	  hugin/PTWXDlg.cpp, hugin/huginApp.cpp, include/hugin/PTWXDlg.h:
+	  use wx windows for libpano12 progress output, if possible
+	  (requires patch just posted to libpano12-devel list)
+
+2006-04-05 10:14  dangelo
+
+	* src/: build_msvc/Hugin.sln, tools/autooptimiser.cpp: optimizer
+	  changes
+
+2006-04-05 10:13  dangelo
+
+	* src/: hugin/OptimizePanel.cpp, include/hugin/OptimizePanel.h: use
+	  libpano12 optimisation routines directly instead of calling
+	  PTOptimizer.	This should fix the following bugs: 1. crash on OSX
+	  2. application of results even if cancel was clicked.  3. cancel
+	  in edit script dialog didn't work
+
+2006-04-05 10:10  dangelo
+
+	* src/: Panorama/PTOptimise.cpp, Panorama/PanoToolsInterface.cpp,
+	  Panorama/Panorama.cpp, Panorama/SpaceTransform.cpp,
+	  include/PT/PTOptimise.h, include/PT/PanoCommand.h,
+	  include/PT/PanoToolsInterface.h, include/PT/Panorama.h: Rewrote
+	  optimisation wrappers for libpano12.	changed the Panorama ->
+	  libpano12 data transfer. Now works with scripts that are parsed
+	  by libpano12
+
+2006-03-25 01:55  dangelo
+
+	* src/: include/PT/Panorama.h, include/PT/PanoramaMemento.h,
+	  include/hugin/VigCorrDialog.h, nona_gui/po/de.po,
+	  nona_gui/po/fr.po, nona_gui/po/hu.po, nona_gui/po/nl.po,
+	  nona_gui/po/nona_gui.pot, nona_gui/po/pl.po,
+	  nona_gui/po/pt_BR.po, nona_gui/po/ru.po, nona_gui/po/zh_CN.po:
+	  bruno postle's compile fix for gcc 4.1
+
+2006-03-25 00:44  dangelo
+
+	* src/common/PTLensDB.c: fixed fatal error while searching for
+	  lenses
+
+2006-03-25 00:42  dangelo
+
+	* src/tools/fulla.cpp: [no log message]
+
+2006-03-25 00:40  dangelo
+
+	* src/: Panorama/SpaceTransform.cpp, include/PT/SpaceTransform.h,
+	  tools/fulla.cpp: enlage image if tca correction would introduce
+	  empty areas in a single channel
+
+2006-03-23 08:20  dangelo
+
+	* src/: hugin/po/cs_CZ.po, nona_gui/po/cs_CZ.po: redownloaded cs_CZ
+	  files with correct encoding (just to be sure)
+
+2006-03-22 08:54  dangelo
+
+	* src/hugin/po/: LINGUAS, ca_ES.po, cs_CZ.po, de.po, fr.po, hu.po,
+	  hugin.pot, it.po, ja.po, nl.po, pl.po, pt_BR.po, ru.po, uk.po,
+	  zh_CN.po: updated strings
+
+2006-03-22 08:32  dangelo
+
+	* AUTHORS, src/hugin/PreferencesDialog.cpp, src/hugin/po/uk.po,
+	  src/hugin/xrc/data/about.htm, src/hugin/xrc/data/about_fr.htm,
+	  src/hugin/xrc/data/about_pl.htm,
+	  src/hugin/xrc/data/help_en_EN/manual.html: added Ukrainian
+	  translation.	updated manual (not finished yet)
+
+2006-03-17 18:45  dwilkins42
+
+	* src/: Panorama/Stitcher.cpp, hugin/MainFrame.cpp: Eliminate some
+	  memory leaks
+
+2006-03-17 05:53  dwilkins42
+
+	* src/: hugin/LensPanel.cpp, hugin/MainFrame.cpp,
+	  hugin/NonaStitcherPanel.cpp, hugin/PanoDruid.cpp,
+	  hugin/PreviewPanel.cpp,
+	  include/vigra_ext/MultiThreadOperations.h: Eliminate some memory
+	  leaks
+
+2006-03-15 19:13  dwilkins42
+
+	* src/: Panorama/Panorama.cpp, Panorama/PanoramaMemento.cpp,
+	  foreign/vigra/codec.hxx, foreign/vigra_impex/jpeg.cxx,
+	  foreign/vigra_impex/png.cxx, include/PT/PanoramaMemento.h,
+	  include/PT/RemappedPanoImage.h, include/PT/Stitcher.h,
+	  include/hugin/PanoDruid.h, include/hugin/wxPanoCommand.h,
+	  include/vigra_ext/Correlation.h: Add virtual destructors and
+	  re-order initialisation to reduce warnings
+
+2006-03-15 19:09  dwilkins42
+
+	* src/hugin/po/cs_CZ.po: Convert to UTF-8
+
+2006-03-15 19:07  dwilkins42
+
+	* src/: foreign/vigra_impex/bmp.cxx, foreign/vigra_impex/viff.cxx,
+	  hugin/CPEditorPanel.cpp: Fix types to reduce warnings
+
+2006-03-15 19:03  dwilkins42
+
+	* src/: nona_gui/nona_gui_rc.rc, hugin/hugin_rc.rc: Fix
+	  unneccessary VS re-compilation
+
+2006-03-15 18:55  dwilkins42
+
+	* src/include/vigra_ext/utils.h: Fix typo
+
+2006-03-15 18:54  dwilkins42
+
+	* src/include/vigra_ext/VigQuotientEstimator.h: Correct types to
+	  reduce warnings
+
+2006-03-15 18:48  dwilkins42
+
+	* src/: foreign/vigra/imageinfo.hxx, include/PT/Stitcher.h: Correct
+	  sense of ICC profile function isValid
+
+2006-03-15 18:46  dwilkins42
+
+	* src/common/PTLensDB.c: Comment out unused function
+
+2006-03-13 19:04  dwilkins42
+
+	* src/: foreign/vigra/mathutil.hxx, include/config_msvc.h,
+	  include/vigra_ext/RansacParameterEstimator.h,
+	  include/vigra_ext/VigQuotientEstimator.h,
+	  include/vigra_ext/ransac.h: Correct line endings
+
+2006-03-12 23:51  dangelo
+
+	* AUTHORS, src/hugin/MainFrame.cpp, src/hugin/xrc/data/about.htm,
+	  src/hugin/xrc/data/about_fr.htm, src/hugin/xrc/data/about_pl.htm:
+	  fixed typo
+
+2006-03-12 21:53  dangelo
+
+	* src/: hugin/LensPanel.cpp, hugin/ImagesPanel.cpp,
+	  include/hugin/LensPanel.h: removed duplicate code and fixed
+	  invalid setting of e parameter
+
+2006-03-12 21:10  dangelo
+
+	* src/: hugin/po/cs_CZ.po, nona_gui/po/cs_CZ.po: translation update
+	  by Jiri Slaby
+
+2006-03-11 18:13  dwilkins42
+
+	* src/: common/PTLensDB.c, foreign/vigra_impex/pnm.cxx,
+	  jhead/exif.cpp: Modify types, add initialisation and casts to
+	  remove warnings
+
+2006-03-11 18:10  dwilkins42
+
+	* src/foreign/vigra_impex/bmp.cxx: Make sure BMP files conform to
+	  spec
+
+2006-03-11 07:10  dwilkins42
+
+	* src/: Panorama/PTOptimise.cpp, Panorama/Panorama.cpp,
+	  hugin/NonaStitcherPanel.cpp, include/vigra_ext/ImageTransforms.h:
+	  Remove unreferenced variables
+
+2006-03-11 06:35  dwilkins42
+
+	* src/: Panorama/Panorama.cpp, hugin/CPEditorPanel.cpp,
+	  hugin/LensPanel.cpp, hugin/MainFrame.cpp,
+	  hugin/NonaStitcherPanel.cpp, hugin/Plot2D.cpp,
+	  include/PT/RandomPointSampler.h, include/PT/RemappedPanoImage.h,
+	  include/vigra_ext/ImageTransforms.h, include/vigra_ext/blend.h:
+	  Remove unreferenced variables
+
+2006-03-11 02:24  dangelo
+
+	* src/: common/PTLensDB.c, common/common.vcproj,
+	  hugin/ImagesPanel.cpp, include/hugin/config_defaults.h:
+	  compilation fixes for MSVC crop window does not set d,e
+	  coefficients anymore
+
+2006-03-11 01:26  dangelo
+
+	* src/tools/fulla.cpp: bugfix: do not try to read exif data in
+	  non-jpeg files
+
+2006-03-11 01:24  dwilkins42
+
+	* src/tools/.cvsignore: Update for fulla
+
+2006-03-10 21:17  dangelo
+
+	* src/hugin/CPListFrame.cpp: select ctrl points by distance:
+	  negative values select all point with a distance smaller than the
+	  selected one. Useful for selecting based on correlation score
+
+2006-03-10 21:15  dangelo
+
+	* src/hugin/ImageCache.cpp: fixed import of gray images
+
+2006-03-10 10:04  dangelo
+
+	* src/: common/Makefile.am, common/PTLensDB.c,
+	  include/common/PTLensDB.h, tools/fulla.cpp: added PTLens database
+	  support to fulla
+
+2006-03-10 10:03  dangelo
+
+	* src/: hugin/PanoPanel.cpp, hugin/xrc/pano_panel-2.5.xrc,
+	  include/hugin/PanoPanel.h: workaround for wx layout bug in Pano
+	  tab
+
+2006-03-09 10:19  dangelo
+
+	* src/: hugin/ImageCache.cpp, tools/Makefile.am, tools/fulla.cpp:
+	  bug fixes..
+
+2006-03-09 09:21  dangelo
+
+	* src/: include/PT/PanoImage.h, tools/fulla.cpp: forgot to load
+	  flatfield image.
+
+2006-03-09 08:52  dangelo
+
+	* src/: build_msvc/Hugin.sln, include/PT/PanoImage.h,
+	  tools/Makefile.am, tools/fulla.cpp: added fulla, a command line
+	  tool to perform distortion, vignetting and chromatic abberation
+	  correction.
+
+2006-03-09 08:47  dangelo
+
+	* src/hugin/: CPEditorPanel.cpp, wxPanoCommand.cpp: read harris
+	  corner parameters correctly
+
+2006-03-09 08:44  dangelo
+
+	* src/hugin/ImageCache.cpp: fixed loading of grayscale images with
+	  alpha channel in hugin
+
+2006-03-09 08:43  dangelo
+
+	* src/: include/PT/SpaceTransform.h, Panorama/SpaceTransform.cpp:
+	  added support for correct transform, with just radial distortion
+
+2006-03-09 08:42  dangelo
+
+	* src/include/vigra_ext/Interpolators.h: use accessors and row
+	  iterators
+
+2006-03-07 21:16  dwilkins42
+
+	* src/tools/Makefile.am: Include automatch.cpp in distribution.
+	  Cleanup
+
+2006-03-07 21:14  dwilkins42
+
+	* src/hugin/Makefile.am: Include MyExternalCmdExecDialog and
+	  UniversalCursor in compilation and distribution
+
+2006-03-07 21:11  dwilkins42
+
+	* Makefile.am: Include doc directory in distribution
+
+2006-03-07 19:20  dwilkins42
+
+	* src/hugin/xrc/data/.cvsignore: Ignore generated files
+
+2006-03-07 19:14  dwilkins42
+
+	* src/tools/.cvsignore: Update .cvsignore for
+	  color_correct_tiff.cpp
+
+2006-03-07 17:17  dwilkins42
+
+	* src/foreign/: vigra/imageinfo.hxx, vigra_impex/imageinfo.cxx:
+	  Correct oversight for unsigned images
+
+2006-03-07 01:05  dwilkins42
+
+	* src/hugin/xrc/data/Makefile.am: Make sure help_* directories are
+	  in the distribution
+
+2006-03-06 22:50  dangelo
+
+	* configure.ac, src/hugin/xrc/data/Makefile.am: updated build
+	  system for new help
+
+2006-03-06 22:49  dangelo
+
+	* src/hugin/xrc/data/: keyboard_fr.html, manual_fr.html,
+	  help_fr_FR/contents.html, help_fr_FR/hugin.hhc,
+	  help_fr_FR/hugin.hhk, help_fr_FR/hugin.hhp,
+	  help_fr_FR/keyboard.html, help_fr_FR/license.html,
+	  help_fr_FR/manual.html, help_fr_FR/images/hugin.png: converted
+	  french help text. needs update
+
+2006-03-06 22:48  dangelo
+
+	* src/hugin/xrc/data/: keyboard.html, help_en_EN/contents.html,
+	  help_en_EN/hugin.hhc, help_en_EN/hugin.hhk, help_en_EN/hugin.hhp,
+	  help_en_EN/keyboard.html, help_en_EN/license.html,
+	  help_en_EN/manual.html: converted english help file to new format
+
+2006-03-06 22:47  dangelo
+
+	* src/: hugin/MainFrame.cpp, hugin/huginApp.cpp,
+	  include/panoinc_WX.h, include/hugin/MainFrame.h: use the
+	  wxWidgets help browser.
+
+2006-03-06 06:51  dwilkins42
+
+	* bootstrap: Remove unneeded files created by bootstrap
+
+2006-03-06 06:38  dwilkins42
+
+	* src/: nona_gui/Makefile.am, tools/Makefile.am: Ensure *.vcproj is
+	  in distribution
+
+2006-03-06 05:09  dwilkins42
+
+	* src/foreign/: vigra/imageinfo.hxx, vigra/matrix.hxx,
+	  vigra_impex/gif.cxx, vigra_impex/imageinfo.cxx,
+	  vigra_impex/pnm.cxx: Update some types to remove warnings and
+	  conform to ICC spec
+
+2006-03-05 09:54  dangelo
+
+	* src/: foreign/vigra_impex/iccjpeg.c,
+	  foreign/vigra_impex/iccjpeg.h, foreign/vigra_impex/png.cxx,
+	  include/PT/RemappedPanoImage.h: added license to iccjpeg, compile
+	  fix on gcc
+
+2006-03-05 01:41  dangelo
+
+	* NEWS, src/include/PT/RemappedPanoImage.h: do gamma correction on
+	  the fly, this should be faster and reduces discretisation
+	  artifacts
+
+2006-03-05 00:29  dangelo
+
+	* LICENCE_VIGRA, src/Panorama/Panorama.cpp,
+	  src/Panorama/Stitcher1.cpp, src/Panorama/Stitcher2.cpp,
+	  src/Panorama/Stitcher3.cpp, src/Panorama/Stitcher4.cpp,
+	  src/foreign/vigra/accessor.hxx,
+	  src/foreign/vigra/array_vector.hxx,
+	  src/foreign/vigra/basicgeometry.hxx,
+	  src/foreign/vigra/basicimage.hxx,
+	  src/foreign/vigra/basicimageview.hxx,
+	  src/foreign/vigra/bordertreatment.hxx,
+	  src/foreign/vigra/boundarytensor.hxx,
+	  src/foreign/vigra/codec.hxx,
+	  src/foreign/vigra/colorconversions.hxx,
+	  src/foreign/vigra/combineimages.hxx,
+	  src/foreign/vigra/config.hxx,
+	  src/foreign/vigra/contourcirculator.hxx,
+	  src/foreign/vigra/convolution.hxx,
+	  src/foreign/vigra/copyimage.hxx,
+	  src/foreign/vigra/cornerdetection.hxx,
+	  src/foreign/vigra/diff2d.hxx,
+	  src/foreign/vigra/distancetransform.hxx,
+	  src/foreign/vigra/edgedetection.hxx,
+	  src/foreign/vigra/eigensystem.hxx, src/foreign/vigra/error.hxx,
+	  src/foreign/vigra/extraimagetraits.hxx,
+	  src/foreign/vigra/fftw.hxx, src/foreign/vigra/fftw3.hxx,
+	  src/foreign/vigra/fixedpoint.hxx,
+	  src/foreign/vigra/flatmorphology.hxx,
+	  src/foreign/vigra/functorexpression.hxx,
+	  src/foreign/vigra/functortraits.hxx,
+	  src/foreign/vigra/gaborfilter.hxx,
+	  src/foreign/vigra/gaussians.hxx,
+	  src/foreign/vigra/gradient_energy_tensor.hxx,
+	  src/foreign/vigra/imagecontainer.hxx,
+	  src/foreign/vigra/imageinfo.hxx,
+	  src/foreign/vigra/imageiterator.hxx,
+	  src/foreign/vigra/imageiteratoradapter.hxx,
+	  src/foreign/vigra/impex.hxx, src/foreign/vigra/impexalpha.hxx,
+	  src/foreign/vigra/initimage.hxx,
+	  src/foreign/vigra/inspectimage.hxx,
+	  src/foreign/vigra/interpolating_accessor.hxx,
+	  src/foreign/vigra/iteratoradapter.hxx,
+	  src/foreign/vigra/iteratortags.hxx,
+	  src/foreign/vigra/iteratortraits.hxx,
+	  src/foreign/vigra/labelimage.hxx,
+	  src/foreign/vigra/linear_algebra.hxx,
+	  src/foreign/vigra/linear_solve.hxx,
+	  src/foreign/vigra/localminmax.hxx,
+	  src/foreign/vigra/mathutil.hxx, src/foreign/vigra/matrix.hxx,
+	  src/foreign/vigra/memory.hxx,
+	  src/foreign/vigra/metaprogramming.hxx,
+	  src/foreign/vigra/multi_array.hxx,
+	  src/foreign/vigra/multi_convolution.hxx,
+	  src/foreign/vigra/multi_impex.hxx,
+	  src/foreign/vigra/multi_iterator.hxx,
+	  src/foreign/vigra/multi_pointoperators.hxx,
+	  src/foreign/vigra/navigator.hxx,
+	  src/foreign/vigra/nonlineardiffusion.hxx,
+	  src/foreign/vigra/numerictraits.hxx,
+	  src/foreign/vigra/orientedtensorfilters.hxx,
+	  src/foreign/vigra/pixelneighborhood.hxx,
+	  src/foreign/vigra/polynomial.hxx, src/foreign/vigra/rational.hxx,
+	  src/foreign/vigra/recursiveconvolution.hxx,
+	  src/foreign/vigra/resampling_convolution.hxx,
+	  src/foreign/vigra/resizeimage.hxx, src/foreign/vigra/rfftw.hxx,
+	  src/foreign/vigra/rgbvalue.hxx,
+	  src/foreign/vigra/seededregiongrowing.hxx,
+	  src/foreign/vigra/separableconvolution.hxx,
+	  src/foreign/vigra/sized_int.hxx,
+	  src/foreign/vigra/splineimageview.hxx,
+	  src/foreign/vigra/splines.hxx,
+	  src/foreign/vigra/static_assert.hxx,
+	  src/foreign/vigra/stdconvolution.hxx,
+	  src/foreign/vigra/stdimage.hxx,
+	  src/foreign/vigra/stdimagefunctions.hxx,
+	  src/foreign/vigra/symmetry.hxx,
+	  src/foreign/vigra/tensorutilities.hxx,
+	  src/foreign/vigra/tiff.hxx, src/foreign/vigra/tinyvector.hxx,
+	  src/foreign/vigra/transformimage.hxx,
+	  src/foreign/vigra/tuple.hxx, src/foreign/vigra/utilities.hxx,
+	  src/foreign/vigra/watersheds.hxx, src/foreign/vigra/windows.h,
+	  src/foreign/vigra_impex/Makefile.am,
+	  src/foreign/vigra_impex/auto_file.hxx,
+	  src/foreign/vigra_impex/bmp.cxx, src/foreign/vigra_impex/bmp.hxx,
+	  src/foreign/vigra_impex/byteorder.cxx,
+	  src/foreign/vigra_impex/byteorder.hxx,
+	  src/foreign/vigra_impex/codecmanager.cxx,
+	  src/foreign/vigra_impex/codecmanager.hxx,
+	  src/foreign/vigra_impex/error.hxx,
+	  src/foreign/vigra_impex/gif.cxx, src/foreign/vigra_impex/gif.hxx,
+	  src/foreign/vigra_impex/iccjpeg.c,
+	  src/foreign/vigra_impex/iccjpeg.h,
+	  src/foreign/vigra_impex/imageinfo.cxx,
+	  src/foreign/vigra_impex/jpeg.cxx,
+	  src/foreign/vigra_impex/jpeg.hxx,
+	  src/foreign/vigra_impex/png.cxx, src/foreign/vigra_impex/png.hxx,
+	  src/foreign/vigra_impex/pnm.cxx, src/foreign/vigra_impex/pnm.hxx,
+	  src/foreign/vigra_impex/sun.cxx, src/foreign/vigra_impex/sun.hxx,
+	  src/foreign/vigra_impex/tiff.cxx,
+	  src/foreign/vigra_impex/tiff.hxx,
+	  src/foreign/vigra_impex/viff.cxx,
+	  src/foreign/vigra_impex/viff.hxx,
+	  src/foreign/vigra_impex/vigra_impex.vcproj,
+	  src/foreign/vigra_impex/void_vector.cxx,
+	  src/foreign/vigra_impex/void_vector.hxx,
+	  src/hugin/CPEditorPanel.cpp, src/hugin/ImageCache.cpp,
+	  src/hugin/ImagesPanel.cpp, src/hugin/LensPanel.cpp,
+	  src/hugin/MainFrame.cpp, src/hugin/RunOptimizerFrame.cpp,
+	  src/include/PT/ImageTransforms.h,
+	  src/include/PT/RandomPointSampler.h,
+	  src/include/PT/RemappedPanoImage.h, src/include/PT/Stitcher.h,
+	  src/include/common/math.h,
+	  src/include/vigra_ext/FunctorAccessor.h,
+	  src/include/vigra_ext/ImageTransforms.h,
+	  src/include/vigra_ext/impexalpha.hxx,
+	  src/include/vigra_ext/tiffUtils.h, src/include/vigra_ext/utils.h,
+	  src/tests/vigra_ext.cpp, src/tools/automatch.cpp: merged vigra
+	  1.4 version back into HEAD. Everything seems to work well.
+
+2006-03-05 00:16  dangelo
+
+	* src/include/PT/Stitcher.h: copy profile for all output images,
+	  not only tiff_m
+
+2006-03-05 00:15  dangelo
+
+	* src/foreign/: vigra/imageinfo.hxx, vigra_impex/imageinfo.cxx,
+	  vigra_impex/jpeg.cxx, vigra_impex/png.cxx,
+	  vigra_impex/vigra_impex.vcproj: some more fixes for icc profile
+	  support. seems to work now.
+
+2006-03-04 20:51  dangelo
+
+	* src/include/: PT/RemappedPanoImage.h, PT/Stitcher.h,
+	  vigra_ext/tiffUtils.h: copy ICC profile from input to remapped
+	  images, if TIFF_m is used.
+
+2006-03-04 14:23  dangelo
+
+	* src/foreign/: vigra/imageinfo.hxx, vigra_impex/imageinfo.cxx:
+	  changed ICC profile interface, do not expose raw data pointers.
+
+2006-03-04 03:42  dangelo
+
+	* src/: Panorama/Panorama.cpp, hugin/CPEditorPanel.cpp,
+	  hugin/ImageCache.cpp, hugin/ImagesPanel.cpp, hugin/LensPanel.cpp,
+	  hugin/MainFrame.cpp, hugin/RunOptimizerFrame.cpp,
+	  include/vigra_ext/FunctorAccessor.h,
+	  include/vigra_ext/impexalpha.hxx, tools/automatch.cpp: updates
+	  and comment cleanup
+
+2006-03-04 03:08  dangelo
+
+	* src/foreign/: vigra/codec.hxx, vigra/imageinfo.hxx,
+	  vigra/impex.hxx, vigra_impex/Makefile.am,
+	  vigra_impex/codecmanager.cxx, vigra_impex/imageinfo.cxx,
+	  vigra_impex/jpeg.cxx, vigra_impex/jpeg.hxx, vigra_impex/png.cxx,
+	  vigra_impex/png.hxx: added support for icc profiles in png
+	  (partially tested) and jpeg (totally untested) files.
+
+2006-03-04 02:59  dangelo
+
+	* src/foreign/vigra_impex/: iccjpeg.c, iccjpeg.h: Added icc reading
+	  code from lcms (also released under the MIT license)
+
+2006-03-03 01:30  dwilkins42
+
+	* src/foreign/: vigra/accessor.hxx, vigra/array_vector.hxx,
+	  vigra/basicgeometry.hxx, vigra/basicimage.hxx,
+	  vigra/basicimageview.hxx, vigra/bordertreatment.hxx,
+	  vigra/boundarytensor.hxx, vigra/codec.hxx,
+	  vigra/colorconversions.hxx, vigra/combineimages.hxx,
+	  vigra/config.hxx, vigra/contourcirculator.hxx,
+	  vigra/convolution.hxx, vigra/copyimage.hxx,
+	  vigra/cornerdetection.hxx, vigra/diff2d.hxx,
+	  vigra/distancetransform.hxx, vigra/edgedetection.hxx,
+	  vigra/eigensystem.hxx, vigra/error.hxx,
+	  vigra/extraimagetraits.hxx, vigra/fftw.hxx, vigra/fftw3.hxx,
+	  vigra/fixedpoint.hxx, vigra/flatmorphology.hxx,
+	  vigra/functorexpression.hxx, vigra/functortraits.hxx,
+	  vigra/gaborfilter.hxx, vigra/gaussians.hxx,
+	  vigra/gradient_energy_tensor.hxx, vigra/imagecontainer.hxx,
+	  vigra/imageinfo.hxx, vigra/imageiterator.hxx,
+	  vigra/imageiteratoradapter.hxx, vigra/impex.hxx,
+	  vigra/initimage.hxx, vigra/inspectimage.hxx,
+	  vigra/interpolating_accessor.hxx, vigra/iteratoradapter.hxx,
+	  vigra/iteratortags.hxx, vigra/iteratortraits.hxx,
+	  vigra/labelimage.hxx, vigra/linear_algebra.hxx,
+	  vigra/linear_solve.hxx, vigra/localminmax.hxx,
+	  vigra/mathutil.hxx, vigra/matrix.hxx, vigra/memory.hxx,
+	  vigra/metaprogramming.hxx, vigra/multi_array.hxx,
+	  vigra/multi_convolution.hxx, vigra/multi_impex.hxx,
+	  vigra/multi_iterator.hxx, vigra/multi_pointoperators.hxx,
+	  vigra/navigator.hxx, vigra/nonlineardiffusion.hxx,
+	  vigra/numerictraits.hxx, vigra/orientedtensorfilters.hxx,
+	  vigra/pixelneighborhood.hxx, vigra/polynomial.hxx,
+	  vigra/rational.hxx, vigra/recursiveconvolution.hxx,
+	  vigra/resampling_convolution.hxx, vigra/resizeimage.hxx,
+	  vigra/rfftw.hxx, vigra/rgbvalue.hxx,
+	  vigra/seededregiongrowing.hxx, vigra/separableconvolution.hxx,
+	  vigra/sized_int.hxx, vigra/splineimageview.hxx,
+	  vigra/splines.hxx, vigra/static_assert.hxx,
+	  vigra/stdconvolution.hxx, vigra/stdimage.hxx,
+	  vigra/stdimagefunctions.hxx, vigra/symmetry.hxx,
+	  vigra/tensorutilities.hxx, vigra/tiff.hxx, vigra/tinyvector.hxx,
+	  vigra/transformimage.hxx, vigra/tuple.hxx, vigra/utilities.hxx,
+	  vigra/watersheds.hxx, vigra/windows.h, vigra_impex/auto_file.hxx,
+	  vigra_impex/bmp.cxx, vigra_impex/bmp.hxx,
+	  vigra_impex/byteorder.cxx, vigra_impex/byteorder.hxx,
+	  vigra_impex/codecmanager.cxx, vigra_impex/codecmanager.hxx,
+	  vigra_impex/error.hxx, vigra_impex/gif.cxx, vigra_impex/gif.hxx,
+	  vigra_impex/imageinfo.cxx, vigra_impex/jpeg.cxx,
+	  vigra_impex/jpeg.hxx, vigra_impex/png.cxx, vigra_impex/png.hxx,
+	  vigra_impex/pnm.cxx, vigra_impex/pnm.hxx, vigra_impex/sun.cxx,
+	  vigra_impex/sun.hxx, vigra_impex/tiff.cxx, vigra_impex/tiff.hxx,
+	  vigra_impex/viff.cxx, vigra_impex/viff.hxx,
+	  vigra_impex/void_vector.cxx, vigra_impex/void_vector.hxx: Update
+	  to (patched) vigra 1.4.0
+
+2006-03-03 01:06  dwilkins42
+
+	* LICENCE_VIGRA: Update the VIGRA license
+
+2006-03-03 01:02  dwilkins42
+
+	* src/include/PT/RandomPointSampler.h: Specify the 'norm' function
+	  to ensure correct candidate used
+
+2006-03-03 01:00  dwilkins42
+
+	* src/include/common/math.h: comment out duplicate function
+
+2006-03-03 00:59  dwilkins42
+
+	* src/include/vigra_ext/FunctorAccessor.h: Add new class member
+	  'size' where required by vigra 1.4.0
+
+2006-03-03 00:57  dwilkins42
+
+	* src/include/vigra_ext/utils.h: Update usage of RGBValue
+	  definitions
+
+2006-03-03 00:50  dwilkins42
+
+	* src/: foreign/vigra/impexalpha.hxx, hugin/ImageCache.cpp,
+	  include/PT/ImageTransforms.h, include/PT/RemappedPanoImage.h,
+	  include/PT/Stitcher.h, include/vigra_ext/ImageTransforms.h,
+	  include/vigra_ext/impexalpha.hxx, tests/vigra_ext.cpp: Move
+	  impexalpha.hxx to vigra_ext
+
+2006-03-03 00:37  dwilkins42
+
+	* src/Panorama/: Stitcher1.cpp, Stitcher2.cpp, Stitcher3.cpp,
+	  Stitcher4.cpp: Update types to conform with vigra 1.4.0
+
+2006-03-03 00:31  dwilkins42
+
+	* src/Panorama/Panorama.cpp: Correct type of parameter
+
+2006-02-25 20:00  dangelo
+
+	* src/: Panorama/Panorama.cpp, include/PT/PanoImage.h,
+	  include/PT/Panorama.h, include/hugin/wxPanoCommand.h: detect and
+	  correct if image size specified in .pto file differs from the
+	  actual image size.
+
+2006-02-24 00:29  dangelo
+
+	* src/: Panorama/PanoImage.cpp, include/PT/PanoImage.h,
+	  include/PT/RemappedPanoImage.h: bugfix: use source image
+	  projection type to determine if the interpolators should use
+	  horizontal warparound boundary conditions
+
+2006-02-23 09:31  dangelo
+
+	* src/: hugin/ImageCenter.cpp, include/hugin/ImageCenter.h:
+	  compiles with wxWidgets 2.4 again.
+
+2006-02-23 00:03  dangelo
+
+	* src/include/vigra_ext/VigQuotientEstimator.h: reorder includes
+	  for compilation on fc4
+
+2006-02-22 00:12  dangelo
+
+	* src/: Panorama/PanoToolsInterface.cpp,
+	  Panorama/SpaceTransform.cpp, include/PT/RemappedPanoImage.h:
+	  bugfix: new transform code code assumed e=d.	bugfix: fixed crash
+	  when rectangular crop lies outside of input image
+
+2006-02-21 18:48  dangelo
+
+	* src/nona_gui/Makefile.am: added proper boost flags
+
+2006-02-21 07:35  dangelo
+
+	* src/vigra_ext/Makefile.am: added boost flags
+
+2006-02-21 00:45  dangelo
+
+	* m4/ax_boost.m4: fixed boost version extraction
+
+2006-02-20 08:37  dangelo
+
+	* src/include/jhead/jhead.h: exif bugfix: forgot to commit header
+	  files
+
+2006-02-19 14:47  dangelo
+
+	* src/: build_msvc/Hugin.sln, jhead/exif.cpp, jhead/jpgfile.cpp:
+	  fixed calculation of ccd size with jpg files produced by
+	  photoshop.
+
+2006-02-19 11:09  dangelo
+
+	* m4/ax_boost.m4: search all possible (hopefully) names of the
+	  boost_thread library
+
+2006-02-18 16:10  dangelo
+
+	* configure.ac, m4/ax_boost.m4: improved boost library test
+
+2006-02-14 00:19  ippei
+
+	* mac/pano12-patch/: filter_h.patch, panorama_h.patch,
+	  sys_mac_h.patch: pano12 patched for universal build and 10.4
+
+2006-02-13 23:58  ippei
+
+	* mac/Notes/scripts/: SetEnv-ppc.txt, SetEnv-universal.txt: mac:
+	  some additional notes
+
+2006-02-13 23:57  ippei
+
+	* mac/Documents/ReadMe-HuginOSX.txt: mac: some additional notes on
+	  installation
+
+2006-02-13 23:51  ippei
+
+	* mac/HuginOSX.xcodeproj/project.pbxproj: mac: various compilation
+	  changes
+
+2006-02-13 23:47  ippei
+
+	* mac/: Notes/External Software.rtf, Notes/install-JpegPngTiff.rtf,
+	  Notes/install-boost.rtf, Notes/scripts/SetEnv-ppc.txt,
+	  Notes/scripts/SetEnv-universal.txt, Notes/scripts/clens.sh,
+	  Notes/scripts/enblend.sh, Notes/scripts/libjpeg.sh,
+	  Notes/scripts/libpng.sh, Notes/scripts/libtiff.sh,
+	  Notes/scripts/pano12.sh, Notes/scripts/wxconfig.sh, localised.sh:
+	  mac: various compilation changes
+
+2006-02-11 22:29  dangelo
+
+	* ChangeLog, configure.ac, m4/ax_boost.m4, m4/ax_check_boost.m4,
+	  src/Panorama/Makefile.am, src/hugin/Makefile.am,
+	  src/tools/Makefile.am: added new boost test to configure
+
+2006-02-11 09:57  dangelo
+
+	* src/include/vigra_ext/VigQuotientEstimator.h: added includes
+	  required for boost 1.32
+
+2006-02-10 09:04  dangelo
+
+	* m4/ax_check_boost.m4: added new lib64 library pathes to boost
+	  check. Not ideal, since it might then find libs in the wrong
+	  directory, since it searches both lib and lib64, independent of
+	  the architecture.
+
+2006-02-09 22:07  dangelo
+
+	* src/hugin/po/: ca_ES.po, cs_CZ.po, de.po, fr.po, hu.po,
+	  hugin.pot, it.po, ja.po, nl.po, pl.po, pt_BR.po, ru.po, zh_CN.po:
+	  added new string, "Czech" :)
+
+2006-02-09 22:01  dangelo
+
+	* AUTHORS, NEWS, src/hugin/PreferencesDialog.cpp,
+	  src/hugin/po/LINGUAS, src/hugin/po/cs_CZ.po,
+	  src/hugin/xrc/data/about.htm, src/hugin/xrc/data/about_fr.htm,
+	  src/hugin/xrc/data/about_pl.htm: added czech translation by Jiri
+	  Slaby
+
 2006-02-08 08:58  dangelo
 
 	* NEWS, src/hugin/xrc/data/about.htm,

Update of /cvsroot/hugin/hugin/src/common
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6298/src/common

Modified Files:
	lu.c 
Log Message:
silence MSVC warnings

Index: lu.c
===================================================================
RCS file: /cvsroot/hugin/hugin/src/common/lu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lu.c	19 Apr 2006 23:13:38 -0000	1.1
+++ lu.c	1 Jun 2006 19:04:35 -0000	1.2
@@ -32,6 +32,7 @@
   int    idx;   /* index of the larger pivot */
   double big;       /* the larger pivot found */
   double tmp = 0.0;
+  int itmp;
   
   int    *P;        /* keep memory of permutation (column permutation) */
   double *y;
@@ -72,9 +73,9 @@
     /* check if we have to interchange the lines */
     if (idx != i)
     {
-      tmp    = P[i];
+      itmp   = P[i];
       P[i]   = P[idx];
-      P[idx] = tmp;
+      P[idx] = itmp;
     }
 
     if (matrix[i + neq*P[i]] == 0.0)
@@ -157,7 +158,7 @@
     /* find the highest value */
     for (j = 0; j < neq; j++)
     {
-      tmp = abs(matrix[i + neq*j]);
+      tmp = fabs(matrix[i + neq*j]);
       val = (tmp > val) ? tmp : val;
     }

Update of /cvsroot/hugin/hugin/src/include/common
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6298/src/include/common

Modified Files:
	lu.h 
Log Message:
silence MSVC warnings

Index: lu.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/common/lu.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lu.h	19 Apr 2006 23:13:38 -0000	1.1
+++ lu.h	1 Jun 2006 19:04:35 -0000	1.2
@@ -96,7 +96,7 @@
     {
         m_nEq = nEq;
         m_AtA = new double[nEq*(nEq+1)];
-        for (int i=0; i < nEq*(nEq+1); i++) m_AtA[i] = 0;
+        for (unsigned i=0; i < nEq*(nEq+1); i++) m_AtA[i] = 0;
     }
 
     ~LMS_Solver()
@@ -124,8 +124,8 @@
     bool solve(Vector & x)
     {
         double * solution = new double[m_nEq];
-        bool ret = math_lu_solve(m_AtA, solution, m_nEq);
-        for (int i=0; i < m_nEq; i++) {
+        bool ret = math_lu_solve(m_AtA, solution, m_nEq) != 0;
+        for (unsigned i=0; i < m_nEq; i++) {
             x[i] = solution[i];
         }
         delete[] solution;

Update of /cvsroot/hugin/hugin/src/include/vigra_ext
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6222/src/include/vigra_ext

Modified Files:
	VigQuotientEstimator.h 
Log Message:
silence MSVC warnings

Index: VigQuotientEstimator.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/vigra_ext/VigQuotientEstimator.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- VigQuotientEstimator.h	19 Apr 2006 23:13:38 -0000	1.6
+++ VigQuotientEstimator.h	1 Jun 2006 19:04:18 -0000	1.7
@@ -180,7 +180,7 @@
          }
 
          double sol[3];
-         bool ok =math_lu_solve(matrix, sol, n);
+         bool ok =math_lu_solve(matrix, sol, n) != 0;
          p[0] = sol[0];
          p[1] = sol[1];
          p[2] = sol[2];
@@ -265,7 +265,6 @@
         return true;
 #else
         utils::LMS_Solver solver(n);
-        double Arow[n];
         for(unsigned k=0; k < data.size(); k++) {
             // calculate one row of A
             double Arow[n];

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

Modified Files:
	PanoToolsInterface.h 
Log Message:
silence MSVC warnings

Index: PanoToolsInterface.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/PanoToolsInterface.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- PanoToolsInterface.h	28 Apr 2006 06:55:17 -0000	1.24
+++ PanoToolsInterface.h	1 Jun 2006 19:03:46 -0000	1.25
@@ -171,7 +171,7 @@
                    double x_src, double y_src) const
         {
             void * params= (void *) (&m_stack);
-            return execute_stack_new(x_src, y_src, &x_dest, &y_dest, params);
+            return execute_stack_new(x_src, y_src, &x_dest, &y_dest, params) != 0;
         }
 
     /** like transform, but return image coordinates, not cartesian
@@ -184,7 +184,7 @@
             y_src -= m_srcTY - 0.5;
 
             void * params= (void *) (&m_stack);
-            bool ok = execute_stack_new(x_src, y_src, &x_dest, &y_dest, params);
+            bool ok = execute_stack_new(x_src, y_src, &x_dest, &y_dest, params) != 0;
             x_dest += m_destTX - 0.5;
             y_dest += m_destTY - 0.5;
             return ok;
@@ -199,7 +199,7 @@
         {
             double x_dest, y_dest;
             void * params= (void *) (&m_stack);
-            bool ok = execute_stack_new(src.x, src.y, &x_dest, &y_dest, params);
+            bool ok = execute_stack_new(src.x, src.y, &x_dest, &y_dest, params) != 0;
             dest.x = x_dest;
             dest.y = y_dest;
             return ok;

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5592/src/hugin

Modified Files:
	ImageCenter.cpp 
Log Message:
maximise crop dialog window by default

Index: ImageCenter.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/ImageCenter.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ImageCenter.cpp	5 May 2006 06:18:48 -0000	1.19
+++ ImageCenter.cpp	1 Jun 2006 19:03:09 -0000	1.20
@@ -128,6 +128,11 @@
     SetSizer( topsizer );
     topsizer->SetSizeHints( this );
 
+    // if no frame position is known, maximise by default
+    wxConfigBase * config = wxConfigBase::Get();
+    if (! config->HasEntry(wxT("/CropDialog/maximized") )) {
+        config->Write(wxT("/CropDialog/maximized"), 1);
+    }
     RestoreFramePosition(this, wxT("CropDialog"));
 
     m_Canvas->Show();
@@ -141,6 +146,7 @@
     m_right_textctrl->PopEventHandler(true);
     m_top_textctrl->PopEventHandler(true);
     m_bottom_textctrl->PopEventHandler(true);
+    StoreFramePosition(this, wxT("CropDialog"));
 }
 
 vigra::Rect2D & ImgCenter::getCrop()

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4705/src/hugin

Modified Files:
	hugin.vcproj 
Log Message:
updated MSVC build files

Index: hugin.vcproj
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/hugin.vcproj,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- hugin.vcproj	19 Apr 2006 20:35:49 -0000	1.20
+++ hugin.vcproj	1 Jun 2006 19:02:03 -0000	1.21
@@ -61,7 +61,7 @@
 				Name="VCPostBuildEventTool"
 				CommandLine="xcopy xrc Debug\xrc /I /Y
 xcopy xrc\data Debug\xrc\data /I /Y
-"/>
+xcopy "..\..\..\libs\libpano\pano12\DLL Debug\pano12d.dll" Debug\"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool

Update of /cvsroot/hugin/hugin/src/common
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4564/src/common

Modified Files:
	common.vcproj 
Log Message:
updated MSVC build files

Index: common.vcproj
===================================================================
RCS file: /cvsroot/hugin/hugin/src/common/common.vcproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- common.vcproj	11 Mar 2006 01:24:38 -0000	1.7
+++ common.vcproj	1 Jun 2006 19:01:43 -0000	1.8
@@ -147,6 +147,9 @@
 				RelativePath=".\graph.cpp">
 			</File>
 			<File
+				RelativePath=".\lu.c">
+			</File>
+			<File
 				RelativePath=".\PTLensDB.c">
 			</File>
 			<File