Changeset 3661 in Sophya for trunk/SophyaLib/BaseTools/fiondblock.cc

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

File:

• trunk/SophyaLib/BaseTools/fiondblock.cc (modified) (3 diffs)

trunk/SophyaLib/BaseTools/fiondblock.cc

@@ -117 +117 @@
 inline void PIOSReadArray(PInPersist & is, uint_1 * arr, size_t n)
 { is.GetBytes(arr, n); }
+inline void PIOSReadArray(PInPersist & is, int_1 * arr, size_t n)
+{ is.Get(arr, n); }
 inline void PIOSReadArray(PInPersist & is, uint_2 * arr, size_t n)
 { is.Get(arr, n); }
@@ -184 +186 @@
 #pragma define_template FIO_NDataBlock<uint_1>
 #pragma define_template FIO_NDataBlock<uint_2>
+#pragma define_template FIO_NDataBlock<uint_4>
+#pragma define_template FIO_NDataBlock<uint_8>
+#pragma define_template FIO_NDataBlock<int_1>
 #pragma define_template FIO_NDataBlock<int_2>
 #pragma define_template FIO_NDataBlock<int_4>
 #pragma define_template FIO_NDataBlock<int_8>
-#pragma define_template FIO_NDataBlock<uint_4>
-#pragma define_template FIO_NDataBlock<uint_8>
 #pragma define_template FIO_NDataBlock<r_8>
 #pragma define_template FIO_NDataBlock<r_4>
@@ -200 +203 @@
 template class FIO_NDataBlock<uint_1>;
 template class FIO_NDataBlock<uint_2>;
+template class FIO_NDataBlock<uint_4>;
+template class FIO_NDataBlock<uint_8>;
+template class FIO_NDataBlock<int_1>;
 template class FIO_NDataBlock<int_2>;
 template class FIO_NDataBlock<int_4>;
 template class FIO_NDataBlock<int_8>;
-template class FIO_NDataBlock<uint_4>;
-template class FIO_NDataBlock<uint_8>;
 template class FIO_NDataBlock<r_8>;
 template class FIO_NDataBlock<r_4>;