From bdfbfe7086c3c4e0b68ad45425efeccd20f46efc Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 3 Jun 2006 18:46:55 +0000 Subject: [PATCH] - fix build with gcc 4.x Changed files: hugin-gcc4.patch -> 1.1 --- hugin-gcc4.patch | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 hugin-gcc4.patch diff --git a/hugin-gcc4.patch b/hugin-gcc4.patch new file mode 100644 index 0000000..9abf4aa --- /dev/null +++ b/hugin-gcc4.patch @@ -0,0 +1,38 @@ +--- hugin-0.5/src/include/PT/PanoramaMemento.h.orig 2005-08-05 23:30:10.000000000 +0200 ++++ hugin-0.5/src/include/PT/PanoramaMemento.h 2006-06-03 20:01:55.737770750 +0200 +@@ -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; +@@ -389,13 +389,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); + + /** calculate height of the output panorama + * +--- hugin-0.5/src/include/PT/Panorama.h.orig 2005-07-26 08:05:17.000000000 +0200 ++++ hugin-0.5/src/include/PT/Panorama.h 2006-06-03 20:02:04.950346500 +0200 +@@ -542,7 +542,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 -- 2.44.0