Changeset 3661 in Sophya for trunk/SophyaPI


Ignore:
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/SophyaPI/PIext
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/nomtarradapter.cc

    r3572 r3661  
    497497
    498498#ifdef __CXX_PRAGMA_TEMPLATES__
     499#pragma define_template NOMAdapter_TArray<uint_1>
    499500#pragma define_template NOMAdapter_TArray<uint_2>
    500501#pragma define_template NOMAdapter_TArray<uint_4>
    501502#pragma define_template NOMAdapter_TArray<uint_8>
     503#pragma define_template NOMAdapter_TArray<int_1>
    502504#pragma define_template NOMAdapter_TArray<int_2>
    503505#pragma define_template NOMAdapter_TArray<int_4>
    … …  
    507509#pragma define_template NOMAdapter_TArray< complex<r_4> >
    508510#pragma define_template NOMAdapter_TArray< complex<r_8> >
     511#pragma define_template NTupInt_TArray<uint_1>
    509512#pragma define_template NTupInt_TArray<uint_2>
    510513#pragma define_template NTupInt_TArray<uint_4>
    511514#pragma define_template NTupInt_TArray<uint_8>
     515#pragma define_template NTupInt_TArray<int_1>
    512516#pragma define_template NTupInt_TArray<int_2>
    513517#pragma define_template NTupInt_TArray<int_4>
    … …  
    520524
    521525#if defined(ANSI_TEMPLATES)
     526template class NOMAdapter_TArray<uint_1>;
    522527template class NOMAdapter_TArray<uint_2>;
    523528template class NOMAdapter_TArray<uint_4>;
    524529template class NOMAdapter_TArray<uint_8>;
     530template class NOMAdapter_TArray<int_1>;
    525531template class NOMAdapter_TArray<int_2>;
    526532template class NOMAdapter_TArray<int_4>;
    … …  
    530536template class NOMAdapter_TArray< complex<r_4> >;
    531537template class NOMAdapter_TArray< complex<r_8> >;
     538template class NTupInt_TArray<uint_1>;
    532539template class NTupInt_TArray<uint_2>;
    533540template class NTupInt_TArray<uint_4>;
    534541template class NTupInt_TArray<uint_8>;
     542template class NTupInt_TArray<int_1>;
    535543template class NTupInt_TArray<int_2>;
    536544template class NTupInt_TArray<int_4>;

  • trunk/SophyaPI/PIext/nomtmatvecadapter.cc

    r3528 r3661  
    494494
    495495#ifdef __CXX_PRAGMA_TEMPLATES__
     496#pragma define_template NOMAdapter_TMatrix<uint_1>
    496497#pragma define_template NOMAdapter_TMatrix<uint_2>
    497498#pragma define_template NOMAdapter_TMatrix<uint_4>
    498499#pragma define_template NOMAdapter_TMatrix<uint_8>
     500#pragma define_template NOMAdapter_TMatrix<int_1>
    499501#pragma define_template NOMAdapter_TMatrix<int_2>
    500502#pragma define_template NOMAdapter_TMatrix<int_4>
    … …  
    504506#pragma define_template NOMAdapter_TMatrix< complex<r_4> >
    505507#pragma define_template NOMAdapter_TMatrix< complex<r_8> >
     508#pragma define_template NTupInt_TMatrix<uint_1>
    506509#pragma define_template NTupInt_TMatrix<uint_2>
    507510#pragma define_template NTupInt_TMatrix<uint_4>
    508511#pragma define_template NTupInt_TMatrix<uint_8>
     512#pragma define_template NTupInt_TMatrix<int_1>
    509513#pragma define_template NTupInt_TMatrix<int_2>
    510514#pragma define_template NTupInt_TMatrix<int_4>
    … …  
    517521
    518522#if defined(ANSI_TEMPLATES)
     523template class NOMAdapter_TMatrix<uint_1>;
    519524template class NOMAdapter_TMatrix<uint_2>;
    520525template class NOMAdapter_TMatrix<uint_4>;
    521526template class NOMAdapter_TMatrix<uint_8>;
     527template class NOMAdapter_TMatrix<int_1>;
    522528template class NOMAdapter_TMatrix<int_2>;
    523529template class NOMAdapter_TMatrix<int_4>;
    … …  
    527533template class NOMAdapter_TMatrix< complex<r_4> >;
    528534template class NOMAdapter_TMatrix< complex<r_8> >;
     535template class NTupInt_TMatrix<uint_1>;
    529536template class NTupInt_TMatrix<uint_2>;
    530537template class NTupInt_TMatrix<uint_4>;
    531538template class NTupInt_TMatrix<uint_8>;
     539template class NTupInt_TMatrix<int_1>;
    532540template class NTupInt_TMatrix<int_2>;
    533541template class NTupInt_TMatrix<int_4>;

  • trunk/SophyaPI/PIext/piinit.cc

    r3572 r3661  
    5757
    5858//  Octobre 2008 : prise en charge tableaux/matrice/vecteurs en uint_4 uint_8
     59  serv->RegisterClass(new TArray<uint_1>, new NOMAdapter_TArray<uint_1> );
    5960  serv->RegisterClass(new TArray<uint_2>, new NOMAdapter_TArray<uint_2> );
    6061  serv->RegisterClass(new TArray<uint_4>, new NOMAdapter_TArray<uint_4> );
    6162  serv->RegisterClass(new TArray<uint_8>, new NOMAdapter_TArray<uint_8> );
     63  serv->RegisterClass(new TArray<int_1>, new NOMAdapter_TArray<int_1> );
    6264  serv->RegisterClass(new TArray<int_2>, new NOMAdapter_TArray<int_2> );
    6365  serv->RegisterClass(new TArray<int_4>, new NOMAdapter_TArray<int_4> );
    … …  
    6870  serv->RegisterClass(new TArray<complex<r_8> >, new NOMAdapter_TArray<complex<r_8> > );
    6971
     72  serv->RegisterClass(new TVector<uint_1>, new NOMAdapter_TMatrix<uint_1> );
     73  serv->RegisterClass(new TMatrix<uint_1>, new NOMAdapter_TMatrix<uint_1> );
    7074  serv->RegisterClass(new TVector<uint_2>, new NOMAdapter_TMatrix<uint_2> );
    7175  serv->RegisterClass(new TMatrix<uint_2>, new NOMAdapter_TMatrix<uint_2> );
    … …  
    7478  serv->RegisterClass(new TVector<uint_8>, new NOMAdapter_TMatrix<uint_8> );
    7579  serv->RegisterClass(new TMatrix<uint_8>, new NOMAdapter_TMatrix<uint_8> );
     80  serv->RegisterClass(new TVector<int_1>, new NOMAdapter_TMatrix<int_1> );
     81  serv->RegisterClass(new TMatrix<int_1>, new NOMAdapter_TMatrix<int_1> );
    7682  serv->RegisterClass(new TVector<int_2>, new NOMAdapter_TMatrix<int_2> );
    7783  serv->RegisterClass(new TMatrix<int_2>, new NOMAdapter_TMatrix<int_2> );

  • trunk/SophyaPI/PIext/pitvmaad.cc

    r3528 r3661  
    134134
    135135#ifdef __CXX_PRAGMA_TEMPLATES__
     136#pragma define_template POTVectorAdapter< uint_1 >
    136137#pragma define_template POTVectorAdapter< uint_2 >
    137138#pragma define_template POTVectorAdapter< uint_4 >
    138139#pragma define_template POTVectorAdapter< uint_8 >
     140#pragma define_template POTVectorAdapter< int_1 >
    139141#pragma define_template POTVectorAdapter< int_2 >
    140142#pragma define_template POTVectorAdapter< int_4 >
    … …  
    145147#pragma define_template POTVectorAdapter< complex<double> >
    146148
     149#pragma define_template POTMatrixAdapter< uint_1 >
    147150#pragma define_template POTMatrixAdapter< uint_2 >
    148151#pragma define_template POTMatrixAdapter< uint_4 >
    149152#pragma define_template POTMatrixAdapter< uint_8 >
     153#pragma define_template POTMatrixAdapter< int_1 >
    150154#pragma define_template POTMatrixAdapter< int_2 >
    151155#pragma define_template POTMatrixAdapter< int_4 >
    … …  
    158162
    159163#if defined(ANSI_TEMPLATES)
     164template class POTVectorAdapter< uint_1 >;
    160165template class POTVectorAdapter< uint_2 >;
    161166template class POTVectorAdapter< uint_4 >;
    162167template class POTVectorAdapter< uint_8 >;
     168template class POTVectorAdapter< int_1 >;
    163169template class POTVectorAdapter< int_2 >;
    164170template class POTVectorAdapter< int_4 >;
    … …  
    169175template class POTVectorAdapter< complex<double> >;
    170176
     177template class POTMatrixAdapter< uint_1 >;
    171178template class POTMatrixAdapter< uint_2 >;
    172179template class POTMatrixAdapter< uint_4 >;
    173180template class POTMatrixAdapter< uint_8 >;
     181template class POTMatrixAdapter< int_1 >;
    174182template class POTMatrixAdapter< int_2 >;
    175183template class POTMatrixAdapter< int_4 >;
Note: See TracChangeset for help on using the changeset viewer.