Changeset 3661 in Sophya for trunk/SophyaLib/NTools

Timestamp:

Oct 23, 2009, 9:49:14 PM (16 years ago)

Author:

cmv

Message:

• ajout des TArray/TMatrix/TVector <uint_1> et <int_1>
• cet ajout n'a pas ete porte dans Image<T>
• correction petit bug:

inline int_4 Convert(int_2& x) const {...}
-> inline int_2 Convert(int_2& x) const {...}

cmv 23/10/2009

Location:

trunk/SophyaLib/NTools

Files:

• cimage.cc (modified) (2 diffs)
• generaldata.cc (modified) (1 diff)
• objfitter.cc (modified) (2 diffs)

trunk/SophyaLib/NTools/cimage.cc

@@ -187 +187 @@
 #pragma define_template Image< complex<r_8> > 
 
+#pragma define_template FIO_Image<uint_1>
 #pragma define_template FIO_Image<uint_2>
 #pragma define_template FIO_Image<uint_4>
 #pragma define_template FIO_Image<uint_8>
+#pragma define_template FIO_Image<int_1>
 #pragma define_template FIO_Image<int_2>
 #pragma define_template FIO_Image<int_4>
@@ -212 +214 @@
 template class Image< complex<r_8> >;
 
+template class FIO_Image<uint_1>;
 template class FIO_Image<uint_2>;
 template class FIO_Image<uint_4>;
 template class FIO_Image<uint_8>;
+template class FIO_Image<int_1>;
 template class FIO_Image<int_2>;
 template class FIO_Image<int_4>;

trunk/SophyaLib/NTools/generaldata.cc

@@ -980 +980 @@
 if(str[0]=='o') return 2*NVar()+2;
 if(str[0]=='x') {sscanf(str,"x%d",&k); return k;}
-if(str[0]=='e')
+if(str[0]=='e') {
   if(str[1]=='y') return 2*NVar()+1;
   else if(str[1]=='x') {sscanf(str,"ex%d",&k); return NVar()+k;}
+ }
 return -1;
 }

trunk/SophyaLib/NTools/objfitter.cc

@@ -454 +454 @@
 ///////////////////////////////////////////////////////////////
 #ifdef __CXX_PRAGMA_TEMPLATES__
+#pragma define_template ArrayFitter<uint_1>
 #pragma define_template ArrayFitter<uint_2>
 #pragma define_template ArrayFitter<uint_4>
 #pragma define_template ArrayFitter<uint_8>
+#pragma define_template ArrayFitter<int_1>
 #pragma define_template ArrayFitter<int_2>
 #pragma define_template ArrayFitter<int_4>
@@ -473 +475 @@
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
 namespace SOPHYA {
+template class ArrayFitter<uint_1>;
 template class ArrayFitter<uint_2>;
 template class ArrayFitter<uint_4>;
 template class ArrayFitter<uint_8>;
+template class ArrayFitter<int_1>;
 template class ArrayFitter<int_2>;
 template class ArrayFitter<int_4>;