Changeset 3166 in Sophya for trunk/SophyaExt

Timestamp:

Feb 2, 2007, 6:14:49 PM (19 years ago)

Author:

ansari

Message:

changement long -> LONGLONG pour gros fichiers cmv+rz 02/02/2007

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fbtntintf.cc (modified) (3 diffs)
• fbtntintf.h (modified) (1 diff)

trunk/SophyaExt/FitsIOServer/fbtntintf.cc

@@ -155 +155 @@
 
  // Get number of rows
- if(fits_get_num_rows(FitsPtr,&NBline,&sta)) printerror(sta);
+ if(fits_get_num_rowsll(FitsPtr,&NBline,&sta)) printerror(sta);
  if(DbgLevel) cout<<"...Init  NBline="<<NBline<<endl;
  if(NBline<1) {Delete(); return;}
@@ -218 +218 @@
  if(n<LineDeb || n>LineFin) {
    NFitsRead++;
-   long row1,row2,nrow;
+   LONGLONG row1,row2,nrow;
    if(BuffSens>0) { // Cas remplissage forward
      row1 = n+1;
@@ -240 +240 @@
  }
 
- int_4 ibuf = n-LineDeb;
+ sa_size_t ibuf = n-LineDeb;
  for(int icol=0;icol<NBcol;icol++)
    if(ColReadable[icol]) mRet[icol] = (Buffer[icol])[ibuf];

trunk/SophyaExt/FitsIOServer/fbtntintf.h

@@ -48 +48 @@
   uint_2 DbgLevel;
   fitsfile *FitsPtr;
-  long NBline;
+  LONGLONG NBline;
   int  NBcol;
   r_8 NulVal;
   int_4 BuffLen, BuffSens;
-  mutable uint_4 NFitsRead;
-  mutable long LineDeb, LineFin;
+  mutable uint_8 NFitsRead;
+  mutable LONGLONG LineDeb, LineFin;
   vector<string> ColName;
   bool* ColReadable;