From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Fri, 17 Mar 2006 03:48:48 +0000 (+0000)
Subject: r10902: Automated commit for Debian build of ctsim upstream-version-4.4.4
X-Git-Tag: debian-4.5.3-3~23
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=79b656146b04b1d57d1ac27f9f2e5474e17c4936

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

diff --git a/ChangeLog b/ChangeLog
index 0526446..10e2397 100644
--- 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
 	
diff --git a/debian/changelog b/debian/changelog
index c389057..6e0cb9b 100644
--- 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)
diff --git a/include/backprojectors.h b/include/backprojectors.h
index 64bce82..f34964c 100644
--- a/include/backprojectors.h
+++ b/include/backprojectors.h
@@ -121,8 +121,8 @@ class Backproject
 
  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;
diff --git a/include/scanner.h b/include/scanner.h
index 77962cb..8fdf386 100644
--- a/include/scanner.h
+++ b/include/scanner.h
@@ -68,11 +68,11 @@ class DetectorArray
 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,