Changeset 923 in Sophya for trunk/SophyaExt/FitsIOServer/fitsioserver.cc

Timestamp:

Apr 13, 2000, 7:34:37 PM (25 years ago)

Author:

ansari

Message:

Compil SGI-CC , Probleme avec for(int i) repete - Reza 13/4/2000

File:

• trunk/SophyaExt/FitsIOServer/fitsioserver.cc (modified) (15 diffs)

trunk/SophyaExt/FitsIOServer/fitsioserver.cc

@@ -329 +329 @@
   long repeat;
   int ntest= 0;
-  for(int ii = 0; ii < ncols; ii++)
+  int ii;
+  for(ii = 0; ii < ncols; ii++)
     {
       int DTYPE;
@@ -354 +355 @@
   char **clname;
   clname= new char*[tfields.size()];
-  for(int ii = 0; ii < tfields.size(); ii++)
+  for(ii = 0; ii < tfields.size(); ii++)
     {
       //  ostringstream ne passe pas sur tous les compilos .. Reza 23/12/99
@@ -367 +368 @@
   // create a NTuple
   NTuple nt0(tfields.size(),clname);
-  for(int ii = 0; ii < tfields.size(); ii++)
+  for(ii = 0; ii < tfields.size(); ii++)
     delete [] clname[ii];
   delete [] clname;
@@ -615 +616 @@
         }
     }
-  
-  for(int j = 0; j < sph1.NbPixels(); j++) sph1(j)= (double)r_8tab_[j];
-  for(int j = 0; j < sph2.NbPixels(); j++) sph2(j)= (double)r_8tab_[j+npixels];
-  for(int j = 0; j < sph3.NbPixels(); j++) sph3(j)= (double)r_8tab_[j+2*npixels];
+  int j;
+  for(j = 0; j < sph1.NbPixels(); j++) sph1(j)= (double)r_8tab_[j];
+  for(j = 0; j < sph2.NbPixels(); j++) sph2(j)= (double)r_8tab_[j+npixels];
+  for(j = 0; j < sph3.NbPixels(); j++) sph3(j)= (double)r_8tab_[j+2*npixels];
 }
 
@@ -656 +657 @@
         }
     }
-  
-  for(int j = 0; j < sph1.NbPixels(); j++) sph1(j)= (float)r_4tab_[j];
-  for(int j = 0; j < sph2.NbPixels(); j++) sph2(j)= (float)r_4tab_[j+npixels];
-  for(int j = 0; j < sph3.NbPixels(); j++) sph3(j)= (float)r_4tab_[j+2*npixels];
+  int j;  
+  for(j = 0; j < sph1.NbPixels(); j++) sph1(j)= (float)r_4tab_[j];
+  for(j = 0; j < sph2.NbPixels(); j++) sph2(j)= (float)r_4tab_[j+npixels];
+  for(j = 0; j < sph3.NbPixels(); j++) sph3(j)= (float)r_4tab_[j+2*npixels];
 }
 
@@ -950 +951 @@
     printerror( status );
 
-  for( int ii = 0; ii < tfields; ii++)
+  for(int ii = 0; ii < tfields; ii++)
     {
       delete [] ttype[ii];
@@ -1119 +1120 @@
   r_8tab_=new r_8[3*npixels];
 
-
-  for (int j = 0; j < npixels; j++) r_8tab_[j]= (r_8)sph1(j);
-  for (int j = 0; j < npixels; j++) r_8tab_[j+npixels]= (r_8)sph2(j);
-  for (int j = 0; j < npixels; j++) r_8tab_[j+2*npixels]= (r_8)sph3(j);
+  int j;
+  for (j = 0; j < npixels; j++) r_8tab_[j]= (r_8)sph1(j);
+  for (j = 0; j < npixels; j++) r_8tab_[j+npixels]= (r_8)sph2(j);
+  for (j = 0; j < npixels; j++) r_8tab_[j+2*npixels]= (r_8)sph3(j);
   DVList dvl;
   dvl.SetS("PIXTYPE","HEALPIX ");
@@ -1150 +1151 @@
   if (r_4tab_ != NULL ) { delete[] r_4tab_;  r_4tab_ = NULL; }
   r_4tab_=new r_4[3*npixels];
-
-  for (int j = 0; j < npixels; j++) r_4tab_[j]= (r_4)sph1(j);
-  for (int j = 0; j < npixels; j++) r_4tab_[j+npixels]= (r_4)sph2(j);
-  for (int j = 0; j < npixels; j++) r_4tab_[j+2*npixels]= (r_4)sph3(j);
+  
+  int j;
+  for (j = 0; j < npixels; j++) r_4tab_[j]= (r_4)sph1(j);
+  for (j = 0; j < npixels; j++) r_4tab_[j+npixels]= (r_4)sph2(j);
+  for (j = 0; j < npixels; j++) r_4tab_[j+2*npixels]= (r_4)sph3(j);
 
   DVList dvl;
@@ -1534 +1536 @@
   delete [] tform;
   long nelements= npixels;
+  int k;
   switch (FITS_tab_typ_) 
     {
     case TDOUBLE :
-      for (int k=1; k<=tfields; k++)
+      for (k=1; k<=tfields; k++)
         {
           fits_write_col(fptr, TDOUBLE, k, 1, 1, nelements, r_8tab_+(k-1)*nelements, &status);
@@ -1547 +1550 @@
     case TFLOAT :
  //DBG!!! $CHECK$ Reza      for (int kk=0; kk<10; kk++) cout << r_4tab_[kk] << endl;
-      for (int k=1; k<=tfields; k++)
+      for (k=1; k<=tfields; k++)
         {
           fits_write_col(fptr, TFLOAT, k, 1, 1, nelements, r_4tab_+(k-1)*nelements, &status);
@@ -1554 +1557 @@
       break;
     case TINT :
-      for (int k=1; k<=tfields; k++)
+      for (k=1; k<=tfields; k++)
         {
           fits_write_col(fptr, TINT, k, 1, 1, nelements, i_4tab_+(k-1)*nelements, &status);
@@ -1869 +1872 @@
   // le type suppose par l'utilisateur de fitsioserver 
   // 
+  int k;
   switch ( FITS_tab_typ_) 
     {
@@ -1879 +1883 @@
       if (r_8tab_ != NULL) { delete [] r_8tab_;  r_8tab_ = NULL; }
       r_8tab_=new r_8[ tfields*npixels];
-      for (int k=1; k<=tfields; k++)
+      for (k=1; k<=tfields; k++)
         {
           fits_read_col(fptr, TDOUBLE, k, 1, 1, npixels,  &dnullval, 
@@ -1896 +1900 @@
       if (r_4tab_ != NULL) { delete [] r_4tab_;  r_4tab_ = NULL; }
       r_4tab_=new r_4[ tfields*npixels];
-      for (int k=1; k<=tfields; k++)
+      for (k=1; k<=tfields; k++)
         {
           fits_read_col(fptr, TFLOAT, k, 1, 1, npixels,  &fnullval, 
@@ -1913 +1917 @@
       if (i_4tab_ != NULL) { delete [] i_4tab_;  i_4tab_ = NULL; }
       i_4tab_=new int_4[ tfields*npixels];
-      for (int k=1; k<=tfields; k++)
+      for (k=1; k<=tfields; k++)
         {
           fits_read_col(fptr, TLONG, k, 1, 1, npixels,  &inullval,