Changeset 2689 in Sophya

Timestamp:

Apr 26, 2005, 11:52:55 AM (20 years ago)

Author:

ansari

Message:

Suite adaptation a modif interface_ntuple (remplacement int par sa_size_t (oublie ds implementation specifique pour classes template)) et suppression warning de compil pour format printf/sprintf ds pawexecut.cc , pintuple.cc - Reza 26/4/2005

Location:

trunk/SophyaPI/PIext

Files:

• nomskymapadapter.cc (modified) (2 diffs)
• nomtarradapter.cc (modified) (2 diffs)
• nomtmatvecadapter.cc (modified) (2 diffs)
• pawexecut.cc (modified) (1 diff)
• pintuple.cc (modified) (3 diffs)

trunk/SophyaPI/PIext/nomskymapadapter.cc

@@ -408 +408 @@
 
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-r_8* NTupInt_PixelMap< complex<float> >::GetLineD(int n) const 
+r_8* NTupInt_PixelMap< complex<float> >::GetLineD(sa_size_t n) const 
 {
 int i;
@@ -426 +426 @@
 
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-r_8* NTupInt_PixelMap< complex<double> >::GetLineD(int n) const 
+r_8* NTupInt_PixelMap< complex<double> >::GetLineD(sa_size_t n) const 
 {
 int i;

trunk/SophyaPI/PIext/nomtarradapter.cc

@@ -227 +227 @@
 /* --Methode-- */
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-r_8* NTupInt_TArray< complex<r_4> >::GetLineD(int n) const 
+r_8* NTupInt_TArray< complex<r_4> >::GetLineD(sa_size_t n) const 
 {
 if ((n < 0) || (n >= (int)(mArr->Size()) ) ) {
@@ -247 +247 @@
 
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-r_8* NTupInt_TArray< complex<r_8> >::GetLineD(int n) const 
+r_8* NTupInt_TArray< complex<r_8> >::GetLineD(sa_size_t n) const 
 {
 if ((n < 0) || (n >= (int)(mArr->Size()) ) ) {

trunk/SophyaPI/PIext/nomtmatvecadapter.cc

@@ -353 +353 @@
 /* --Methode-- */
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-r_8* NTupInt_TMatrix< complex<r_4> >::GetLineD(int n) const 
+r_8* NTupInt_TMatrix< complex<r_4> >::GetLineD(sa_size_t n) const 
 {
 int i,j;
@@ -371 +371 @@
 
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-r_8* NTupInt_TMatrix< complex<r_8> >::GetLineD(int n) const 
+r_8* NTupInt_TMatrix< complex<r_8> >::GetLineD(sa_size_t n) const 
 {
 int i,j;

trunk/SophyaPI/PIext/pawexecut.cc

@@ -591 +591 @@
     xn = objnt->GetLineD(k);
     if(f((int_8_exprf)k,xn,xnt,xnt+1,xnt+2,xnt+3) != 0) {
-      if(fout) fprintf(fout,"%d ",k); else printf("%d ",k);
+      if(fout) fprintf(fout,"%ld ",(long)k); else printf("%ld ",(long)k);
       for(i=0;i<(int)varnum.size();i++) {
         if(fout) fprintf(fout,"%g ",*(xn+varnum[i]));

trunk/SophyaPI/PIext/pintuple.cc

@@ -151 +151 @@
 double xp,yp,xer,yer,wp;
 double xl,yl;
-int nok,npolyg;
+long nok;
+int npolyg;
 
 if (!mNT) return;
@@ -263 +264 @@
   // Les labels et leurs longueurs -> largeur de la cellule
   char label[64];
-  sprintf(label, "N=%d (/%d)", nok, mNT->NbLines());
+  sprintf(label, "N=%ld (/%ld)", (long)nok, (long)mNT->NbLines());
   double cellWidth =   1.1 * (double)g->CalcStringWidth(label);
   double xu, yu, cw;
@@ -298 +299 @@
 double xp,yp;
 char buff[128];
-sprintf(buff,"PINTuple: NLines= %d  NCol= %d \n", mNT->NbLines(),  mNT->NbColumns());
+sprintf(buff,"PINTuple: NLines= %ld  NCol= %ld \n", (long)mNT->NbLines(),  
+        (long)mNT->NbColumns());
 info += buff;
 info += mNT->LineHeaderToString();