From 13bae39581079a47d7e2bfe308abaf93ac6f1175 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Tue, 20 Feb 2007 16:55:48 +0000
Subject: [PATCH] Ajout template bidon "foo" pour la classe VectorImage (pour
Visual 6.0)
---
Code/IO/otbImage.h | 2 +-
Code/IO/otbImage.txx | 72 +++++++++++++++++++-------------------
Code/IO/otbVectorImage.h | 2 +-
Code/IO/otbVectorImage.txx | 72 +++++++++++++++++++-------------------
4 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/Code/IO/otbImage.h b/Code/IO/otbImage.h
index cd2c942855..71ebfb8bf4 100755
--- a/Code/IO/otbImage.h
+++ b/Code/IO/otbImage.h
@@ -41,7 +41,7 @@ namespace otb
*/
// Le 3ieme parametre template est bidon MAIS necessaire pour compiler avec Microsoft Visual C++ 6.0
-template <class TPixel,unsigned int VImageDimension, unsigned int toto=0 >
+template <class TPixel,unsigned int VImageDimension, unsigned int foo=0 >
class ITK_EXPORT Image : public itk::Image<TPixel,VImageDimension>,
ImageBase
diff --git a/Code/IO/otbImage.txx b/Code/IO/otbImage.txx
index 223138b1db..8162502295 100755
--- a/Code/IO/otbImage.txx
+++ b/Code/IO/otbImage.txx
@@ -27,110 +27,110 @@
namespace otb
{
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-Image<TPixel,VImageDimension, toto>::Image()
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+Image<TPixel,VImageDimension, foo>::Image()
{
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-std::string Image<TPixel, VImageDimension, toto>::GetProjectionRef( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+std::string Image<TPixel, VImageDimension, foo>::GetProjectionRef( void )
{
return ( this->ImageBase::GetProjectionRef( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-std::string Image<TPixel, VImageDimension, toto>::GetGCPProjection( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+std::string Image<TPixel, VImageDimension, foo>::GetGCPProjection( void )
{
return ( this->ImageBase::GetGCPProjection( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-unsigned int Image<TPixel, VImageDimension, toto>::GetGCPCount( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+unsigned int Image<TPixel, VImageDimension, foo>::GetGCPCount( void )
{
return ( this->ImageBase::GetGCPCount( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-OTB_GCP & Image<TPixel, VImageDimension, toto>::GetGCPs ( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+OTB_GCP & Image<TPixel, VImageDimension, foo>::GetGCPs ( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPs( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-std::string Image<TPixel, VImageDimension, toto>::GetGCPId( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+std::string Image<TPixel, VImageDimension, foo>::GetGCPId( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPId( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-std::string Image<TPixel, VImageDimension, toto>::GetGCPInfo( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+std::string Image<TPixel, VImageDimension, foo>::GetGCPInfo( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPInfo( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-double Image<TPixel, VImageDimension, toto>::GetGCPRow( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double Image<TPixel, VImageDimension, foo>::GetGCPRow( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPRow( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-double Image<TPixel, VImageDimension, toto>::GetGCPCol( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double Image<TPixel, VImageDimension, foo>::GetGCPCol( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPCol( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-double Image<TPixel, VImageDimension, toto>::GetGCPX( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double Image<TPixel, VImageDimension, foo>::GetGCPX( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPX( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-double Image<TPixel, VImageDimension, toto>::GetGCPY( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double Image<TPixel, VImageDimension, foo>::GetGCPY( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPY( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-double Image<TPixel, VImageDimension, toto>::GetGCPZ( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double Image<TPixel, VImageDimension, foo>::GetGCPZ( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPZ( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-ImageBase::VectorType Image<TPixel, VImageDimension, toto>::GetGeoTransform( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType Image<TPixel, VImageDimension, foo>::GetGeoTransform( void )
{
return ( this->ImageBase::GetGeoTransform( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-ImageBase::VectorType Image<TPixel, VImageDimension, toto>::GetUpperLeftCorner( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType Image<TPixel, VImageDimension, foo>::GetUpperLeftCorner( void )
{
return ( this->ImageBase::GetUpperLeftCorner( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-ImageBase::VectorType Image<TPixel, VImageDimension, toto>::GetUpperRightCorner( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType Image<TPixel, VImageDimension, foo>::GetUpperRightCorner( void )
{
return ( this->ImageBase::GetUpperRightCorner( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-ImageBase::VectorType Image<TPixel, VImageDimension, toto>::GetLowerLeftCorner( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType Image<TPixel, VImageDimension, foo>::GetLowerLeftCorner( void )
{
return ( this->ImageBase::GetLowerLeftCorner( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
-ImageBase::VectorType Image<TPixel, VImageDimension, toto>::GetLowerRightCorner( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType Image<TPixel, VImageDimension, foo>::GetLowerRightCorner( void )
{
return ( this->ImageBase::GetLowerRightCorner( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension, unsigned int toto>
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
void
-Image<TPixel, VImageDimension, toto>::PrintSelf(std::ostream& os, itk::Indent indent) const
+Image<TPixel, VImageDimension, foo>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os,indent);
diff --git a/Code/IO/otbVectorImage.h b/Code/IO/otbVectorImage.h
index 98829fe09b..8ccf2da350 100644
--- a/Code/IO/otbVectorImage.h
+++ b/Code/IO/otbVectorImage.h
@@ -38,7 +38,7 @@ namespace otb
* \brief Creation of an "otb" vector image which contains metadata.
*
*/
-template <class TPixel, unsigned int VImageDimension=2>
+template <class TPixel, unsigned int VImageDimension=2, unsigned int foo=0>
class ITK_EXPORT VectorImage : public itk::VectorImage<TPixel, VImageDimension>,
public ImageBase
{
diff --git a/Code/IO/otbVectorImage.txx b/Code/IO/otbVectorImage.txx
index 89294b93d4..c524062434 100644
--- a/Code/IO/otbVectorImage.txx
+++ b/Code/IO/otbVectorImage.txx
@@ -28,110 +28,110 @@
namespace otb
{
-template <class TPixel, unsigned int VImageDimension>
-VectorImage<TPixel,VImageDimension>::VectorImage()
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+VectorImage<TPixel,VImageDimension, foo>::VectorImage()
{
}
-template <class TPixel, unsigned int VImageDimension>
-std::string VectorImage<TPixel, VImageDimension>::GetProjectionRef( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+std::string VectorImage<TPixel, VImageDimension, foo>::GetProjectionRef( void )
{
return ( this->ImageBase::GetProjectionRef( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension>
-std::string VectorImage<TPixel, VImageDimension>::GetGCPProjection( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+std::string VectorImage<TPixel, VImageDimension, foo>::GetGCPProjection( void )
{
return ( this->ImageBase::GetGCPProjection( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension>
-unsigned int VectorImage<TPixel, VImageDimension>::GetGCPCount( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+unsigned int VectorImage<TPixel, VImageDimension, foo>::GetGCPCount( void )
{
return ( this->ImageBase::GetGCPCount( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension>
-OTB_GCP & VectorImage<TPixel, VImageDimension>::GetGCPs ( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+OTB_GCP & VectorImage<TPixel, VImageDimension, foo>::GetGCPs ( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPs( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension>
-std::string VectorImage<TPixel, VImageDimension>::GetGCPId( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+std::string VectorImage<TPixel, VImageDimension, foo>::GetGCPId( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPId( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension>
-std::string VectorImage<TPixel, VImageDimension>::GetGCPInfo( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+std::string VectorImage<TPixel, VImageDimension, foo>::GetGCPInfo( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPInfo( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPRow( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double VectorImage<TPixel, VImageDimension, foo>::GetGCPRow( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPRow( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPCol( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double VectorImage<TPixel, VImageDimension, foo>::GetGCPCol( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPCol( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPX( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double VectorImage<TPixel, VImageDimension, foo>::GetGCPX( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPX( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPY( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double VectorImage<TPixel, VImageDimension, foo>::GetGCPY( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPY( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPZ( unsigned int GCPnum )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+double VectorImage<TPixel, VImageDimension, foo>::GetGCPZ( unsigned int GCPnum )
{
return ( this->ImageBase::GetGCPZ( this->GetMetaDataDictionary(), GCPnum ) );
}
-template <class TPixel, unsigned int VImageDimension>
-ImageBase::VectorType VectorImage<TPixel, VImageDimension>::GetGeoTransform( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType VectorImage<TPixel, VImageDimension, foo>::GetGeoTransform( void )
{
return ( this->ImageBase::GetGeoTransform( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension>
-ImageBase::VectorType VectorImage<TPixel, VImageDimension>::GetUpperLeftCorner( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType VectorImage<TPixel, VImageDimension, foo>::GetUpperLeftCorner( void )
{
return ( this->ImageBase::GetUpperLeftCorner( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension>
-ImageBase::VectorType VectorImage<TPixel, VImageDimension>::GetUpperRightCorner( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType VectorImage<TPixel, VImageDimension, foo>::GetUpperRightCorner( void )
{
return ( this->ImageBase::GetUpperRightCorner( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension>
-ImageBase::VectorType VectorImage<TPixel, VImageDimension>::GetLowerLeftCorner( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType VectorImage<TPixel, VImageDimension, foo>::GetLowerLeftCorner( void )
{
return ( this->ImageBase::GetLowerLeftCorner( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension>
-ImageBase::VectorType VectorImage<TPixel, VImageDimension>::GetLowerRightCorner( void )
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
+ImageBase::VectorType VectorImage<TPixel, VImageDimension, foo>::GetLowerRightCorner( void )
{
return ( this->ImageBase::GetLowerRightCorner( this->GetMetaDataDictionary() ) );
}
-template <class TPixel, unsigned int VImageDimension>
+template <class TPixel, unsigned int VImageDimension, unsigned int foo>
void
-VectorImage<TPixel, VImageDimension>::PrintSelf(std::ostream& os, itk::Indent indent) const
+VectorImage<TPixel, VImageDimension, foo>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os,indent);
--
GitLab