Ticket #34838: patch-contrib__gel__mrc__vpgl__txx-clang-compatibility.diff

File patch-contrib__gel__mrc__vpgl__txx-clang-compatibility.diff, 7.6 KB (added by neverpanic (Clemens Lang), 12 years ago)

  • contrib/gel/mrc/vpgl/vpgl_affine_camera.txx

    old new  
    1414{
    1515  vnl_matrix_fixed<T,3,4> C( (T)0 );
    1616  C(0,0) = C(1,1) = C(2,3) = (T)1;
    17   set_matrix( C );
     17  this->set_matrix( C );
    1818}
    1919
    2020
    … …  
    3535  vnl_matrix_fixed<T,3,4> C( camera_matrix );
    3636  C = C/C(2,3);
    3737  C(2,0) = (T)0; C(2,1) = (T)0; C(2,2) = (T)0;
    38   set_matrix( C );
     38  this->set_matrix( C );
    3939}
    4040
    4141
    … …  
    5151    C(1,i) = row2(i);
    5252  }
    5353  C(2,3) = (T)1;
    54   set_matrix( C );
     54  this->set_matrix( C );
    5555 }
    5656
    5757// Code for easy instantiation.

  • contrib/gel/mrc/vpgl/vpgl_affine_fundamental_matrix.txx

    old new  
    1616  vnl_matrix_fixed<T,3,3> default_matrix( (T)0 );
    1717  default_matrix(0,1) = default_matrix(0,2) = (T)1;
    1818  default_matrix(1,0) = default_matrix(2,0) = -(T)1;
    19   set_matrix( default_matrix );
     19  this->set_matrix( default_matrix );
    2020}
    2121
    2222
    … …  
    4040  fm.put( 2, 2, c );
    4141  fm.put( 1, 2, d );
    4242  fm.put( 0, 2, e );
    43   set_matrix( fm );
     43  this->set_matrix( fm );
    4444};
    4545
    4646

  • contrib/gel/mrc/vpgl/vpgl_essential_matrix.txx

    old new  
    6666const vpgl_essential_matrix<T>&
    6767vpgl_essential_matrix<T>::operator=( const vpgl_essential_matrix<T>& fm )
    6868{
    69   set_matrix( fm.F_ );
     69  this->set_matrix( fm.F_ );
    7070  return *this;
    7171}
    7272

  • contrib/gel/mrc/vpgl/vpgl_fundamental_matrix.txx

    old new  
    2727{
    2828  vnl_matrix_fixed<T,3,3> default_matrix( (T)0 );
    2929  default_matrix(0,0) = default_matrix(1,1) = (T)1;
    30   set_matrix( default_matrix );
     30  this->set_matrix( default_matrix );
    3131}
    3232
    3333//---------------------------------
    … …  
    3737  const vpgl_fundamental_matrix<T>& other)
    3838  : cached_svd_(NULL)
    3939{
    40   set_matrix( other.F_ );
     40  this->set_matrix( other.F_ );
    4141}
    4242
    4343
    … …  
    4646const vpgl_fundamental_matrix<T>&
    4747vpgl_fundamental_matrix<T>::operator=( const vpgl_fundamental_matrix<T>& fm )
    4848{
    49   set_matrix( fm.F_ );
     49  this->set_matrix( fm.F_ );
    5050  return *this;
    5151}
    5252
    … …  
    206206                                             const vpgl_proj_camera<T>& cl )
    207207{
    208208  vnl_cross_product_matrix e2x( cl.get_matrix() * cr.svd()->nullvector() );
    209   set_matrix( e2x * cl.get_matrix() * cr.svd()->inverse() );
     209  this->set_matrix( e2x * cl.get_matrix() * cr.svd()->inverse() );
    210210}
    211211
    212212

  • contrib/gel/mrc/vpgl/vpgl_local_rational_camera.txx

    old new  
    126126           << "SpecId = \"RPC00B\";\n"
    127127           << "BEGIN_GROUP = IMAGE\n"
    128128           << "\n\n"  // skip errBias and errRand fields
    129            << "  lineOffset = " << offset(vpgl_rational_camera<T>::V_INDX) << '\n'
    130            << "  sampOffset = " << offset(vpgl_rational_camera<T>::U_INDX) << '\n'
    131            << "  latOffset = " << offset(vpgl_rational_camera<T>::Y_INDX) << '\n'
    132            << "  longOffset = " << offset(vpgl_rational_camera<T>::X_INDX) << '\n'
    133            << "  heightOffset = " << offset(vpgl_rational_camera<T>::Z_INDX) << '\n'
    134            << "  lineScale = " << scale(vpgl_rational_camera<T>::V_INDX) << '\n'
    135            << "  sampScale = " << scale(vpgl_rational_camera<T>::U_INDX) << '\n'
    136            << "  latScale = " << scale(vpgl_rational_camera<T>::Y_INDX) << '\n'
    137            << "  longScale = " << scale(vpgl_rational_camera<T>::X_INDX) << '\n'
    138            << "  heightScale = " << scale(vpgl_rational_camera<T>::Z_INDX) << '\n';
     129           << "  lineOffset = " << this->offset(vpgl_rational_camera<T>::V_INDX) << '\n'
     130           << "  sampOffset = " << this->offset(vpgl_rational_camera<T>::U_INDX) << '\n'
     131           << "  latOffset = " << this->offset(vpgl_rational_camera<T>::Y_INDX) << '\n'
     132           << "  longOffset = " << this->offset(vpgl_rational_camera<T>::X_INDX) << '\n'
     133           << "  heightOffset = " << this->offset(vpgl_rational_camera<T>::Z_INDX) << '\n'
     134           << "  lineScale = " << this->scale(vpgl_rational_camera<T>::V_INDX) << '\n'
     135           << "  sampScale = " << this->scale(vpgl_rational_camera<T>::U_INDX) << '\n'
     136           << "  latScale = " << this->scale(vpgl_rational_camera<T>::Y_INDX) << '\n'
     137           << "  longScale = " << this->scale(vpgl_rational_camera<T>::X_INDX) << '\n'
     138           << "  heightScale = " << this->scale(vpgl_rational_camera<T>::Z_INDX) << '\n';
    139139  vnl_matrix_fixed<double,4,20> coeffs = this->coefficient_matrix();
    140140  file_out << "  lineNumCoef = (";
    141141  for (int i=0; i<20; i++) {

  • contrib/gel/mrc/vpgl/vpgl_proj_camera.txx

    old new  
    230230  {
    231231   case 1:
    232232     vsl_b_read(is, Pnew);
    233      set_matrix(Pnew);
     233     this->set_matrix(Pnew);
    234234    break;
    235235   default:
    236236    vcl_cerr << "I/O ERROR: vpgl_proj_camera::b_read(vsl_b_istream&)\n"

  • contrib/gel/mrc/vpgl/vpgl_rational_camera.txx

    old new  
    378378           << "SpecId = \"RPC00B\";\n"
    379379           << "BEGIN_GROUP = IMAGE\n"
    380380           << "\n\n"  // skip errBias and errRand fields
    381            << "  lineOffset = " << offset(V_INDX) << '\n'
    382            << "  sampOffset = " << offset(U_INDX) << '\n'
    383            << "  latOffset = " << offset(Y_INDX) << '\n'
    384            << "  longOffset = " << offset(X_INDX) << '\n'
    385            << "  heightOffset = " << offset(Z_INDX) << '\n'
    386            << "  lineScale = " << scale(V_INDX) << '\n'
    387            << "  sampScale = " << scale(U_INDX) << '\n'
    388            << "  latScale = " << scale(Y_INDX) << '\n'
    389            << "  longScale = " << scale(X_INDX) << '\n'
    390            << "  heightScale = " << scale(Z_INDX) << '\n';
     381           << "  lineOffset = " << this->offset(V_INDX) << '\n'
     382           << "  sampOffset = " << this->offset(U_INDX) << '\n'
     383           << "  latOffset = " << this->offset(Y_INDX) << '\n'
     384           << "  longOffset = " << this->offset(X_INDX) << '\n'
     385           << "  heightOffset = " << this->offset(Z_INDX) << '\n'
     386           << "  lineScale = " << this->scale(V_INDX) << '\n'
     387           << "  sampScale = " << this->scale(U_INDX) << '\n'
     388           << "  latScale = " << this->scale(Y_INDX) << '\n'
     389           << "  longScale = " << this->scale(X_INDX) << '\n'
     390           << "  heightScale = " << this->scale(Z_INDX) << '\n';
    391391  vnl_matrix_fixed<double,4,20> coeffs = this->coefficient_matrix();
    392392  file_out << "  lineNumCoef = (";
    393393  for (int i=0; i<20; i++) {

  • contrib/gel/mrc/vpgl/vpgl_reg_fundamental_matrix.txx

    old new  
    1616  vnl_matrix_fixed<T,3,3> default_matrix( (T)0 );
    1717  default_matrix(0,1) = default_matrix(0,2) = (T)1;
    1818  default_matrix(1,0) = default_matrix(2,0) = -(T)1;
    19   set_matrix( default_matrix );
     19  this->set_matrix( default_matrix );
    2020}
    2121
    2222
    … …  
    5353  fm.put( 1, 2, -ex );
    5454  fm.put( 2, 0, -ey );
    5555  fm.put( 2, 1, ex );
    56   set_matrix( fm );
     56  this->set_matrix( fm );
    5757  return true;
    5858}
    5959
    … …  
    6767  fm.put( 1, 2, -b );
    6868  fm.put( 2, 0, -a );
    6969  fm.put( 2, 1, b );
    70   set_matrix( fm );
     70  this->set_matrix( fm );
    7171};
    7272
    7373