r10902: Automated commit for Debian build of ctsim upstream-version-4.4.4

diff --git a/ChangeLog b/ChangeLog
index 052644691a166393f8496cd18bf5d674a9224148..10e239727e5a39a68208901a31085a1427f7b2dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Mar 16, 2006  Version 4.4.4
+       * Changes for g++ 4.1 support
+

 Aug 22, 2005  Version 4.4.2
        * New URL for downloading CTSim
        
 Aug 22, 2005  Version 4.4.2
        * New URL for downloading CTSim
        

diff --git a/debian/changelog b/debian/changelog
index c3890571b9a5a93a56f1bd51530f0700b7af62fe..6e0cb9b544703dee077df1c66e29643b721040eb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ctsim (4.4.4-1) unstable; urgency=low
+
+  * Patch from Martin Michlmayr for g++ 4.1 support (closes:357383)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 16 Mar 2006 20:45:16 -0700
+

 ctsim (4.4.3-1) unstable; urgency=low
 
   * Allow runtime depends on libgl1 (closes: 348738)
 ctsim (4.4.3-1) unstable; urgency=low
 
   * Allow runtime depends on libgl1 (closes: 348738)

diff --git a/include/backprojectors.h b/include/backprojectors.h
index 64bce82f26a4e34311b899d19c82f31566e052bd..f34964cf7ec9257c0b37c3b81d262b089450cd41 100644 (file)
--- a/include/backprojectors.h
+++ b/include/backprojectors.h
@@ -121,8 +121,8 @@ class Backproject
 
  protected:
     void ScaleImageByRotIncrement ();
 
  protected:
     void ScaleImageByRotIncrement ();

-    void Backproject::errorIndexOutsideDetector (int ix, int iy, double theta, double r, double phi, double L, int ni);
-    void Backproject::errorIndexOutsideDetector (int ix, int iy, double theta, double L, int ni);
+    void errorIndexOutsideDetector (int ix, int iy, double theta, double r, double phi, double L, int ni);
+    void errorIndexOutsideDetector (int ix, int iy, double theta, double L, int ni);

     const Projections& proj;
     ImageFile& im;
     int interpType;
     const Projections& proj;
     ImageFile& im;
     int interpType;

diff --git a/include/scanner.h b/include/scanner.h
index 77962cb9812f816d8418812abd6b9531c014a177..8fdf386c6ce087a2133b1081e765c6fb6bc9919d 100644 (file)
--- a/include/scanner.h
+++ b/include/scanner.h
@@ -68,11 +68,11 @@ class DetectorArray
 class Scanner
 {
  public:
 class Scanner
 {
  public:

-  static const int Scanner::GEOMETRY_INVALID;
-  static const int Scanner::GEOMETRY_PARALLEL;
-  static const int Scanner::GEOMETRY_EQUILINEAR;
-  static const int Scanner::GEOMETRY_EQUIANGULAR;
-  static const int Scanner::GEOMETRY_LINOGRAM;
+  static const int GEOMETRY_INVALID;
+  static const int GEOMETRY_PARALLEL;
+  static const int GEOMETRY_EQUILINEAR;
+  static const int GEOMETRY_EQUIANGULAR;
+  static const int GEOMETRY_LINOGRAM;

 
   
   Scanner (const Phantom& phm, const char* const geometryName, int nDet, 
 
   
   Scanner (const Phantom& phm, const char* const geometryName, int nDet,