From 7d7a77b711948dcc2466e41a78d6f50779e503ef Mon Sep 17 00:00:00 2001
From: yvon <>
Date: Thu, 7 Dec 2000 16:32:49 +0000
Subject: [PATCH] les arguments pointeur de diverses fonctions sont passes de
int a int_4 etc + quelques debogues associes
---
FitsIOServer/fitsfile.cc | 24 ++++++++++++------------
FitsIOServer/fitsfile.h | 26 +++++++++++++-------------
FitsIOServer/fitsxntuple.cc | 2 +-
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/FitsIOServer/fitsfile.cc b/FitsIOServer/fitsfile.cc
index 885a988..deb7fbe 100644
--- a/FitsIOServer/fitsfile.cc
+++ b/FitsIOServer/fitsfile.cc
@@ -711,7 +711,7 @@ fill the array 'valeurs' with double data from the current BINTABLE extension on
\param <nentries> number of data to be read
*/
-void FitsInFile::GetBinTabFCol(double* valeurs,int nentries, int NoCol) const
+void FitsInFile::GetBinTabFCol(r_8* valeurs,int nentries, int NoCol) const
{
int status= 0;
int DTYPE;
@@ -748,7 +748,7 @@ void FitsInFile::GetBinTabFCol(double* valeurs,int nentries, int NoCol) const
same as previous method with float data
*/
-void FitsInFile::GetBinTabFCol(float* valeurs,int nentries, int NoCol) const
+void FitsInFile::GetBinTabFCol(r_4* valeurs,int nentries, int NoCol) const
{
int status= 0;
int DTYPE;
@@ -785,7 +785,7 @@ void FitsInFile::GetBinTabFCol(float* valeurs,int nentries, int NoCol) const
same as previous method with int data
*/
-void FitsInFile::GetBinTabFCol(int* valeurs,int nentries, int NoCol) const
+void FitsInFile::GetBinTabFCol(int_4* valeurs,int nentries, int NoCol) const
{
int status= 0;
int DTYPE;
@@ -852,7 +852,7 @@ If the extension is BINTABLE, the first column is provided.
\param <nentries> number of data to be read
*/
-void FitsInFile::GetSingleColumn(double* map, int nentries) const
+void FitsInFile::GetSingleColumn(r_8* map, int nentries) const
{
int status = 0;
if(hdutype_ == FitsExtensionType_IMAGE)
@@ -887,7 +887,7 @@ void FitsInFile::GetSingleColumn(double* map, int nentries) const
/*! \fn void SOPHYA::FitsInFile::GetSingleColumn(float* map, int nentries) const
same as above with float data
*/
-void FitsInFile::GetSingleColumn(float* map, int nentries) const
+void FitsInFile::GetSingleColumn(r_4* map, int nentries) const
{
int status = 0;
if(hdutype_ == FitsExtensionType_IMAGE)
@@ -920,7 +920,7 @@ void FitsInFile::GetSingleColumn(float* map, int nentries) const
/*! \fn void SOPHYA::FitsInFile::GetSingleColumn( int* map, int nentries) const
same as above with int data
*/
-void FitsInFile::GetSingleColumn( int* map, int nentries) const
+void FitsInFile::GetSingleColumn( int_4* map, int nentries) const
{
int status = 0;
if(hdutype_ == FitsExtensionType_IMAGE)
@@ -1327,7 +1327,7 @@ void FitsOutFile::makeHeaderImageOnFits(char type, int nbdim, int* naxisn, DVLi
write double data from array 'map'on an IMAGE extension
\param <nbData> number of data to be written
*/
-void FitsOutFile::PutImageToFits(int nbData, double* map) const
+void FitsOutFile::PutImageToFits(int nbData, r_8* map) const
{
int status = 0;
long npix= nbData;
@@ -1339,7 +1339,7 @@ void FitsOutFile::PutImageToFits(int nbData, double* map) const
same as previous method with float data
*/
-void FitsOutFile::PutImageToFits(int nbData, float* map) const
+void FitsOutFile::PutImageToFits(int nbData, r_4* map) const
{
int status = 0;
long npix= nbData;
@@ -1351,7 +1351,7 @@ void FitsOutFile::PutImageToFits(int nbData, float* map) const
/*! \fn void SOPHYA::FitsOutFile::PutImageToFits( int nbData, int* map) const
same as previous method with int data */
-void FitsOutFile::PutImageToFits( int nbData, int* map) const
+void FitsOutFile::PutImageToFits( int nbData, int_4* map) const
{
int status = 0;
@@ -1479,7 +1479,7 @@ void FitsOutFile::makeHeaderBntblOnFits(string fieldType, vector<string> Noms, i
write double data from array 'donnees ' on column number 'nocol' of a BINTABLE extension.
\param <nentries> number of data to be written
*/
-void FitsOutFile::PutColToFits(int nocol, int nentries, double* donnees) const
+void FitsOutFile::PutColToFits(int nocol, int nentries, r_8* donnees) const
{
int status = 0;
int hdutype;
@@ -1508,7 +1508,7 @@ void FitsOutFile::PutColToFits(int nocol, int nentries, double* donnees) const
same as previous method with float data
*/
-void FitsOutFile::PutColToFits(int nocol, int nentries, float* donnees) const
+void FitsOutFile::PutColToFits(int nocol, int nentries, r_4* donnees) const
{
int status = 0;
int hdutype;
@@ -1540,7 +1540,7 @@ void FitsOutFile::PutColToFits(int nocol, int nentries, float* donnees) const
same as previous method with int data
*/
-void FitsOutFile::PutColToFits(int nocol, int nentries, int* donnees) const
+void FitsOutFile::PutColToFits(int nocol, int nentries, int_4* donnees) const
{
int status = 0;
int hdutype;
diff --git a/FitsIOServer/fitsfile.h b/FitsIOServer/fitsfile.h
index 9c35aab..fed5881 100644
--- a/FitsIOServer/fitsfile.h
+++ b/FitsIOServer/fitsfile.h
@@ -67,7 +67,7 @@ namespace SOPHYA {
FitsDataType_float,
FitsDataType_int,
FitsDataType_char,
- FitsDataType_ASCII,
+ FitsDataType_ASCII
};
FitsFile() { InitNull(); };
@@ -170,9 +170,9 @@ inline bool IsFitsTable() const {return (hdutype_ == FitsExtensionType_ASCII_TBL
** cdata) ;
void GetBinTabLine(long NoLine, BnTblLine& ligne) ;
void GetBinTabLine(int NoLine, float* fdata) ;
- void GetBinTabFCol(double* valeurs, int nentries, int NoCol) const;
- void GetBinTabFCol(float* valeurs, int nentries, int NoCol) const;
- void GetBinTabFCol(int* valeurs, int nentries, int NoCol) const;
+ void GetBinTabFCol(r_8* valeurs, int nentries, int NoCol) const;
+ void GetBinTabFCol(r_4* valeurs, int nentries, int NoCol) const;
+ void GetBinTabFCol(int_4* valeurs, int nentries, int NoCol) const;
void GetBinTabFCol(char** valeurs,int nentries, int NoCol) const;
/////////////////////////////////////////////////////////////
@@ -188,11 +188,11 @@ inline bool IsFitsERROR() const {return (hdutype_ == FitsExtensionType_ERROR);}
int NentriesFromFits(int nocol) const;
- void GetSingleColumn(double* map, int nentries) const;
+ void GetSingleColumn(r_8* map, int nentries) const;
- void GetSingleColumn(float* map, int nentries) const;
+ void GetSingleColumn(r_4* map, int nentries) const;
- void GetSingleColumn(int* map, int nentries) const;
+ void GetSingleColumn(int_4* map, int nentries) const;
private :
@@ -239,9 +239,9 @@ static void GetImageParameters (fitsfile* fileptr,FitsDataType& dataType,int& n
void makeHeaderImageOnFits(char type, int nbdim, int* naxisn, DVList* dvl) ;
- void PutImageToFits( int nbData, double* map) const;
- void PutImageToFits(int nbData, float* map ) const;
- void PutImageToFits(int nbData, int* map) const;
+ void PutImageToFits( int nbData, r_8* map) const;
+ void PutImageToFits(int nbData, r_4* map ) const;
+ void PutImageToFits(int nbData, int_4* map) const;
@@ -252,9 +252,9 @@ static void GetImageParameters (fitsfile* fileptr,FitsDataType& dataType,int& n
void makeHeaderBntblOnFits ( string fieldType, vector<string> Noms, int nentries, int tfields, DVList* dvl, string extname, vector<int> taille_des_chaines) ;
- void PutColToFits(int nocol, int nentries, double* donnees) const;
- void PutColToFits(int nocol, int nentries, float* donnees) const;
- void PutColToFits(int nocol, int nentries, int* donnees) const;
+ void PutColToFits(int nocol, int nentries, r_8* donnees) const;
+ void PutColToFits(int nocol, int nentries, r_4* donnees) const;
+ void PutColToFits(int nocol, int nentries, int_4* donnees) const;
void PutColToFits(int nocol, int nentries, char** donnees) const;
void PutBinTabLine(long NoLine, BnTblLine& ligne) const;
diff --git a/FitsIOServer/fitsxntuple.cc b/FitsIOServer/fitsxntuple.cc
index 160d635..30a17c7 100644
--- a/FitsIOServer/fitsxntuple.cc
+++ b/FitsIOServer/fitsxntuple.cc
@@ -259,7 +259,7 @@ void FITS_XNTuple::WriteToFits(FitsOutFile& os)
if (dobj_->NIVar() > 0)
{
- int* icolumn = new int[nrows];
+ int_4* icolumn = new int_4[nrows];
for (k=0; k<dobj_->NIVar();k++)
{
for(int j = 0; j < nrows; j++) icolumn[j]= dobj_->GetIVal(j,compt);
--
GitLab