[ptx] hugin build errors with gcc-4.1

[Bruno Postle]

I've upgraded to fedora fc5 and hugin compilation fails here:

make[2]: Entering directory `/home/bruno/rpm/BUILD/hugin-0.6/src/Panorama'
if /bin/sh ../../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H "-I." -I../../src/include -I../../src/include -I../../src/foreign -pthread -I/usr/include -DHasPANO    -O2 -g -MT Panorama.lo -MD -MP -MF ".deps/Panorama.Tpo" -c -o Panorama.lo Panorama.cpp; \
then mv -f ".deps/Panorama.Tpo" ".deps/Panorama.Plo"; else rm -f ".deps/Panorama.Tpo"; exit 1; fi
 g++ -DHAVE_CONFIG_H -I. -I../../src/include -I../../src/include -I../../src/foreign -pthread -I/usr/include -DHasPANO -O2 -g -MT Panorama.lo -MD -MP -MF .deps/Panorama.Tpo -c Panorama.cpp -o Panorama.o
 ../../src/include/PT/PanoramaMemento.h:157: error: extra qualification 'PT::Lens::' on member 'setHFOV'
 ../../src/include/PT/PanoramaMemento.h:397: error: extra qualification 'PT::PanoramaOptions::' on member 'getFormatName'
 ../../src/include/PT/PanoramaMemento.h:403: error: extra qualification 'PT::PanoramaOptions::' on member 'getFormatFromName'
 ../../src/include/PT/PanoramaMemento.h:431: error: extra qualification 'PT::PanoramaOptions::' on member 'setProjection'
 ../../src/include/PT/PanoramaMemento.h:433: error: extra qualification 'PT::PanoramaOptions::' on member 'getProjection'
 ../../src/include/PT/PanoramaMemento.h:453: error: extra qualification 'PT::PanoramaOptions::' on member 'getMaxHFOV'
 ../../src/include/PT/PanoramaMemento.h:455: error: extra qualification 'PT::PanoramaOptions::' on member 'getMaxVFOV'
 ../../src/include/PT/Panorama.h:250: error: extra qualification 'PT::Panorama::' on member 'getSrcImage'
 ../../src/include/PT/Panorama.h:552: error: extra qualification 'PT::Panorama::' on member 'updateLensToImages'
 ../../src/include/PT/SpaceTransform.h:122: error: extra qualification 'PT::SpaceTransform::' on member 'InitCorrect'

This seems to be a problem with gcc-4.1, so I hacked off the bits 
that were causing problems and hugin appears to be ok, patch 
attached.

-- 
Bruno
-------------- next part --------------
diff -ur hugin-0.6/src/include/hugin/VigCorrDialog.h hugin-0.6.new/src/include/hugin/VigCorrDialog.h
--- hugin-0.6/src/include/hugin/VigCorrDialog.h	2006-02-05 14:47:58.000000000 +0000
+++ hugin-0.6.new/src/include/hugin/VigCorrDialog.h	2006-03-24 22:46:15.000000000 +0000
@@ -83,7 +83,7 @@
     /** Window to Panorama */
     bool UpdatePanorama();
 
-    void VigCorrDialog::panoramaChanged(PT::Panorama &pano);
+    void panoramaChanged(PT::Panorama &pano);
 
 protected:
     void OnOk(wxCommandEvent & e);
diff -ur hugin-0.6/src/include/PT/Panorama.h hugin-0.6.new/src/include/PT/Panorama.h
--- hugin-0.6/src/include/PT/Panorama.h	2006-03-06 22:02:41.000000000 +0000
+++ hugin-0.6.new/src/include/PT/Panorama.h	2006-03-24 22:11:53.000000000 +0000
@@ -247,7 +247,7 @@
         };
 
     /// get a complete description of a source image
-    SrcPanoImage Panorama::getSrcImage(unsigned imgNr) const;
+    SrcPanoImage getSrcImage(unsigned imgNr) const;
 
     /// set a panorama image, counting starts with 0
     void setImage(std::size_t nr, PanoImage img)
@@ -549,7 +549,7 @@
      *
      *  only copies inherited variables
      */
-    void Panorama::updateLensToImages(unsigned int lensNr);
+    void updateLensToImages(unsigned int lensNr);
 
     /** copy lens variables to image variables.
      *  update all images that use lensNr
diff -ur hugin-0.6/src/include/PT/PanoramaMemento.h hugin-0.6.new/src/include/PT/PanoramaMemento.h
--- hugin-0.6/src/include/PT/PanoramaMemento.h	2006-02-05 14:39:40.000000000 +0000
+++ hugin-0.6.new/src/include/PT/PanoramaMemento.h	2006-03-24 22:10:47.000000000 +0000
@@ -154,7 +154,7 @@
     double getHFOV() const;
 
     /** set HFOV in degrees */
-    void Lens::setHFOV(double d);
+    void setHFOV(double d);
 
     /** get focal length of lens, it is calculated from the HFOV */
     double getFocalLength() const;
@@ -394,13 +394,13 @@
     void printScriptLine(std::ostream & o) const;
 
     /// return string name of output file format
-    static const std::string & PanoramaOptions::getFormatName(FileFormat f);
+    static const std::string & getFormatName(FileFormat f);
 
     /** returns the FileFormat corrosponding to name.
      *
      *  if name is not recognized, FileFormat::TIFF is returned
      */
-    static FileFormat PanoramaOptions::getFormatFromName(const std::string & name);
+    static FileFormat getFormatFromName(const std::string & name);
 
     /** set panorama width 
      *  Also changes the panorama width, if keepView=true
@@ -428,9 +428,9 @@
     /** set the Projection format and adjust the hfov/vfov
      *  if nessecary
      */
-    void PanoramaOptions::setProjection(ProjectionFormat f);
+    void setProjection(ProjectionFormat f);
 
-    PanoramaOptions::ProjectionFormat PanoramaOptions::getProjection() const
+    PanoramaOptions::ProjectionFormat getProjection() const
     {
         return m_projectionFormat;
     };
@@ -450,9 +450,9 @@
     double getVFOV() const;
 
     /** get maximum possible hfov with current projection */
-    double PanoramaOptions::getMaxHFOV() const;
+    double getMaxHFOV() const;
     /** get maximum possible vfov with current projection */
-    double PanoramaOptions::getMaxVFOV() const;
+    double getMaxVFOV() const;
 
     DestPanoImage getDestImage() const;
 
diff -ur hugin-0.6/src/include/PT/SpaceTransform.h hugin-0.6.new/src/include/PT/SpaceTransform.h
--- hugin-0.6/src/include/PT/SpaceTransform.h	2006-03-09 17:55:24.000000000 +0000
+++ hugin-0.6.new/src/include/PT/SpaceTransform.h	2006-03-24 22:12:19.000000000 +0000
@@ -119,7 +119,7 @@
 		Init( srcSize, srcVars, srcProj, destSize, destProj, destHFOV);
 	}
 
-    void SpaceTransform::InitCorrect(const SrcPanoImage & src, int channel=1);
+    void InitCorrect(const SrcPanoImage & src, int channel=1);
 
     void createTransform(const PT::SrcPanoImage & src, const PT::DestPanoImage & dest);