summaryrefslogtreecommitdiffstats
path: root/tksao/frame/fitsimage.h
diff options
context:
space:
mode:
Diffstat (limited to 'tksao/frame/fitsimage.h')
-rw-r--r--tksao/frame/fitsimage.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
index b5ffc17..2181a57 100644
--- a/tksao/frame/fitsimage.h
+++ b/tksao/frame/fitsimage.h
@@ -111,10 +111,10 @@ class FitsImage {
int address[FTY_MAXAXES];
int manageWCS_;
- WCSx** wcsx_; // xth Axis WCS
#ifndef NEWWCS
WorldCoor** wcs_; // wcs list
AstFrameSet** ast_; // ast frameset;
+ WCSx** wcsx_; // xth Axis WCS
#else
AstFrameSet* newast_; // ast frameset;
#endif
@@ -359,7 +359,6 @@ class FitsImage {
int hasDTMV() {return keyDTMV;}
FitsHead* wcsHeader() {return wcsHeader_;}
- WCSx** wcsx() {return wcsx_;}
int isIIS() {return iisMode_;}
Vector& iisz() {return iisz_;}
@@ -369,16 +368,17 @@ class FitsImage {
char* pix2wcs(const Vector&, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat, char*);
-#ifdef NEWWCS
+#ifndef NEWWCS
+ WCSx** wcsx() {return wcsx_;}
+ double pix2wcsx(double, Coord::CoordSystem);
+ double wcs2pixx(double, Coord::CoordSystem);
+#else
Vector3d pix2wcs(const Vector3d&, Coord::CoordSystem, Coord::SkyFrame);
Vector3d wcs2pix(const Vector3d&, Coord::CoordSystem, Coord::SkyFrame);
char* pix2wcs(const Vector3d&, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat, char*);
#endif
- double pix2wcsx(double, Coord::CoordSystem);
- double wcs2pixx(double, Coord::CoordSystem);
-
void altWCS(istream&);
void appendWCS(istream&);
void listWCS(ostream&, Coord::CoordSystem);