Changeset 3167 in Sophya for trunk/SophyaExt/FitsIOServer/fitsblkrw.h

Timestamp:

Feb 2, 2007, 6:46:47 PM (19 years ago)

Author:

ansari

Message:

Passage a la version ll (LONGLONG) des routines fits , cmv+Reza 02/02/2007

File:

• trunk/SophyaExt/FitsIOServer/fitsblkrw.h (modified) (8 diffs)

trunk/SophyaExt/FitsIOServer/fitsblkrw.h

@@ -17 +17 @@
 //! Write image HDU data to a fits file 
 static void WriteImageData(FitsInOutFile& fios, const T * d, size_t sz, 
-                           long * fpixel=NULL)
+                           LONGLONG * fpixel=NULL)
 {
   int status = 0;
-  long fpix[5] = {1,1,1,1,1};
+  LONGLONG fpix[5] = {1,1,1,1,1};
   if (fpixel == NULL) fpixel = fpix;
   T * ncd = const_cast<T *>(d);
-  fits_write_pix(fios.FitsPtr(), FitsTypes::DataType(d[0]), fpixel,
+  fits_write_pixll(fios.FitsPtr(), FitsTypes::DataType(d[0]), fpixel,
                  sz, ncd, &status);
   if ( status ) {
@@ -37 +37 @@
 //! Read image HDU data from a fits file 
 static void ReadImageData(FitsInOutFile& fios,  T * d, size_t sz, 
-                          long * fpixel=NULL)
+                          LONGLONG * fpixel=NULL)
 {
   int status = 0;
-  long fpix[5] = {1,1,1,1,1};
+  LONGLONG fpix[5] = {1,1,1,1,1};
   if (fpixel == NULL) fpixel = fpix;
   int anynul = 0;
-  fits_read_pix(fios.FitsPtr(), FitsTypes::DataType(d[0]), fpixel,
+  fits_read_pixll(fios.FitsPtr(), FitsTypes::DataType(d[0]), fpixel,
                  sz, NULL, d, &anynul, &status);
   if ( status ) {
@@ -66 +66 @@
   \param sz : number of data elements to be written
 */
-static void WriteColumnData(FitsInOutFile& fios, int colnum, long firstrow,
-                            long firstelem, const T * d, size_t sz)
+static void WriteColumnData(FitsInOutFile& fios, int colnum, LONGLONG firstrow,
+                            LONGLONG firstelem, const T * d, size_t sz)
 {
   int status = 0;
@@ -93 +93 @@
   \param sz : number of data elements to be read
 */
-static void ReadColumnData(FitsInOutFile& fios, int colnum, long firstrow,
-                            long firstelem, T * d, size_t sz)
+static void ReadColumnData(FitsInOutFile& fios, int colnum, LONGLONG firstrow,
+                           LONGLONG firstelem, T * d, size_t sz)
 {
   int status = 0;
@@ -119 +119 @@
 //! Write image HDU with string data type not supported (throws exception) 
 static void WriteImageData(FitsInOutFile& fios, const std::string * d, size_t sz, 
-                           long * fpixel=NULL)
+                           LONGLONG * fpixel=NULL)
 {
   throw FitsIOException(
@@ -126 +126 @@
 //! Read image HDU with string data type not supported (throws exception) 
 static void ReadImageData(FitsInOutFile& fios,  std::string * d, size_t sz, 
-                          long * fpixel=NULL)
+                          LONGLONG * fpixel=NULL)
 {
   throw FitsIOException(
@@ -133 +133 @@
 
 //! Write character string data to binary/ascii HDU data in a fits file. 
-static void WriteColumnData(FitsInOutFile& fios, int colnum, long firstrow,
-                            long firstelem, const std::string * d, size_t sz)
+static void WriteColumnData(FitsInOutFile& fios, int colnum, LONGLONG firstrow,
+                            LONGLONG firstelem, const std::string * d, size_t sz)
 {
   int status = 0;
@@ -163 +163 @@
 
 //! Read character string data to binary/ascii HDU data in a fits file. 
-static void ReadColumnData(FitsInOutFile& fios, int colnum, long firstrow,
-                           long firstelem, std::string * d, size_t sz)
+static void ReadColumnData(FitsInOutFile& fios, int colnum, LONGLONG firstrow,
+                           LONGLONG firstelem, std::string * d, size_t sz)
 {
   int status = 0;