Changeset 3661 in Sophya for trunk/SophyaLib/BaseTools/mutyv.h


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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/BaseTools/mutyv.h

    r3525 r3661  
    3232  inline MuTyV() { typ = MTVInteger; iv = 0;  dv = dv_im = 0.;  strv = NULL; }
    3333         MuTyV(MuTyV const & a);
     34  inline MuTyV(uint_1 i) { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    3435  inline MuTyV(uint_2 i) { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    3536  inline MuTyV(uint_4 i) { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    3637  inline MuTyV(uint_8 i) { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
     38  inline MuTyV(int_1 i)  { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    3739  inline MuTyV(int_2 i)  { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    3840  inline MuTyV(int_4 i)  { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    … …  
    5254 
    5355         MuTyV & operator= (MuTyV const & a);
     56  inline MuTyV & operator= (uint_1 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
    5457  inline MuTyV & operator= (uint_2 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
    5558  inline MuTyV & operator= (uint_4 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
    5659  inline MuTyV & operator= (uint_8 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
     60  inline MuTyV & operator= (int_1 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
    5761  inline MuTyV & operator= (int_2 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
    5862  inline MuTyV & operator= (int_4 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
    … …  
    6872         TimeStamp const& operator= (TimeStamp const & s);
    6973
     74  inline operator uint_1() const { return((uint_1)iv); }
    7075  inline operator uint_2() const { return((uint_2)iv); }
    7176  inline operator uint_4() const { return((uint_4)iv); }
    7277  inline operator uint_8() const { return((uint_8)iv); }
     78  inline operator int_1()  const { return((int_1)iv); }
    7379  inline operator int_2()  const { return((int_2)iv); }
    7480  inline operator int_4()  const { return((int_4)iv); }
    … …  
    8288         operator TimeStamp() const ;
    8389
     90  inline uint_1 Convert(uint_1& x) const { x = (uint_1)iv; return x; }
    8491  inline uint_2 Convert(uint_2& x) const { x = (uint_2)iv; return x; }
    8592  inline uint_4 Convert(uint_4& x) const { x = (uint_4)iv; return x; }
    8693  inline uint_8 Convert(uint_8& x) const { x = (uint_8)iv; return x; }
    87   inline int_4 Convert(int_2& x) const { x = (int_2)iv; return x; }
     94  inline int_1 Convert(int_1& x) const { x = (int_1)iv; return x; }
     95  inline int_2 Convert(int_2& x) const { x = (int_2)iv; return x; }
    8896  inline int_4 Convert(int_4& x) const { x = (int_4)iv; return x; }
    8997  inline int_8 Convert(int_8& x) const { x = iv; return x; }
Note: See TracChangeset for help on using the changeset viewer.