1 files changed, 12 insertions, 13 deletions
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
index b1c0724..4a7becc 100644
--- a/tksao/frame/fitsimage.h
+++ b/tksao/frame/fitsimage.h
@@ -418,30 +418,29 @@ class FitsImage {
   
 #ifndef NEWWCS
   Vector wcsTran(AstFrameSet*, const Vector&, int);
+  void wcsTran(AstFrameSet*, int, Vector*, int, Vector*);
   double wcsDistance(AstFrameSet*, const Vector&, const Vector&);
+
+  AstFrameSet* getAST(Coord::CoordSystem sys) 
+    {return (ast_ && ast_[sys-Coord::WCS]) ? ast_[sys-Coord::WCS] : NULL;}
 #else
   Vector wcsTran(const Vector&, int);
-  double wcsDistance(const Vector&, const Vector&);
   Vector3d wcsTran(const Vector3d&, int);
+  void wcsTran(int num, Vector* in, int forward, Vector* out)
+  {wcsTran(ast_,num,in,forward,out);}
+  void wcsTran(AstFrameSet*, int, Vector*, int, Vector*);
+  double wcsDistance(const Vector&, const Vector&);
   double wcsAngle(const Vector&, const Vector&, const Vector&);
   double wcsAxAngle(const Vector&, const Vector&);
+
+  void setWCSSystem(Coord::CoordSystem);
+  AstFrameSet* getAST(Coord::CoordSystem sys) {return ast_;}
 #endif
 
   int wcsIsASkyFrame(AstFrameSet*);
-  void wcsTran(AstFrameSet*, int, Vector*, int, Vector*);
-  
-#ifdef NEWWCS
-  void setWCSSystem(AstFrameSet*, Coord::CoordSystem);
-#endif
   void setWCSSkyFrame(AstFrameSet*, Coord::SkyFrame);
   void setWCSFormat(AstFrameSet*, int, const char*);
-#ifndef NEWWCS
-  AstFrameSet* getAST(Coord::CoordSystem sys) 
-    {return (ast_ && ast_[sys-Coord::WCS]) ? ast_[sys-Coord::WCS] : NULL;}
-#else
-  AstFrameSet* getAST(Coord::CoordSystem sys) {return ast_;}
-#endif
-  
+
   int hasWCS(Coord::CoordSystem);
   int hasWCSEqu(Coord::CoordSystem);
   int hasWCSCel(Coord::CoordSystem);