merge with mainline

1 files changed, 15 insertions, 28 deletions

diff --git a/src/Projection.H b/src/Projection.H
index 0a6ec81..3bc816e 100644
--- a/src/Projection.H
+++ b/src/Projection.H
@@ -1,21 +1,8 @@
-// 
-// Copyright 2006 by Johannes Hofmann
 //
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
+// Copyright 2006 Johannes Hofmann <Johannes.Hofmann@gmx.de>
 //
+// This software may be used and distributed according to the terms
+// of the GNU General Public License, incorporated herein by reference.
 
 #ifndef PROJECTION_H
 #define PROJECTION_H
@@ -24,20 +11,20 @@
 #include "ViewParams.H"
 
 class Projection {
- protected:
-  double pi_d;
+	protected:
+		double pi_d;
+
+	public:
+		typedef enum {
+			TANGENTIAL = 0,
+			SPHAERIC   = 1
+		} Projection_t;
 
- public:
-  typedef enum {
-    TANGENTIAL = 0,
-    SPHAERIC   = 1
-  } Projection_t;
+		Projection();
 
-  Projection();
+		virtual void get_coordinates(double a_view, double a_nick,
+			const ViewParams *parms, double *x, double *y);
 
-  virtual void get_coordinates(double a_view, double a_nick,
-	const ViewParams *parms, double *x, double *y);
-  
-  virtual int comp_params(const Hill *m1, const Hill *m2, ViewParams *parms);
+		virtual int comp_params(const Hill *m1, const Hill *m2, ViewParams *parms);
 };
 #endif