Complete diff between the internal itk version and 3.20.0

From OTBWiki
Jump to: navigation, search
< OTB/Utilities/ITK/Code/Algorithms/itkMIRegistrationFunction.txx
> ITK-3.20.0/Code/Algorithms/itkMIRegistrationFunction.txx 

4c4
< Module:    $RCSfile: itkMIRegistrationFunction.txx,v $
---
> Module:    itkMIRegistrationFunction.txx
6,7c6,7
< Date:      $Date: 2009-01-26 21:45:50 $
< Version:   $Revision: 1.22 $
---
> Date:      $Date$
> Version:   $Revision$
287,288c287
< //     unsigned int numberOfSamples=20;
<     unsigned int numberOfSamples=10;
---
>     unsigned int numberOfSamples=20;
294d292
<     randasamit.ReinitializeSeed(0);

=======================================================================

< OTB/Utilities/ITK/Code/Algorithms/itkWatershedSegmenter.h
> ITK-3.20.0/Code/Algorithms/itkWatershedSegmenter.h 



=======================================================================

< OTB/Utilities/ITK/Code/Algorithms/itkWatershedSegmenter.txx
> ITK-3.20.0/Code/Algorithms/itkWatershedSegmenter.txx 



=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkBinaryDilateImageFilter.txx
> ITK-3.20.0/Code/BasicFilters/itkBinaryDilateImageFilter.txx 

4c4
<   Module:    $RCSfile: itkBinaryDilateImageFilter.txx,v $
---
>   Module:    itkBinaryDilateImageFilter.txx
6,7c6,7
<   Date:      $Date: 2009-04-17 18:58:09 $
<   Version:   $Revision: 1.22 $
---
>   Date:      $Date$
>   Version:   $Revision$
136,139c136,139
<   const unsigned char backgroundTag  = 0;
<   const unsigned char onTag          = 1;
<   const unsigned char borderTag      = 2;
<   const unsigned char innerTag       = 3;
---
>   static const unsigned char backgroundTag  = 0;
>   static const unsigned char onTag          = 1;
>   static const unsigned char borderTag      = 2;
>   static const unsigned char innerTag       = 3;

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkBinaryErodeImageFilter.txx
> ITK-3.20.0/Code/BasicFilters/itkBinaryErodeImageFilter.txx 

4c4
<   Module:    $RCSfile: itkBinaryErodeImageFilter.txx,v $
---
>   Module:    itkBinaryErodeImageFilter.txx
6,7c6,7
<   Date:      $Date: 2008-08-13 12:37:50 $
<   Version:   $Revision: 1.26 $
---
>   Date:      $Date$
>   Version:   $Revision$
130,133c130,133
<   const unsigned char backgroundTag  = 0;
<   const unsigned char onTag          = 1;
<   const unsigned char borderTag      = 2;
<   const unsigned char innerTag       = 3;
---
>   static const unsigned char backgroundTag  = 0;
>   static const unsigned char onTag          = 1;
>   static const unsigned char borderTag      = 2;
>   static const unsigned char innerTag       = 3;

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkBSplineDecompositionImageFilter.h
> ITK-3.20.0/Code/BasicFilters/itkBSplineDecompositionImageFilter.h 

4c4
<   Module:    $RCSfile: itkBSplineDecompositionImageFilter.h,v $
---
>   Module:    itkBSplineDecompositionImageFilter.h
6,7c6,7
<   Date:      $Date: 2010-03-19 07:06:01 $
<   Version:   $Revision: 1.12 $
---
>   Date:      $Date$
>   Version:   $Revision$
107,111c107,111
< //  itkConceptMacro(InputConvertibleToOutputCheck,
< //     (Concept::Convertible<typename TInputImage::PixelType,
< //                           typename TOutputImage::PixelType>));
< //  itkConceptMacro(DoubleConvertibleToOutputCheck,
< //    (Concept::Convertible<double, typename TOutputImage::PixelType>));
---
>   itkConceptMacro(InputConvertibleToOutputCheck,
>      (Concept::Convertible<typename TInputImage::PixelType,
>                            typename TOutputImage::PixelType>));
>   itkConceptMacro(DoubleConvertibleToOutputCheck,
>     (Concept::Convertible<double, typename TOutputImage::PixelType>));

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkBSplineInterpolateImageFunction.txx
> ITK-3.20.0/Code/BasicFilters/itkBSplineInterpolateImageFunction.txx 

4c4
<   Module:    $RCSfile: itkBSplineInterpolateImageFunction.txx,v $
---
>   Module:    itkBSplineInterpolateImageFunction.txx
6,7c6,7
<   Date:      $Date: 2009-10-13 07:39:24 $
<   Version:   $Revision: 1.22 $
---
>   Date:      $Date$
>   Version:   $Revision$
172c172
<     interpolated += w * (m_Coefficients->GetPixel(coefficientIndex));
---
>     interpolated += w * m_Coefficients->GetPixel(coefficientIndex);

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h
> ITK-3.20.0/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h 

4c4
<   Module:    $RCSfile: itkCannyEdgeDetectionImageFilter.h,v $
---
>   Module:    itkCannyEdgeDetectionImageFilter.h
6,7c6,7
<   Date:      $Date: 2009-04-25 12:27:15 $
<   Version:   $Revision: 1.28 $
---
>   Date:      $Date$
>   Version:   $Revision$
197c197
<   /** Set the Threshold value for detected edges. */
---
>   ///* Set the Threshold value for detected edges. */
204c204
<   /** Set the Thresholdvalue for detected edges. */
---
>   /* Set the Thresholdvalue for detected edges. */

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkConnectedComponentFunctorImageFilter.h
> ITK-3.20.0/Code/BasicFilters/itkConnectedComponentFunctorImageFilter.h 

4c4
<   Module:    $RCSfile: itkConnectedComponentFunctorImageFilter.h,v $
---
>   Module:    itkConnectedComponentFunctorImageFilter.h
6,7c6,7
<   Date:      $Date: 2008-10-13 18:54:27 $
<   Version:   $Revision: 1.5 $
---
>   Date:      $Date$
>   Version:   $Revision$
55c55
<     public ImageToImageFilter< TInputImage, TOutputImage > 
---
>     public ConnectedComponentImageFilter< TInputImage, TOutputImage, TMaskImage > 
62c62
<   typedef ImageToImageFilter< TInputImage, TOutputImage > Superclass;
---
>   typedef ConnectedComponentImageFilter< TInputImage, TOutputImage, TMaskImage > Superclass;
153,173d152
<   
<   
<   /**
<    * Set/Get whether the connected components are defined strictly by
<    * face connectivity or by face+edge+vertex connectivity.  Default is
<    * FullyConnectedOff.  For objects that are 1 pixel wide, use
<    * FullyConnectedOn.
<    */
<   itkSetMacro(FullyConnected, bool);
<   itkGetConstReferenceMacro(FullyConnected, bool);
<   itkBooleanMacro(FullyConnected);
< 
<   void SetMaskImage(TMaskImage* mask)
<   {
<     this->SetNthInput(1, const_cast<TMaskImage *>( mask ));
<   }
< 
<   const TMaskImage* GetMaskImage() const
<   {
<     return (static_cast<const TMaskImage*>(this->ProcessObject::GetInput(1)));
<   }
176,179c155
<   ConnectedComponentFunctorImageFilter() 
<     {
<     m_FullyConnected = false;
<     }
---
>   ConnectedComponentFunctorImageFilter() {}
189,191d164
< 
<   bool m_FullyConnected;
< 

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkInverseDeformationFieldImageFilter.txx
> ITK-3.20.0/Code/BasicFilters/itkInverseDeformationFieldImageFilter.txx 



=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkMaskImageFilter.h
> ITK-3.20.0/Code/BasicFilters/itkMaskImageFilter.h 

4c4
<   Module:    $RCSfile: itkMaskImageFilter.h,v $
---
>   Module:    itkMaskImageFilter.h
6,7c6,7
<   Date:      $Date: 2009-04-01 14:36:27 $
<   Version:   $Revision: 1.18 $
---
>   Date:      $Date$
>   Version:   $Revision$
61c61
<   MaskInput() {};
---
>   MaskInput(): m_OutsideValue(NumericTraits< TOutput >::Zero) {};

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkResampleImageFilter.h
> ITK-3.20.0/Code/BasicFilters/itkResampleImageFilter.h 

4c4
<   Module:    $RCSfile: itkResampleImageFilter.h,v $
---
>   Module:    itkResampleImageFilter.h
6,7c6,7
<   Date:      $Date: 2009-04-25 12:28:07 $
<   Version:   $Revision: 1.62 $
---
>   Date:      $Date$
>   Version:   $Revision$
110,111c110
<   typedef double CoordRepType;
<   typedef Transform<CoordRepType,
---
>   typedef Transform<TInterpolatorPrecisionType, 
117c116
<   typedef InterpolateImageFunction<InputImageType,CoordRepType > InterpolatorType;
---
>   typedef InterpolateImageFunction<InputImageType, TInterpolatorPrecisionType> InterpolatorType;

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkResampleImageFilter.txx
> ITK-3.20.0/Code/BasicFilters/itkResampleImageFilter.txx 

4c4
<   Module:    $RCSfile: itkResampleImageFilter.txx,v $
---
>   Module:    itkResampleImageFilter.txx
6,7c6,7
<   Date:      $Date: 2009-03-25 21:10:39 $
<   Version:   $Revision: 1.66 $
---
>   Date:      $Date$
>   Version:   $Revision$
58,60c58,59
<   typedef double CoordRepType;
<   m_Transform = IdentityTransform<CoordRepType, ImageDimension>::New();
<   m_Interpolator = LinearInterpolateImageFunction<InputImageType, CoordRepType>::New();
---
>   m_Transform = IdentityTransform<TInterpolatorPrecisionType, ImageDimension>::New();
>   m_Interpolator = LinearInterpolateImageFunction<InputImageType, TInterpolatorPrecisionType>::New();
227,228c226
<   typedef double CoordRepType;
<   typedef ContinuousIndex<CoordRepType, ImageDimension> ContinuousIndexType;
---
>   typedef ContinuousIndex<TInterpolatorPrecisionType, ImageDimension> ContinuousIndexType;
286,288c284,295
<       pixval = static_cast<PixelType>(
<                NumericTraits<OutputType>::Clamp(value,minOutputValue,maxOutputValue)
<                                      );
---
>       if( value < minOutputValue )
>         {
>         pixval = minValue;
>         }
>       else if( value > maxOutputValue )
>         {
>         pixval = maxValue;
>         }
>       else 
>         {
>         pixval = static_cast<PixelType>( value );
>         }
329,330c336
<   typedef double CoordRepType;
<   typedef ContinuousIndex<CoordRepType, ImageDimension> ContinuousIndexType;
---
>   typedef ContinuousIndex<TInterpolatorPrecisionType, ImageDimension> ContinuousIndexType;
457,460c463,474
< 
<         pixval = static_cast<PixelType>(
<                  NumericTraits<OutputType>::Clamp(value,minOutputValue,maxOutputValue)
<                                         );
---
>         if( value <  minOutputValue )
>           {
>           pixval = minValue;
>           }
>         else if( value > maxOutputValue )
>           {
>           pixval = maxValue;
>           }
>         else 
>           {
>           pixval = static_cast<PixelType>( value );
>           }

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkTernaryFunctorImageFilter.txx
> ITK-3.20.0/Code/BasicFilters/itkTernaryFunctorImageFilter.txx 

4c4
<   Module:    $RCSfile: itkTernaryFunctorImageFilter.txx,v $
---
>   Module:    itkTernaryFunctorImageFilter.txx
6,7c6,7
<   Date:      $Date: 2008-10-18 16:11:14 $
<   Version:   $Revision: 1.39 $
---
>   Date:      $Date$
>   Version:   $Revision$
49c49
<   this->SetNthInput( 0, const_cast<TInputImage1 *>( image1 ) );
---
>   SetNthInput( 0, const_cast<TInputImage1 *>( image1 ) );
62c62
<   this->SetNthInput( 1, const_cast<TInputImage2 *>( image2 ) );
---
>   SetNthInput( 1, const_cast<TInputImage2 *>( image2 ) );
75c75
<   this->SetNthInput( 2, const_cast<TInputImage3 *>( image3 ) );
---
>   SetNthInput( 2, const_cast<TInputImage3 *>( image3 ) );

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkUnaryFunctorImageFilter.txx
> ITK-3.20.0/Code/BasicFilters/itkUnaryFunctorImageFilter.txx 

4c4
<   Module:    $RCSfile: itkUnaryFunctorImageFilter.txx,v $
---
>   Module:    itkUnaryFunctorImageFilter.txx
6,7c6,7
<   Date:      $Date: 2009-10-28 03:37:14 $
<   Version:   $Revision: 1.34 $
---
>   Date:      $Date$
>   Version:   $Revision$
64,67d63
< 
<   // Copy information from input to output. If input and output are of
<   // different dimensions, Region information will not be copied.
<   outputPtr->CopyInformation(inputPtr);

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkWarpImageFilter.h
> ITK-3.20.0/Code/BasicFilters/itkWarpImageFilter.h 

4c4
<   Module:    $RCSfile: itkWarpImageFilter.h,v $
---
>   Module:    itkWarpImageFilter.h
6,7c6,7
<   Date:      $Date: 2009-10-29 11:19:00 $
<   Version:   $Revision: 1.31 $
---
>   Date:      $Date$
>   Version:   $Revision$
226,227c226,227
<   /** itkConceptMacro(InputHasNumericTraitsCheck,
<     (Concept::HasNumericTraits<typename TInputImage::PixelType>));*/
---
>   itkConceptMacro(InputHasNumericTraitsCheck,
>     (Concept::HasNumericTraits<typename TInputImage::PixelType>));
235c235
<   virtual ~WarpImageFilter() {};
---
>   ~WarpImageFilter() {};

=======================================================================

< OTB/Utilities/ITK/Code/BasicFilters/itkWarpImageFilter.txx
> ITK-3.20.0/Code/BasicFilters/itkWarpImageFilter.txx 

4c4
<   Module:    $RCSfile: itkWarpImageFilter.txx,v $
---
>   Module:    itkWarpImageFilter.txx
6,7c6,7
<   Date:      $Date: 2009-10-29 11:19:10 $
<   Version:   $Revision: 1.34 $
---
>   Date:      $Date$
>   Version:   $Revision$
27,30d26
< 
< #include "itkVariableLengthVector.h"
< #include "itkPixelBuilder.h"
< 
49c45
<   PixelBuilder<PixelType>::Zero(m_EdgePaddingValue,1);
---
>   m_EdgePaddingValue = NumericTraits<PixelType>::Zero;
286c282
<       for(unsigned int k = 0; k < PixelSizeFinder(input); k++ )
---
>       for(unsigned int k = 0; k < DisplacementType::Dimension; k++ )
301,309d296
< }
< 
< template <class PixelType> unsigned int PixelSizeFinder(itk::VariableLengthVector<PixelType> pix)
< {
<   return pix.Size();
< }
< template <class PixelType> unsigned int PixelSizeFinder(PixelType pix)
< {
<   return PixelType::Dimension;

=======================================================================

< OTB/Utilities/ITK/Code/Common/itk_hash_map.h
> ITK-3.20.0/Code/Common/itk_hash_map.h 

4c4
<   Module:    $RCSfile: itk_hash_map.h,v $
---
>   Module:    itk_hash_map.h
6,7c6,7
<   Date:      $Date: 2009-02-05 19:05:01 $
<   Version:   $Revision: 1.21 $
---
>   Date:      $Date$
>   Version:   $Revision$
188d187
< #if _MSC_VER != 1600
190d188
< #endif
294d291
< #if _MSC_VER != 1600
296d292
< #endif

=======================================================================

< OTB/Utilities/ITK/Code/Common/itk_hashtable.h
> ITK-3.20.0/Code/Common/itk_hashtable.h 

4c4
<   Module:    $RCSfile: itk_hashtable.h,v $
---
>   Module:    itk_hashtable.h
6,7c6,7
<   Date:      $Date: 2010-04-26 14:31:25 $
<   Version:   $Revision: 1.35 $
---
>   Date:      $Date$
>   Version:   $Revision$
474d473
< #if _MSC_VER != 1600
476d474
< #endif

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkDataObject.cxx
> ITK-3.20.0/Code/Common/itkDataObject.cxx 

4c4
<   Module:    $RCSfile: itkDataObject.cxx,v $
---
>   Module:    itkDataObject.cxx
6,7c6,7
<   Date:      $Date: 2007-12-23 17:59:28 $
<   Version:   $Revision: 1.58 $
---
>   Date:      $Date$
>   Version:   $Revision$
379c379
< ::PropagateRequestedRegion()
---
> ::PropagateRequestedRegion() throw (InvalidRequestedRegionError)

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkDataObject.h
> ITK-3.20.0/Code/Common/itkDataObject.h 

4c4
<   Module:    $RCSfile: itkDataObject.h,v $
---
>   Module:    itkDataObject.h
6,7c6,7
<   Date:      $Date: 2009-02-20 19:59:26 $
<   Version:   $Revision: 1.72 $
---
>   Date:      $Date$
>   Version:   $Revision$
360c360
<   virtual void PropagateRequestedRegion();
---
>   virtual void PropagateRequestedRegion() throw (InvalidRequestedRegionError);

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkFixedArray.txx
> ITK-3.20.0/Code/Common/itkFixedArray.txx 

4c4
<   Module:    $RCSfile: itkFixedArray.txx,v $
---
>   Module:    itkFixedArray.txx
6,7c6,7
<   Date:      $Date: 2009-11-28 09:15:37 $
<   Version:   $Revision: 1.25 $
---
>   Date:      $Date$
>   Version:   $Revision$
231c231
<     *(i++) = value;
---
>     *i++ = value;

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkImageBase.txx
> ITK-3.20.0/Code/Common/itkImageBase.txx 

4c4
<   Module:    $RCSfile: itkImageBase.txx,v $
---
>   Module:    itkImageBase.txx
6,7c6,7
<   Date:      $Date: 2010-01-21 15:51:32 $
<   Version:   $Revision: 1.63 $
---
>   Date:      $Date$
>   Version:   $Revision$
288c288
<     itkDebugMacro(<<"Not executing UpdateOutputData due to zero pixel condition RequestedRegion:" 
---
>     itkWarningMacro(<<"Not executing UpdateOutputData due to zero pixel condition RequestedRegion:" 

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkImageConstIterator.h
> ITK-3.20.0/Code/Common/itkImageConstIterator.h 

4c4
<   Module:    $RCSfile: itkImageConstIterator.h,v $
---
>   Module:    itkImageConstIterator.h
6,7c6,7
<   Date:      $Date: 2009-05-11 21:48:29 $
<   Version:   $Revision: 1.27 $
---
>   Date:      $Date$
>   Version:   $Revision$
236c236
<     {return ImageIteratorDimension; }
---
>     {return ImageIteratorDimension;}

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkImageRandomNonRepeatingConstIteratorWithIndex.h
> ITK-3.20.0/Code/Common/itkImageRandomNonRepeatingConstIteratorWithIndex.h 

4c4
<   Module:    $RCSfile: itkImageRandomNonRepeatingConstIteratorWithIndex.h,v $
---
>   Module:    itkImageRandomNonRepeatingConstIteratorWithIndex.h
6,7c6,7
<   Date:      $Date: 2009-02-05 19:04:57 $
<   Version:   $Revision: 1.9 $
---
>   Date:      $Date$
>   Version:   $Revision$
135c135
<     m_Generator->SetSeed ( seed );
---
>     m_Generator->Initialize ( seed );

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkImageSource.h
> ITK-3.20.0/Code/Common/itkImageSource.h 

4c4
<   Module:    $RCSfile: itkImageSource.h,v $
---
>   Module:    itkImageSource.h
6,7c6,7
<   Date:      $Date: 2009-03-12 01:11:08 $
<   Version:   $Revision: 1.59 $
---
>   Date:      $Date$
>   Version:   $Revision$
232c232
<                             int threadId );
---
>                             int threadId ) ITK_NO_RETURN;

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkKLMSegmentationBorder.h
> ITK-3.20.0/Code/Common/itkKLMSegmentationBorder.h 

4c4
<   Module:    $RCSfile: itkKLMSegmentationBorder.h,v $
---
>   Module:    itkKLMSegmentationBorder.h
6,7c6,7
<   Date:      $Date: 2009-02-05 19:04:58 $
<   Version:   $Revision: 1.15 $
---
>   Date:      $Date$
>   Version:   $Revision$
84c84
<     if( m_Pointer->GetLambda() == rhs->m_Pointer->GetLambda() )
---
>     if( m_Pointer->GetLambda() == rhs.m_Pointer->GetLambda() )
88c88
<         return ( m_Pointer > rhs->m_Pointer );
---
>         return ( m_Pointer > rhs.m_Pointer );
103,104c103,104
<           static_cast< double>(rhs->m_Pointer->GetRegion1()->GetRegionBorderSize()),
<           static_cast< double>(rhs->m_Pointer->GetRegion2()->GetRegionBorderSize()) );
---
>           static_cast< double>(rhs.m_Pointer->GetRegion1()->GetRegionBorderSize()),
>           static_cast< double>(rhs.m_Pointer->GetRegion2()->GetRegionBorderSize()) );
109c109
<     return(m_Pointer->GetLambda() > rhs->m_Pointer->GetLambda() );
---
>     return(m_Pointer->GetLambda() > rhs.m_Pointer->GetLambda() );

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkMacro.h
> ITK-3.20.0/Code/Common/itkMacro.h 

4c4
<   Module:    $RCSfile: itkMacro.h,v $
---
>   Module:    itkMacro.h
6,7c6,7
<   Date:      $Date: 2010-04-26 14:32:50 $
<   Version:   $Revision: 1.101 $
---
>   Date:      $Date$
>   Version:   $Revision$
961a962,978
> 
> 
> //----------------------------------------------------------------------------
> // Macro to declare that a function does not return. __attribute__((noreturn))
> //    On some compiler, functions that do not return (ex: exit(0)) must
> //    have the noreturn attribute. Otherwise, a warning is raised. Use
> //    that macro to avoid those warnings. GCC defines the attribute
> //    noreturn for versions 2.5 and higher.
> #if defined(__GNUC__)
> #  if (((__GNUC__ == 2) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ >= 3))
> #    define ITK_NO_RETURN \
>        __attribute__ ((noreturn))
> #  endif
> #else
> #  define ITK_NO_RETURN
> #endif
> 

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkMemoryUsageObserver.cxx
> ITK-3.20.0/Code/Common/itkMemoryUsageObserver.cxx 

4c4
<   Module:    $RCSfile: itkMemoryUsageObserver.cxx,v $
---
>   Module:    itkMemoryUsageObserver.cxx
6,7c6,7
<   Date:      $Date: 2009-01-25 22:57:26 $
<   Version:   $Revision: 1.2 $
---
>   Date:      $Date$
>   Version:   $Revision$
45c45
<   #if !defined(__APPLE__) && !defined(__SUNPRO_CC) && !defined (__sun__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
---
>   #if !defined(__APPLE__) && !defined(__SUNPRO_CC) && !defined (__sun__) && !defined(__FreeBSD__)
50,53d49
< #if defined(__OpenBSD__)
< #include <stdlib.h>
< #endif
< 
392c388
< #if !defined(WIN32) && !defined(_WIN32) || defined(__OpenBSD__)
---
> #if !defined(WIN32) && !defined(_WIN32) 
415c411
< #if !defined(__APPLE__) && !defined(__SUNPRO_CC) && !defined (__sun__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
---
> #if !defined(__APPLE__) && !defined(__SUNPRO_CC) && !defined (__sun__) && !defined(__FreeBSD__)
433c429
< #endif //  !defined(__APPLE__) && !defined(__SUNPRO_CC) && !defined (__sun__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
---
> #endif //  !defined(__APPLE__) && !defined(__SUNPRO_CC) && !defined (__sun__) && !defined(__FreeBSD__)

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkMemoryUsageObserver.h
> ITK-3.20.0/Code/Common/itkMemoryUsageObserver.h 

4c4
<   Module:    $RCSfile: itkMemoryUsageObserver.h,v $
---
>   Module:    itkMemoryUsageObserver.h
6,7c6,7
<   Date:      $Date: 2009-02-05 22:04:06 $
<   Version:   $Revision: 1.3 $
---
>   Date:      $Date$
>   Version:   $Revision$
119c119
< #if !defined(__APPLE__) && !defined(__SUNPRO_CC) && !defined (__sun__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
---
> #if !defined(__APPLE__) && !defined(__SUNPRO_CC) && !defined (__sun__) && !defined(__FreeBSD__)
149c149
< #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
---
> #elif defined(__APPLE__) || defined(__FreeBSD__)

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkMetaDataObject.h
> ITK-3.20.0/Code/Common/itkMetaDataObject.h 

4c4
<   Module:    $RCSfile: itkMetaDataObject.h,v $
---
>   Module:    itkMetaDataObject.h
6,7c6,7
<   Date:      $Date: 2009-06-14 09:20:22 $
<   Version:   $Revision: 1.27 $
---
>   Date:      $Date$
>   Version:   $Revision$
15,16c15,16
<      This software is distributed WITHOUT ANY WARRANTY; without even
<      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
---
>      This software is distributed WITHOUT ANY WARRANTY; without even 
>      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
131c131
<   //void * operator new(size_t nothing) {}; //purposefully not implemented
---
>   //void * operator new(size_t nothing) {};//purposefully not implemented
179c179
< 
---
>   
181c181
< 
---
>   

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkObjectFactoryBase.cxx
> ITK-3.20.0/Code/Common/itkObjectFactoryBase.cxx 

4c4
<   Module:    $RCSfile: itkObjectFactoryBase.cxx,v $
---
>   Module:    itkObjectFactoryBase.cxx
6,7c6,7
<   Date:      $Date: 2009-12-23 14:55:37 $
<   Version:   $Revision: 1.60 $
---
>   Date:      $Date$
>   Version:   $Revision$
304,305c304
<   size_t extensionpos = sname.rfind(extension);
<   if ( extensionpos != std::string::npos && extensionpos == sname.size() - extension.size() )
---
>   if ( sname.rfind(extension) == sname.size() - extension.size() )

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkParametricPath.txx
> ITK-3.20.0/Code/Common/itkParametricPath.txx 

4c4
<   Module:    $RCSfile: itkParametricPath.txx,v $
---
>   Module:    itkParametricPath.txx
6,7c6,7
<   Date:      $Date: 2009-02-19 19:41:22 $
<   Version:   $Revision: 1.6 $
---
>   Date:      $Date$
>   Version:   $Revision$
46c46
<   continuousIndex = this->Evaluate( input );
---
>   continuousIndex = Evaluate( input );
137c137
<   return ( this->Evaluate(input + inputStepSize) - this->Evaluate(input) ) / inputStepSize;
---
>   return ( Evaluate(input + inputStepSize) - Evaluate(input) ) / inputStepSize;

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkPoint.txx
> ITK-3.20.0/Code/Common/itkPoint.txx 

4c4
<   Module:    $RCSfile: itkPoint.txx,v $
---
>   Module:    itkPoint.txx
6,7c6,7
<   Date:      $Date: 2007-01-23 13:15:24 $
<   Version:   $Revision: 1.50 $
---
>   Date:      $Date$
>   Version:   $Revision$
259c259
<   this->Fill( NumericTraits<T>::Zero ); // put this point to null
---
>   Fill( NumericTraits<T>::Zero ); // put this point to null

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkPointSet.txx
> ITK-3.20.0/Code/Common/itkPointSet.txx 

4c4
<   Module:    $RCSfile: itkPointSet.txx,v $
---
>   Module:    itkPointSet.txx
6,7c6,7
<   Date:      $Date: 2009-06-21 23:14:46 $
<   Version:   $Revision: 1.35 $
---
>   Date:      $Date$
>   Version:   $Revision$
124,128d123
<   itkDebugMacro("Starting GetPointData()");
<   if( !m_PointDataContainer )
<     {
<     this->SetPointData(PointDataContainer::New());
<     }

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkSize.h
> ITK-3.20.0/Code/Common/itkSize.h 

4c4
<   Module:    $RCSfile: itkSize.h,v $
---
>   Module:    itkSize.h
6,7c6,7
<   Date:      $Date: 2009-03-03 15:09:26 $
<   Version:   $Revision: 1.24 $
---
>   Date:      $Date$
>   Version:   $Revision$
21d20
< #include <cstring>

=======================================================================

< OTB/Utilities/ITK/Code/Common/itkTransform.h
> ITK-3.20.0/Code/Common/itkTransform.h 

4c4
<   Module:    $RCSfile: itkTransform.h,v $
---
>   Module:    itkTransform.h
6,7c6,7
<   Date:      $Date: 2009-11-28 15:53:16 $
<   Version:   $Revision: 1.73 $
---
>   Date:      $Date$
>   Version:   $Revision$
94,95d93
<   typedef double CoordRepType;
< 
116,117c114,115
<   typedef Point<CoordRepType, NInputDimensions>  InputPointType;
<   typedef Point<CoordRepType, NOutputDimensions> OutputPointType;
---
>   typedef Point<TScalarType, NInputDimensions>  InputPointType;
>   typedef Point<TScalarType, NOutputDimensions> OutputPointType;

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkConvertPixelBuffer.h
> ITK-3.20.0/Code/IO/itkConvertPixelBuffer.h 



=======================================================================

< OTB/Utilities/ITK/Code/IO/itkConvertPixelBuffer.txx
> ITK-3.20.0/Code/IO/itkConvertPixelBuffer.txx 



=======================================================================

< OTB/Utilities/ITK/Code/IO/itkDefaultConvertPixelTraits.h
> ITK-3.20.0/Code/IO/itkDefaultConvertPixelTraits.h 



=======================================================================

< OTB/Utilities/ITK/Code/IO/itkImageFileReader.txx
> ITK-3.20.0/Code/IO/itkImageFileReader.txx 



=======================================================================

< OTB/Utilities/ITK/Code/IO/itkImageFileWriter.txx
> ITK-3.20.0/Code/IO/itkImageFileWriter.txx 

4c4
<   Module:    $RCSfile: itkImageFileWriter.txx,v $
---
>   Module:    itkImageFileWriter.txx
6,7c6,7
<   Date:      $Date: 2009-08-24 18:08:39 $
<   Version:   $Revision: 1.62 $
---
>   Date:      $Date$
>   Version:   $Revision$
219c219
<   // configure pixel type
---
>   // confiugure pixel type
222,226c222,226
<     typedef typename InputImageType::InternalPixelType VectorImageScalarType;
<     m_ImageIO->SetPixelTypeInfo( typeid(VectorImageScalarType) );
< 
<     typedef typename InputImageType::AccessorFunctorType AccessorFunctorType;
<     m_ImageIO->SetNumberOfComponents( AccessorFunctorType::GetVectorLength(input) );
---
>       typedef typename InputImageType::InternalPixelType VectorImageScalarType;
>       m_ImageIO->SetPixelTypeInfo( typeid(VectorImageScalarType) );
>     
>       typedef typename InputImageType::AccessorFunctorType AccessorFunctorType;
>       m_ImageIO->SetNumberOfComponents( AccessorFunctorType::GetVectorLength(input) );
230,231c230,231
<     // Set the pixel and component type; the number of components.
<     m_ImageIO->SetPixelTypeInfo(typeid(InputImagePixelType));
---
>       // Set the pixel and component type; the number of components.
>       m_ImageIO->SetPixelTypeInfo(typeid(InputImagePixelType));  
350d349
< 
420a420
> 

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkImageIOBase.cxx
> ITK-3.20.0/Code/IO/itkImageIOBase.cxx 

4c4
<   Module:    $RCSfile: itkImageIOBase.cxx,v $
---
>   Module:    itkImageIOBase.cxx
6,7c6,7
<   Date:      $Date: 2010-06-14 18:55:23 $
<   Version:   $Revision: 1.90 $
---
>   Date:      $Date$
>   Version:   $Revision$
207,214d206
<     case CSHORT:
<       return typeid(std::complex<short>);
<     case CINT:
<       return typeid(std::complex<int>);
<     case CFLOAT:
<       return typeid(std::complex<float>);
<     case CDOUBLE:
<       return typeid(std::complex<double>);
422,448c414
<   return false;
< }
<   
< //
< // This macro enforces pixel type information to be available for all different
< // pixel types.
< //
< template <typename T>
< bool
< itkSetPixelType(ImageIOBase *This,
<                 const std::type_info &ptype,
<                 ImageIOBase::IOComponentType ntype,
<                 std::complex<T> itkNotUsed( dummy ) )
< {
<   /*std::cout << "itkSetPixelType() specialized way" << std::endl;
<   std::cout << "ptype.name() = " << ptype.name() <<std::endl;
<   std::cout << "ntype = " << ntype <<std::endl;*/
<  
<   if (ptype == typeid(std::complex<short>))
<     {
<     std::cout << "complex short detected" << std::endl;
<     This->SetNumberOfComponents(1);
<     This->SetComponentType(ImageIOBase::CSHORT);
<     This->SetPixelType(ImageIOBase::COMPLEX);
<     return true;
<     }
<   if (ptype == typeid(std::complex<int>))
---
>   else if ( ptype == typeid(std::complex<T>) )
450,468c416,417
<     //std::cout << "complex int detected" <<std::endl;
<     This->SetNumberOfComponents(1);
<     This->SetComponentType(ImageIOBase::CINT);
<     This->SetPixelType(ImageIOBase::COMPLEX);
<     return true;
<     }
<   if (ptype == typeid(std::complex<float>))
<     {
<     //std::cout << "complex float detected" <<std::endl;
<     This->SetNumberOfComponents(1);
<     This->SetComponentType(ImageIOBase::CFLOAT);
<     This->SetPixelType(ImageIOBase::COMPLEX);
<     return true;
<     }
<   if (ptype == typeid(std::complex<double>))
<     {
<     //std::cout << "complex double detected" <<std::endl;
<     This->SetNumberOfComponents(1);
<     This->SetComponentType(ImageIOBase::CDOUBLE);
---
>     This->SetNumberOfComponents(2);
>     This->SetComponentType(ntype);
471c420
<     }
---
>     } 
473a423,424
>   
>  
478c429
<   //std::cout << " SetPixelTypeInfo -> BEGIN ..." <<std::endl;
---
> 
493,497c444
<       !itkSetPixelType(this,ptype,ImageIOBase::DOUBLE,(double)(0)) &&
<       !itkSetPixelType(this,ptype,ImageIOBase::CSHORT,(std::complex<short>)(0)) &&
<       !itkSetPixelType(this,ptype,ImageIOBase::CINT,(std::complex<int>)(0)) &&
<       !itkSetPixelType(this,ptype,ImageIOBase::CFLOAT,(std::complex<float>)(0)) &&
<       !itkSetPixelType(this,ptype,ImageIOBase::CDOUBLE,(std::complex<double>)(0)) )
---
>       !itkSetPixelType(this,ptype,ImageIOBase::DOUBLE,(double)(0)) )
532,536c479
<   /*std::cout << "ComponentType: " << this->GetComponentTypeInfo().name() <<std::endl;
<   std::cout << "ComponentSize: " <<this->GetComponentSize() <<std::endl;
<   std::cout << "Nb of Component: " <<this->GetNumberOfComponents() <<std::endl;
<   std::cout << "Pixel Type: " <<this->GetPixelTypeAsString(this->GetPixelType()) <<std::endl;
<   std::cout << " SetPixelTypeInfo -> ... END" <<std::endl;*/
---
> 
707,714d649
<     case CSHORT:
<       return sizeof(std::complex<short>);
<     case CINT:
<       return sizeof(std::complex<int>);
<     case CFLOAT:
<       return sizeof(std::complex<float>);
<     case CDOUBLE:
<       return sizeof(std::complex<double>);
780,787d714
<     case CSHORT:
<       return (s = "complex_short");
<     case CINT:
<       return (s = "complex_int");
<     case CFLOAT:
<       return (s = "complex_float");
<     case CDOUBLE:
<       return (s = "complex_double");
928,959d854
<     case CSHORT:
<       {
<       typedef const std::complex<short> * Type;
<       Type buf = reinterpret_cast<Type>(buffer);
<       WriteBuffer(os, buf, numComp);
<       }
<       break;
< 
<     case CINT:
<       {
<       typedef const std::complex<int> * Type;
<       Type buf = reinterpret_cast<Type>(buffer);
<       WriteBuffer(os, buf, numComp);
<       }
<       break;
< 
<     case CFLOAT:
<       {
<       typedef const std::complex<float> * Type;
<       Type buf = reinterpret_cast<Type>(buffer);
<       WriteBuffer(os, buf, numComp);
<       }
<       break;
< 
<     case CDOUBLE:
<       {
<       typedef const std::complex<double> * Type;
<       Type buf = reinterpret_cast<Type>(buffer);
<       WriteBuffer(os, buf, numComp);
<       }
<       break;
< 
1055,1083d949
< 
<     case CSHORT:
<       {
<       std::complex<short> *buf = reinterpret_cast<std::complex<short>*>(buffer);
<       ReadBuffer(is, buf, numComp);
<       }
<       break;
< 
<     case CINT:
<       {
<       std::complex<int> *buf = reinterpret_cast<std::complex<int>*>(buffer);
<       ReadBuffer(is, buf, numComp);
<       }
<       break;
< 
<     case CFLOAT:
<       {
<       std::complex<float> *buf = reinterpret_cast<std::complex<float>*>(buffer);
<       ReadBuffer(is, buf, numComp);
<       }
<       break;
< 
<     case CDOUBLE:
<       {
<       std::complex<double> *buf = reinterpret_cast<std::complex<double>*>(buffer);
<       ReadBuffer(is, buf, numComp);
<       }
<       break;
< 

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkImageIOBase.h
> ITK-3.20.0/Code/IO/itkImageIOBase.h 

4c4
<   Module:    $RCSfile: itkImageIOBase.h,v $
---
>   Module:    itkImageIOBase.h
6,7c6,7
<   Date:      $Date: 2009-11-29 15:51:11 $
<   Version:   $Revision: 1.56 $
---
>   Date:      $Date$
>   Version:   $Revision$
95c95
<                  ULONG,LONG, FLOAT,DOUBLE, CSHORT, CINT, CFLOAT, CDOUBLE} IOComponentType;
---
>                  ULONG,LONG, FLOAT,DOUBLE} IOComponentType;

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkImageIOFactory.cxx
> ITK-3.20.0/Code/IO/itkImageIOFactory.cxx 

4c4
<   Module:    $RCSfile: itkImageIOFactory.cxx,v $
---
>   Module:    itkImageIOFactory.cxx
6,7c6,7
<   Date:      $Date: 2010-07-10 04:05:39 $
<   Version:   $Revision: 1.38 $
---
>   Date:      $Date$
>   Version:   $Revision$
22,35c22,35
< //#include "itkBioRadImageIOFactory.h"
< //#include "itkBMPImageIOFactory.h"
< //#include "itkGDCMImageIOFactory.h"
< //#include "itkDICOMImageIO2Factory.h"
< //#include "itkNiftiImageIOFactory.h"
< //#include "itkAnalyzeImageIOFactory.h"
< //#include "itkNiftiImageIOFactory.h"
< //#include "itkGiplImageIOFactory.h"
< //#include "itkJPEGImageIOFactory.h"
< //#include "itkLSMImageIOFactory.h"
< //#include "itkMetaImageIOFactory.h"
< //#include "itkPNGImageIOFactory.h"
< //#include "itkNrrdImageIOFactory.h"
< //#include "itkTIFFImageIOFactory.h"
---
> #include "itkBioRadImageIOFactory.h"
> #include "itkBMPImageIOFactory.h"
> #include "itkGDCMImageIOFactory.h"
> #include "itkDICOMImageIO2Factory.h"
> #include "itkNiftiImageIOFactory.h"
> #include "itkAnalyzeImageIOFactory.h"
> #include "itkNiftiImageIOFactory.h"
> #include "itkGiplImageIOFactory.h"
> #include "itkJPEGImageIOFactory.h"
> #include "itkLSMImageIOFactory.h"
> #include "itkMetaImageIOFactory.h"
> #include "itkPNGImageIOFactory.h"
> #include "itkNrrdImageIOFactory.h"
> #include "itkTIFFImageIOFactory.h"
37c37
< //#include "itkStimulateImageIOFactory.h"
---
> #include "itkStimulateImageIOFactory.h"
102,105c102,105
< //      ObjectFactoryBase::RegisterFactory( BioRadImageIOFactory::New() ); //should be before GDCM
< //      ObjectFactoryBase::RegisterFactory( GDCMImageIOFactory::New() );
< //      ObjectFactoryBase::RegisterFactory( MetaImageIOFactory::New() );
< //      ObjectFactoryBase::RegisterFactory( PNGImageIOFactory::New() );
---
>       ObjectFactoryBase::RegisterFactory( BioRadImageIOFactory::New() ); //should be before GDCM
>       ObjectFactoryBase::RegisterFactory( GDCMImageIOFactory::New() );
>       ObjectFactoryBase::RegisterFactory( MetaImageIOFactory::New() );
>       ObjectFactoryBase::RegisterFactory( PNGImageIOFactory::New() );
107,108c107,108
< //      ObjectFactoryBase::RegisterFactory( GiplImageIOFactory::New() );
< //      ObjectFactoryBase::RegisterFactory( LSMImageIOFactory::New()); //should be before TIFF
---
>       ObjectFactoryBase::RegisterFactory( GiplImageIOFactory::New() );
>       ObjectFactoryBase::RegisterFactory( LSMImageIOFactory::New()); //should be before TIFF
115,122c115,122
< //      ObjectFactoryBase::RegisterFactory( AnalyzeImageIOFactory::New());
< //      ObjectFactoryBase::RegisterFactory( NiftiImageIOFactory::New());
< //      ObjectFactoryBase::RegisterFactory( StimulateImageIOFactory::New());
< //      ObjectFactoryBase::RegisterFactory( JPEGImageIOFactory::New());
< //      ObjectFactoryBase::RegisterFactory( TIFFImageIOFactory::New());
< //      ObjectFactoryBase::RegisterFactory( NrrdImageIOFactory::New() );
< //      ObjectFactoryBase::RegisterFactory( BMPImageIOFactory::New() );
< //      ObjectFactoryBase::RegisterFactory( DICOMImageIO2Factory::New() );
---
>       ObjectFactoryBase::RegisterFactory( AnalyzeImageIOFactory::New());
>       ObjectFactoryBase::RegisterFactory( NiftiImageIOFactory::New());
>       ObjectFactoryBase::RegisterFactory( StimulateImageIOFactory::New());
>       ObjectFactoryBase::RegisterFactory( JPEGImageIOFactory::New());
>       ObjectFactoryBase::RegisterFactory( TIFFImageIOFactory::New());
>       ObjectFactoryBase::RegisterFactory( NrrdImageIOFactory::New() );
>       ObjectFactoryBase::RegisterFactory( BMPImageIOFactory::New() );
>       ObjectFactoryBase::RegisterFactory( DICOMImageIO2Factory::New() );

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkImageIORegion.h
> ITK-3.20.0/Code/IO/itkImageIORegion.h 

4c4
<   Module:    $RCSfile: itkImageIORegion.h,v $
---
>   Module:    itkImageIORegion.h
6,7c6,7
<   Date:      $Date: 2009-07-12 10:52:54 $
<   Version:   $Revision: 1.25 $
---
>   Date:      $Date$
>   Version:   $Revision$
20d19
< #include <cstddef>

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkTransformFileReader.cxx
> ITK-3.20.0/Code/IO/itkTransformFileReader.cxx 

4c4
<   Module:    $RCSfile: itkTransformFileReader.cxx,v $
---
>   Module:    itkTransformFileReader.cxx
6,7c6,7
<   Date:      $Date: 2010-02-08 20:23:21 $
<   Version:   $Revision: 1.26 $
---
>   Date:      $Date$
>   Version:   $Revision$
24d23
< #include <itksys/ios/fstream>

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkTransformFileReader.h
> ITK-3.20.0/Code/IO/itkTransformFileReader.h 

4c4
<   Module:    $RCSfile: itkTransformFileReader.h,v $
---
>   Module:    itkTransformFileReader.h
6,7c6,7
<   Date:      $Date: 2009-01-16 11:37:58 $
<   Version:   $Revision: 1.8 $
---
>   Date:      $Date$
>   Version:   $Revision$
29a30
> #include "metaTransform.h"

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkTransformFileWriter.cxx
> ITK-3.20.0/Code/IO/itkTransformFileWriter.cxx 

4c4
<   Module:    $RCSfile: itkTransformFileWriter.cxx,v $
---
>   Module:    itkTransformFileWriter.cxx
6,7c6,7
<   Date:      $Date: 2007-08-09 15:15:39 $
<   Version:   $Revision: 1.13 $
---
>   Date:      $Date$
>   Version:   $Revision$
21d20
< #include <itksys/ios/fstream>

=======================================================================

< OTB/Utilities/ITK/Code/IO/itkTransformFileWriter.h
> ITK-3.20.0/Code/IO/itkTransformFileWriter.h 

4c4
<   Module:    $RCSfile: itkTransformFileWriter.h,v $
---
>   Module:    itkTransformFileWriter.h
6,7c6,7
<   Date:      $Date: 2009-04-25 12:25:45 $
<   Version:   $Revision: 1.10 $
---
>   Date:      $Date$
>   Version:   $Revision$
30a31
> #include "metaTransform.h"

=======================================================================

< OTB/Utilities/ITK/Code/Numerics/Statistics/Code/Numerics/Statistics/itkGreyLevelCooccurrenceMatrixTextureCoefficientsCalculator.txx
> ITK-3.20.0/Code/Numerics/Statistics/Code/Numerics/Statistics/itkGreyLevelCooccurrenceMatrixTextureCoefficientsCalculator.txx 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Numerics/Statistics/Code/Numerics/Statistics/itkGreyLevelCooccurrenceMatrixTextureCoefficientsCalculator.txx: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Numerics/Statistics/Code/Numerics/Statistics/itkGreyLevelCooccurrenceMatrixTextureCoefficientsCalculator.txx: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx
> ITK-3.20.0/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx 

4c4
<   Module:    $RCSfile: itkWeightedCentroidKdTreeGenerator.txx,v $
---
>   Module:    itkWeightedCentroidKdTreeGenerator.txx
6,7c6,7
<   Date:      $Date: 2009-03-04 19:29:54 $
<   Version:   $Revision: 1.11 $
---
>   Date:      $Date$
>   Version:   $Revision$
120c120
<   KdTreeNodeType* left = this->GenerateTreeLoop(beginLeftIndex, endLeftIndex, lowerBound, upperBound, level + 1);
---
>   KdTreeNodeType* left = GenerateTreeLoop(beginLeftIndex, endLeftIndex, lowerBound, upperBound, level + 1);
126c126
<   KdTreeNodeType* right = this->GenerateTreeLoop(beginRightIndex, endRighIndex, lowerBound, upperBound, level + 1);
---
>   KdTreeNodeType* right = GenerateTreeLoop(beginRightIndex, endRighIndex, lowerBound, upperBound, level + 1);

=======================================================================

< OTB/Utilities/ITK/Code/Review/Statistics/itkBinaryImageToLabelMapFilter.h
> ITK-3.20.0/Code/Review/Statistics/itkBinaryImageToLabelMapFilter.h 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Review/Statistics/itkBinaryImageToLabelMapFilter.h: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Review/Statistics/itkBinaryImageToLabelMapFilter.h: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Code/Review/Statistics/itkBSplineScatteredDataPointSetToImageFilter.txx
> ITK-3.20.0/Code/Review/Statistics/itkBSplineScatteredDataPointSetToImageFilter.txx 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Review/Statistics/itkBSplineScatteredDataPointSetToImageFilter.txx: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Review/Statistics/itkBSplineScatteredDataPointSetToImageFilter.txx: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Code/Review/Statistics/itkMovingHistogramImageFilter.txx
> ITK-3.20.0/Code/Review/Statistics/itkMovingHistogramImageFilter.txx 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Review/Statistics/itkMovingHistogramImageFilter.txx: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Review/Statistics/itkMovingHistogramImageFilter.txx: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Code/Review/Statistics/itkMRCImageIO.h
> ITK-3.20.0/Code/Review/Statistics/itkMRCImageIO.h 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Review/Statistics/itkMRCImageIO.h: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Review/Statistics/itkMRCImageIO.h: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Code/Review/Statistics/itkOptBSplineInterpolateImageFunction.txx
> ITK-3.20.0/Code/Review/Statistics/itkOptBSplineInterpolateImageFunction.txx 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Review/Statistics/itkOptBSplineInterpolateImageFunction.txx: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Review/Statistics/itkOptBSplineInterpolateImageFunction.txx: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Code/Review/Statistics/itkOptLinearInterpolateImageFunction.txx
> ITK-3.20.0/Code/Review/Statistics/itkOptLinearInterpolateImageFunction.txx 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Review/Statistics/itkOptLinearInterpolateImageFunction.txx: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Review/Statistics/itkOptLinearInterpolateImageFunction.txx: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Code/Review/Statistics/itkOptResampleImageFilter.h
> ITK-3.20.0/Code/Review/Statistics/itkOptResampleImageFilter.h 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Review/Statistics/itkOptResampleImageFilter.h: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Review/Statistics/itkOptResampleImageFilter.h: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Code/Review/Statistics/itkOptResampleImageFilter.txx
> ITK-3.20.0/Code/Review/Statistics/itkOptResampleImageFilter.txx 

/usr/bin/diff: /home/jmichel/Projets/src/OTB/Utilities/ITK/Code/Review/Statistics/itkOptResampleImageFilter.txx: Aucun fichier ou dossier de ce type
/usr/bin/diff: /home/jmichel/Projets/src/ITK/Code/Review/Statistics/itkOptResampleImageFilter.txx: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Utilities/gdcm/gdcmConfigure.h.in
> ITK-3.20.0/Utilities/gdcm/gdcmConfigure.h.in 

4c4
<   Module:    $RCSfile: gdcmConfigure.h.in,v $
---
>   Module:    gdcmConfigure.h.in
6,7c6,7
<   Date:      $Date: 2008-05-19 06:58:31 $
<   Version:   $Revision: 1.14 $
---
>   Date:      $Date$
>   Version:   $Revision$
93,95d92
< 
< // OTB path: fixing redefinition warning
< #ifndef OPJ_STATIC
97,98d93
< #endif
< 

=======================================================================

< OTB/Utilities/ITK/Utilities/gdcm/src/gdcmCommon.h
> ITK-3.20.0/Utilities/gdcm/src/gdcmCommon.h 

4c4
<   Module:    $RCSfile: gdcmCommon.h,v $
---
>   Module:    gdcmCommon.h
6,7c6,7
<   Date:      $Date: 2008-05-14 12:32:41 $
<   Version:   $Revision: 1.28 $
---
>   Date:      $Date$
>   Version:   $Revision$
61,62d60
< namespace gdcm
< {
69d66
< }

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/config/cmake/config/vxl_platform_tests.cxx
> ITK-3.20.0/Utilities/vxl/config/cmake/config/vxl_platform_tests.cxx 

1042,1045d1041
< // These declarations conflict unless the sizes match.
< extern int (*verify_size)[sizeof(THE_TYPE) * CHAR_BIT];
< extern int (*verify_size)[THE_SIZE];
< 
1048c1044
<   return 0;
---
>   return sizeof(THE_TYPE) * CHAR_BIT == THE_SIZE ? 0 : 1;
1130,1147d1125
< 
< //-------------------------------------
< #ifdef VXL_HAS_WIN_WCHAR_T
< 
< #ifdef _WCHAR_T_DEFINED
< #include <wchar.h>
< int main()
< {
<   wchar_t buf [10];
<   buf[0] = L'1';
<   buf[1] = L'\0';
<   return 0;
< }
< #else
<   int main() { return 1; }
< #endif
< 
< #endif

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/caxpy.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/caxpy.c 

51c51,53
<     if ((r__1 = ca->r, dabs(r__1)) + (r__2 = r_imag(ca), dabs(r__2)) == 0.f) {
---
>     r__1 = ca->r;
>     r__2 = (real)(r_imag(ca));
>     if ( dabs(r__1) + dabs(r__2) == (real)0.) {

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/dgemm.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/dgemm.c 

33c33
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/dgemv.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/dgemv.c 

30c30
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/dlamch.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/dlamch.c 

84c84
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/dtrmm.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/dtrmm.c 

31c31
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/dtrmv.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/dtrmv.c 

29c29
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/dtrsv.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/dtrsv.c 

29c29
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/sgemv.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/sgemv.c 

30c30
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/slamch.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/slamch.c 

84c84
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/zgemm.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/zgemm.c 

38c38
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/zgemv.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/zgemv.c 

35c35
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/ztrmm.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/ztrmm.c 

36c36
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/blas/ztrmv.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/blas/ztrmv.c 

33c33
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zgebak.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zgebak.c 

30c30
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zgebal.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zgebal.c 

39c39
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zgeev.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zgeev.c 

54c54
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zhseqr.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zhseqr.c 

62c62
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlacpy.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlacpy.c 

28c28
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlange.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlange.c 

36c36
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlanhs.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlanhs.c 

36c36
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlarf.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlarf.c 

34c34
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlarfb.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlarfb.c 

40c40
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlarft.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlarft.c 

35c35
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlarfx.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlarfx.c 

55c55
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlascl.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlascl.c 

32c32
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlaset.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlaset.c 

28c28
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/zlatrs.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/zlatrs.c 

49c49
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/complex16/ztrevc.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/complex16/ztrevc.c 

47c47
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dgecon.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dgecon.c 

37c37
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dggbak.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dggbak.c 

31c31
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dggbal.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dggbal.c 

56c56
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dgges.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dgges.c 

50c50
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dgghrd.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dgghrd.c 

42c42
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dhgeqz.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dhgeqz.c 

66c66
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlacpy.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlacpy.c 

27c27
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlange.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlange.c 

36c36
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlanhs.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlanhs.c 

36c36
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlarf.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlarf.c 

37c37
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlarfb.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlarfb.c 

40c40
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlarft.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlarft.c 

35c35
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlascl.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlascl.c 

31c31
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlaset.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlaset.c 

27c27
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dlatrs.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dlatrs.c 

44c44
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dorm2r.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dorm2r.c 

38c38
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dormqr.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dormqr.c 

45c45
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dormr2.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dormr2.c 

34c34
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dspr.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dspr.c 

28c28
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dsptrf.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dsptrf.c 

45c45
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dsptrs.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dsptrs.c 

44c44
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dtgsy2.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dtgsy2.c 

55c55
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/double/dtgsyl.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/double/dtgsyl.c 

53c53
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/sggsvd.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/sggsvd.c 

23c23
< /* Subroutine */ int sggsvd_(const char *jobu, const char *jobv, const char *jobq, integer *m, 
---
> /* Subroutine */ int sggsvd_(char *jobu, char *jobv, char *jobq, integer *m, 
41c41
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);
51c51
<             const char *, const char *, const char *, integer *, integer *, integer *, integer *
---
>             char *, char *, char *, integer *, integer *, integer *, integer *
55c55
<             sggsvp_(const char *, const char *, const char *, integer *, integer *, integer *, 
---
>             sggsvp_(char *, char *, char *, integer *, integer *, integer *, 

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/sggsvd.h
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/sggsvd.h 

2,4c2,4
<   const char *jobu,
<   const char *jobv,
<   const char *jobq,
---
>   char *jobu,
>   char *jobv,
>   char *jobq,

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/sggsvp.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/sggsvp.c 

24c24
< /* Subroutine */ int sggsvp_(const char *jobu, const char *jobv, const char *jobq, integer *m, 
---
> /* Subroutine */ int sggsvp_(char *jobu, char *jobv, char *jobq, integer *m, 
38c38
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/sggsvp.h
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/sggsvp.h 

2,4c2,4
<   const char *jobu,
<   const char *jobv,
<   const char *jobq,
---
>   char *jobu,
>   char *jobv,
>   char *jobq,

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/slacpy.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/slacpy.c 

27c27
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/slange.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/slange.c 

36c36
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/slarf.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/slarf.c 

36c36
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/slaset.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/slaset.c 

27c27
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/sorm2r.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/sorm2r.c 

34c34
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/sormr2.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/sormr2.c 

30c30
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/stgsja.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/stgsja.c 

26c26
< /* Subroutine */ int stgsja_(const char *jobu, const char *jobv, const char *jobq, integer *m, 
---
> /* Subroutine */ int stgsja_(char *jobu, char *jobv, char *jobq, integer *m, 
44c44
<     extern logical lsame_(const char *, const char *, ftnlen, ftnlen);
---
>     extern logical lsame_(char *, char *, ftnlen, ftnlen);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/single/stgsja.h
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/single/stgsja.h 

2,4c2,4
<   const char *jobu,
<   const char *jobv,
<   const char *jobq,
---
>   char *jobu,
>   char *jobv,
>   char *jobq,

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/util/ilaenv.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/util/ilaenv.c 

209c209
<             *(unsigned char *)subnam = (unsigned char) (ic - 32);
---
>             *(unsigned char *)subnam = (char) (ic - 32);
216c216
<                     *(unsigned char *)&subnam[i__ - 1] = (unsigned char) (ic - 32);
---
>                     *(unsigned char *)&subnam[i__ - 1] = (char) (ic - 32);
233c233
<             *(unsigned char *)subnam = (unsigned char) (ic + 64);
---
>             *(unsigned char *)subnam = (char) (ic + 64);
241c241
<                     *(unsigned char *)&subnam[i__ - 1] = (unsigned char) (ic + 64);
---
>                     *(unsigned char *)&subnam[i__ - 1] = (char) (ic + 64);
257c257
<             *(unsigned char *)subnam = (unsigned char) (ic - 32);
---
>             *(unsigned char *)subnam = (char) (ic - 32);
264c264
<                     *(unsigned char *)&subnam[i__ - 1] = (unsigned char) (ic - 32);
---
>                     *(unsigned char *)&subnam[i__ - 1] = (char) (ic - 32);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/util/lsame.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/util/lsame.c 

19c19
< logical lsame_(const char *ca, const char *cb, ftnlen ca_len, ftnlen cb_len)
---
> logical lsame_(char *ca, char *cb, ftnlen ca_len, ftnlen cb_len)

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/lapack/util/lsame.h
> ITK-3.20.0/Utilities/vxl/v3p/netlib/lapack/util/lsame.h 

2,3c2,3
<   const char *ca,
<   const char *cb,
---
>   char *ca,
>   char *cb,

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/libf2c/arithchk.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/libf2c/arithchk.c 

214d213
<                 fclose(f);
218d216
<         fclose(f);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/libf2c/sig_die.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/libf2c/sig_die.c 

16c16
< void sig_die(s, killsignal) register char *s; int killsignal;
---
> void sig_die(s, kill) register char *s; int kill;
26c26
< void sig_die(register char *s, int killsignal)
---
> void sig_die(register char *s, int kill)
32c32
<         if(killsignal)
---
>         if(kill)

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/linalg/lsqrBase.cxx
> ITK-3.20.0/Utilities/vxl/v3p/netlib/linalg/lsqrBase.cxx 

2,17c2,15
<  *
<  *  Copyright Insight Software Consortium
<  *
<  *  Licensed under the Apache License, Version 2.0 (the "License");
<  *  you may not use this file except in compliance with the License.
<  *  You may obtain a copy of the License at
<  *
<  *         http://www.apache.org/licenses/LICENSE-2.0.txt
<  *
<  *  Unless required by applicable law or agreed to in writing, software
<  *  distributed under the License is distributed on an "AS IS" BASIS,
<  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<  *  See the License for the specific language governing permissions and
<  *  limitations under the License.
<  *
<  *=========================================================================*/
---
> 
>   Program:   Insight Segmentation & Registration Toolkit
>   Language:  C++
>   Date:      $Date$
>   Version:   $Revision$
> 
>   Copyright (c) Insight Software Consortium. All rights reserved.
>   See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
> 
>      This software is distributed WITHOUT ANY WARRANTY; without even 
>      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
>      PURPOSE.  See the above copyright notices for more information.
> 
> =========================================================================*/
145c143
< double
---
> double 
152c150
< double
---
> double 
236c234
< 
---
>   
266c264
<     if ( x[i] != 0.0 )
---
>     if ( x[i] != 0.0 ) 
271c269
<       if ( magnitudeOfLargestElement < absxi )
---
>       if ( magnitudeOfLargestElement < absxi ) 
293c291
< /**
---
> /** 
308,310c306,308
<     (*this->nout) << this->damp << ", " << this->wantse << std::endl;
<     (*this->nout) << this->atol << ", " << this->conlim << std::endl;
<     (*this->nout) << this->btol << ", " << this->itnlim << std::endl;
---
>     (*this->nout) << this->damp << ", " << this->wantse << std::endl; 
>     (*this->nout) << this->atol << ", " << this->conlim << std::endl; 
>     (*this->nout) << this->btol << ", " << this->itnlim << std::endl; 
317c315
< 
---
>   
390c388
< 
---
>   
399c397
< 
---
>   
443c441
<     this->itn++;
---
>     this->itn++; 
515c513
<     if ( this->wantse )
---
>     if ( this->wantse ) 
677c675
<     } while ( istop == 0);
---
>     } while ( istop == 0); 

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/linalg/lsqrBase.h
> ITK-3.20.0/Utilities/vxl/v3p/netlib/linalg/lsqrBase.h 

2,17d1
<  *
<  *  Copyright Insight Software Consortium
<  *
<  *  Licensed under the Apache License, Version 2.0 (the "License");
<  *  you may not use this file except in compliance with the License.
<  *  You may obtain a copy of the License at
<  *
<  *         http://www.apache.org/licenses/LICENSE-2.0.txt
<  *
<  *  Unless required by applicable law or agreed to in writing, software
<  *  distributed under the License is distributed on an "AS IS" BASIS,
<  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<  *  See the License for the specific language governing permissions and
<  *  limitations under the License.
<  *
<  *=========================================================================*/
18a3,15
>   Program:   Insight Segmentation & Registration Toolkit
>   Language:  C++
>   Date:      $Date$
>   Version:   $Revision$
> 
>   Copyright (c) Insight Software Consortium. All rights reserved.
>   See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
> 
>      This software is distributed WITHOUT ANY WARRANTY; without even 
>      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
>      PURPOSE.  See the above copyright notices for more information.
> 
> =========================================================================*/
30c27
<  *
---
>  *  
32c29
<  *
---
>  *  
35c32
<  *
---
>  *  
39c36
<  *
---
>  *  
44c41
<  *
---
>  *  
47c44
<  *
---
>  *  
53c50
<  *
---
>  *  
58c55
<  *
---
>  *  
63c60
<  *
---
>  *  
67c64
<  *
---
>  *  
78c75
<  *
---
>  *   
82c79
<  *
---
>  *  
84c81
< class lsqrBase
---
> class lsqrBase 
106c103
< 
---
>   
118c115
< 
---
>   
123c120
< 
---
>  
131c128
<    * error estimates, via the method SetStandardErrorEstimates()
---
>    * error estimates, via the method SetStandardErrorEstimates() 
141,142c138,139
<   /** An estimate of the relative error in the data
<    *  defining the rhs b.  For example, if b is
---
>   /** An estimate of the relative error in the data 
>    *  defining the rhs b.  For example, if b is     
185c182
<    *   the norm of x and reduce the number of
---
>    *   the norm of x and reduce the number of 
187c184
<    *
---
>    * 
202c199
<   /**
---
>   /** 
208c205
<   /** Provide the array where the standard error estimates will be stored.
---
>   /** Provide the array where the standard error estimates will be stored. 
214c211
<   /**
---
>   /** 
216c213
<    *
---
>    * 
219c216
<    *
---
>    * 
223c220
<    *
---
>    * 
228c225
<    *
---
>    * 
232c229
<    *
---
>    * 
236c233
<    *
---
>    * 
247c244
<   /**
---
>   /** 
260c257
<   /**
---
>   /** 
294c291
<    *
---
>    * 
338c335
< #endif
---
> #endif 

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/napack/cg.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/napack/cg.c 

120c120
<     doublereal p, q, r__, s, v=0, w=0, y[54], z__[54], a8,
---
>     doublereal p, q, r__, s, v=0, w=0, y[50], z__[50], a8,
137c137
< /*<       REAL*8 H(N,1),X(1),Y(54),Z(54),A1,A2,A3,A4,A5,A6,A7,A8,A,B,C,C0,C1 >*/
---
> /*<       REAL*8 H(N,1),X(1),Y(50),Z(50),A1,A2,A3,A4,A5,A6,A7,A8,A,B,C,C0,C1 >*/
1119,1126c1119
<     if(error_code)
<       {
<       *error_code = 4;
<       }
<     else
<       {
<       printf("UNABLE TO SATISFY ARMIJO CONDITION\n");
<       }
---
>     printf("UNABLE TO SATISFY ARMIJO CONDITION\n");

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/opt/lbfgs.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/opt/lbfgs.c 

1450c1450
<     doublereal p, q, r__, s, sgnd, stpc, stpf, stpq, gammavalue, theta;
---
>     doublereal p, q, r__, s, sgnd, stpc, stpf, stpq, gamma, theta;
1551c1551
<         gammavalue = s * sqrt(d__1 * d__1 - *dx / s * (*dp / s));
---
>         gamma = s * sqrt(d__1 * d__1 - *dx / s * (*dp / s));
1554c1554
<             gammavalue = -gammavalue;
---
>             gamma = -gamma;
1557c1557
<         p = gammavalue - *dx + theta;
---
>         p = gamma - *dx + theta;
1559c1559
<         q = gammavalue - *dx + gammavalue + *dp;
---
>         q = gamma - *dx + gamma + *dp;
1602c1602
<         gammavalue = s * sqrt(d__1 * d__1 - *dx / s * (*dp / s));
---
>         gamma = s * sqrt(d__1 * d__1 - *dx / s * (*dp / s));
1605c1605
<             gammavalue = -gammavalue;
---
>             gamma = -gamma;
1608c1608
<         p = gammavalue - *dp + theta;
---
>         p = gamma - *dp + theta;
1610c1610
<         q = gammavalue - *dp + gammavalue + *dx;
---
>         q = gamma - *dp + gamma + *dx;
1662c1662
<         gammavalue = s * sqrt((max(d__1,d__2)));
---
>         gamma = s * sqrt((max(d__1,d__2)));
1665c1665
<             gammavalue = -gammavalue;
---
>             gamma = -gamma;
1668c1668
<         p = gammavalue - *dp + theta;
---
>         p = gamma - *dp + theta;
1670c1670
<         q = gammavalue + (*dx - *dp) + gammavalue;
---
>         q = gamma + (*dx - *dp) + gamma;
1674c1674
<         if (r__ < (float)0. && gammavalue != (float)0.) {
---
>         if (r__ < (float)0. && gamma != (float)0.) {
1741c1741
<             gammavalue = s * sqrt(d__1 * d__1 - *dy / s * (*dp / s));
---
>             gamma = s * sqrt(d__1 * d__1 - *dy / s * (*dp / s));
1744c1744
<                 gammavalue = -gammavalue;
---
>                 gamma = -gamma;
1747c1747
<             p = gammavalue - *dp + theta;
---
>             p = gamma - *dp + theta;
1749c1749
<             q = gammavalue - *dp + gammavalue + *dy;
---
>             q = gamma - *dp + gamma + *dy;

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/opt/lbfgsb.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/opt/lbfgsb.c 

951c951
<     s_copy(task, "FG_START", (ftnlen)60, (ftnlen)(8+1));
---
>     s_copy(task, "FG_START", (ftnlen)60, (ftnlen)8);
988c988
<                 ftnlen)60, (ftnlen)(48 + 1));
---
>                 ftnlen)60, (ftnlen)48);
1241c1241
<                     ftnlen)(30+1));
---
>                     ftnlen)30);
1276c1276
<             s_copy(task, "RESTART_FROM_LNSRCH", (ftnlen)60, (ftnlen)(19+1));
---
>             s_copy(task, "RESTART_FROM_LNSRCH", (ftnlen)60, (ftnlen)19);
1318c1318
<                 ftnlen)60, (ftnlen)(48+1));
---
>                 ftnlen)60, (ftnlen)48);
1332c1332
<                 ftnlen)60, (ftnlen)(47+1));
---
>                 ftnlen)60, (ftnlen)47);
2833c2833
<         s_copy(task, "ERROR: N .LE. 0", (ftnlen)60, (ftnlen)(15+1));
---
>         s_copy(task, "ERROR: N .LE. 0", (ftnlen)60, (ftnlen)15);
2837c2837
<         s_copy(task, "ERROR: M .LE. 0", (ftnlen)60, (ftnlen)(15+1));
---
>         s_copy(task, "ERROR: M .LE. 0", (ftnlen)60, (ftnlen)15);
2841c2841
<         s_copy(task, "ERROR: FACTR .LT. 0", (ftnlen)60, (ftnlen)(19+1));
---
>         s_copy(task, "ERROR: FACTR .LT. 0", (ftnlen)60, (ftnlen)19);
2851c2851
<             s_copy(task, "ERROR: INVALID NBD", (ftnlen)60, (ftnlen)(18+1));
---
>             s_copy(task, "ERROR: INVALID NBD", (ftnlen)60, (ftnlen)18);
2865c2865
<                         ftnlen)(27+1));
---
>                         ftnlen)27);
4014c4014
<     s_copy(csave, "START", (ftnlen)60, (ftnlen)(5+1));
---
>     s_copy(csave, "START", (ftnlen)60, (ftnlen)5);
4044c4044
<         s_copy(task, "FG_LNSRCH", (ftnlen)60, (ftnlen)(9+1));
---
>         s_copy(task, "FG_LNSRCH", (ftnlen)60, (ftnlen)9);
4070c4070
<         s_copy(task, "NEW_X", (ftnlen)60, (ftnlen)(5+1));
---
>         s_copy(task, "NEW_X", (ftnlen)60, (ftnlen)5);
5530c5530
<             s_copy(task, "ERROR: STP .LT. STPMIN", task_len, (ftnlen)(22+1));
---
>             s_copy(task, "ERROR: STP .LT. STPMIN", task_len, (ftnlen)22);
5534c5534
<             s_copy(task, "ERROR: STP .GT. STPMAX", task_len, (ftnlen)(22+1));
---
>             s_copy(task, "ERROR: STP .GT. STPMAX", task_len, (ftnlen)22);
5538c5538
<             s_copy(task, "ERROR: INITIAL G .GE. ZERO", task_len, (ftnlen)(26+1));
---
>             s_copy(task, "ERROR: INITIAL G .GE. ZERO", task_len, (ftnlen)26);
5542c5542
<             s_copy(task, "ERROR: FTOL .LT. ZERO", task_len, (ftnlen)(21+1));
---
>             s_copy(task, "ERROR: FTOL .LT. ZERO", task_len, (ftnlen)21);
5546c5546
<             s_copy(task, "ERROR: GTOL .LT. ZERO", task_len, (ftnlen)(21+1));
---
>             s_copy(task, "ERROR: GTOL .LT. ZERO", task_len, (ftnlen)21);
5550c5550
<             s_copy(task, "ERROR: XTOL .LT. ZERO", task_len, (ftnlen)(21+1));
---
>             s_copy(task, "ERROR: XTOL .LT. ZERO", task_len, (ftnlen)21);
5554c5554
<             s_copy(task, "ERROR: STPMIN .LT. ZERO", task_len, (ftnlen)(23+1));
---
>             s_copy(task, "ERROR: STPMIN .LT. ZERO", task_len, (ftnlen)23);
5558c5558
<             s_copy(task, "ERROR: STPMAX .LT. STPMIN", task_len, (ftnlen)(25+1));
---
>             s_copy(task, "ERROR: STPMAX .LT. STPMIN", task_len, (ftnlen)25);
5603c5603
<         s_copy(task, "FG", task_len, (ftnlen)(2+1));
---
>         s_copy(task, "FG", task_len, (ftnlen)2);
5661c5661
<                 ftnlen)(41+1));
---
>                 ftnlen)41);
5665c5665
<         s_copy(task, "WARNING: XTOL TEST SATISFIED", task_len, (ftnlen)(28+1));
---
>         s_copy(task, "WARNING: XTOL TEST SATISFIED", task_len, (ftnlen)28);
5669c5669
<         s_copy(task, "WARNING: STP = STPMAX", task_len, (ftnlen)(21+1));
---
>         s_copy(task, "WARNING: STP = STPMAX", task_len, (ftnlen)21);
5673c5673
<         s_copy(task, "WARNING: STP = STPMIN", task_len, (ftnlen)(21+1));
---
>         s_copy(task, "WARNING: STP = STPMIN", task_len, (ftnlen)21);
5678c5678
<         s_copy(task, "CONVERGENCE", task_len, (ftnlen)(11+1));
---
>         s_copy(task, "CONVERGENCE", task_len, (ftnlen)11);
5767c5767
<     s_copy(task, "FG", task_len, (ftnlen)(2+1));
---
>     s_copy(task, "FG", task_len, (ftnlen)2);
5827c5827
<     doublereal p, q, r__, s, sgnd, stpc, stpf, stpq, gammavalue, theta;
---
>     doublereal p, q, r__, s, sgnd, stpc, stpf, stpq, gamma, theta;
5925c5925
< /*<       double precision gammavalue,p,q,r,s,sgnd,stpc,stpf,stpq,theta >*/
---
> /*<       double precision gamma,p,q,r,s,sgnd,stpc,stpf,stpq,theta >*/
5941c5941
< /*<          gammavalue = s*sqrt((theta/s)**2 - (dx/s)*(dp/s)) >*/
---
> /*<          gamma = s*sqrt((theta/s)**2 - (dx/s)*(dp/s)) >*/
5944,5945c5944,5945
<         gammavalue = s * sqrt(d__1 * d__1 - *dx / s * (*dp / s));
< /*<          if (stp .lt. stx) gammavalue = -gammavalue >*/
---
>         gamma = s * sqrt(d__1 * d__1 - *dx / s * (*dp / s));
> /*<          if (stp .lt. stx) gamma = -gamma >*/
5947c5947
<             gammavalue = -gammavalue;
---
>             gamma = -gamma;
5949,5952c5949,5952
< /*<          p = (gammavalue - dx) + theta >*/
<         p = gammavalue - *dx + theta;
< /*<          q = ((gammavalue - dx) + gammavalue) + dp >*/
<         q = gammavalue - *dx + gammavalue + *dp;
---
> /*<          p = (gamma - dx) + theta >*/
>         p = gamma - *dx + theta;
> /*<          q = ((gamma - dx) + gamma) + dp >*/
>         q = gamma - *dx + gamma + *dp;
5986c5986
< /*<          gammavalue = s*sqrt((theta/s)**2 - (dx/s)*(dp/s)) >*/
---
> /*<          gamma = s*sqrt((theta/s)**2 - (dx/s)*(dp/s)) >*/
5989,5990c5989,5990
<         gammavalue = s * sqrt(d__1 * d__1 - *dx / s * (*dp / s));
< /*<          if (stp .gt. stx) gammavalue = -gammavalue >*/
---
>         gamma = s * sqrt(d__1 * d__1 - *dx / s * (*dp / s));
> /*<          if (stp .gt. stx) gamma = -gamma >*/
5992c5992
<             gammavalue = -gammavalue;
---
>             gamma = -gamma;
5994,5997c5994,5997
< /*<          p = (gammavalue - dp) + theta >*/
<         p = gammavalue - *dp + theta;
< /*<          q = ((gammavalue - dp) + gammavalue) + dx >*/
<         q = gammavalue - *dp + gammavalue + *dx;
---
> /*<          p = (gamma - dp) + theta >*/
>         p = gamma - *dp + theta;
> /*<          q = ((gamma - dp) + gamma) + dx >*/
>         q = gamma - *dp + gamma + *dx;
6032c6032
< /*        The case gammavalue = 0 only arises if the cubic does not tend */
---
> /*        The case gamma = 0 only arises if the cubic does not tend */
6034c6034
< /*<          gammavalue = s*sqrt(max(zero,(theta/s)**2-(dx/s)*(dp/s))) >*/
---
> /*<          gamma = s*sqrt(max(zero,(theta/s)**2-(dx/s)*(dp/s))) >*/
6039,6040c6039,6040
<         gammavalue = s * sqrt((max(d__1,d__2)));
< /*<          if (stp .gt. stx) gammavalue = -gammavalue >*/
---
>         gamma = s * sqrt((max(d__1,d__2)));
> /*<          if (stp .gt. stx) gamma = -gamma >*/
6042c6042
<             gammavalue = -gammavalue;
---
>             gamma = -gamma;
6044,6047c6044,6047
< /*<          p = (gammavalue - dp) + theta >*/
<         p = gammavalue - *dp + theta;
< /*<          q = (gammavalue + (dx - dp)) + gammavalue >*/
<         q = gammavalue + (*dx - *dp) + gammavalue;
---
> /*<          p = (gamma - dp) + theta >*/
>         p = gamma - *dp + theta;
> /*<          q = (gamma + (dx - dp)) + gamma >*/
>         q = gamma + (*dx - *dp) + gamma;
6050,6051c6050,6051
< /*<          if (r .lt. zero .and. gammavalue .ne. zero) then >*/
<         if (r__ < 0. && gammavalue != 0.) {
---
> /*<          if (r .lt. zero .and. gamma .ne. zero) then >*/
>         if (r__ < 0. && gamma != 0.) {
6133c6133
< /*<             gammavalue = s*sqrt((theta/s)**2 - (dy/s)*(dp/s)) >*/
---
> /*<             gamma = s*sqrt((theta/s)**2 - (dy/s)*(dp/s)) >*/
6136,6137c6136,6137
<             gammavalue = s * sqrt(d__1 * d__1 - *dy / s * (*dp / s));
< /*<             if (stp .gt. sty) gammavalue = -gammavalue >*/
---
>             gamma = s * sqrt(d__1 * d__1 - *dy / s * (*dp / s));
> /*<             if (stp .gt. sty) gamma = -gamma >*/
6139c6139
<                 gammavalue = -gammavalue;
---
>                 gamma = -gamma;
6141,6144c6141,6144
< /*<             p = (gammavalue - dp) + theta >*/
<             p = gammavalue - *dp + theta;
< /*<             q = ((gammavalue - dp) + gammavalue) + dy >*/
<             q = gammavalue - *dp + gammavalue + *dy;
---
> /*<             p = (gamma - dp) + theta >*/
>             p = gamma - *dp + theta;
> /*<             q = ((gamma - dp) + gamma) + dy >*/
>             q = gamma - *dp + gamma + *dy;

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/sparse/spFactor.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/sparse/spFactor.c 

1176,1177c1176
<         I = (int)(pMarkowitzProduct - Matrix->MarkowitzProd + 1);
<         // No point leaving in ptrdiff_t since, matrix::size is int
---
>         I = pMarkowitzProduct - Matrix->MarkowitzProd + 1;
1585c1584
<         I = (int)(pMarkowitzProduct - Matrix->MarkowitzProd);
---
>         I = pMarkowitzProduct - Matrix->MarkowitzProd;

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/sparse/spOutput.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/sparse/spOutput.c 

9c9
<  *
---
>  * 
62a63,65
> 
> 
> 
63a67
> �
142c146
< double  Magnitude, SmallestDiag=LARGEST_REAL, SmallestElement=LARGEST_REAL;
---
> double  Magnitude, SmallestDiag, SmallestElement;
158,162d161
<     if ( PrintOrdToIntRowMap == NULL)
<     {
<         Matrix->Error = spNO_MEMORY;
<         return;
<     }
164,167c163,164
<     if ( PrintOrdToIntColMap == NULL)
<     {
<         Matrix->Error = spNO_MEMORY;
<         FREE(PrintOrdToIntRowMap);
---
>     if ( PrintOrdToIntRowMap == NULL OR PrintOrdToIntColMap == NULL)
>     {   Matrix->Error = spNO_MEMORY;
196a194,196
> 
>         SmallestElement = LARGEST_REAL;
>         SmallestDiag = SmallestElement;
198,203c198
<     if (Size == 0)
<     {
<       FREE(PrintOrdToIntColMap);
<       FREE(PrintOrdToIntRowMap);
<       return;
<     }
---
>     if (Size == 0) return;
269c264
<                 while (pElement != NULL AND pElement->Row != Row)
---
>                 while(pElement != NULL AND pElement->Row != Row)
361c356
< /* Added to export the row and column maps to convert the
---
> /* Added to export the row and column maps to convert the 
371c366
< 
---
>   

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/sparse/spUtils.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/sparse/spUtils.c 

200c200
< ElementPtr  pTwin1=0, pTwin2=0;
---
> ElementPtr  pTwin1, pTwin2;

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/temperton/gpfa2f.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/temperton/gpfa2f.c 

165c165
<         ss = 1.f;
---
>         ss = (float)1.;
168c168
<             ss = -1.f;
---
>             ss = (float)-1.;
681c681
<         c1 = 1.f;
---
>         c1 = (float)1.;
684c684
<             c1 = -1.f;
---
>             c1 = (float)-1.;
687c687
<         c2 = sqrt(.5f);
---
>         c2 = sqrt((float).5);
1278c1278
<         ss = 1.f;
---
>         ss = (float)1.;
1281c1281
<             ss = -1.f;
---
>             ss = (float)-1.;

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/temperton/setgpfa.c
> ITK-3.20.0/Utilities/vxl/v3p/netlib/temperton/setgpfa.c 

143c143
<     twopi = asin(1.f) * 4.f;
---
>     twopi = asin((float)1.) * (float)4.;

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/v3p_netlib_mangle.h
> ITK-3.20.0/Utilities/vxl/v3p/netlib/v3p_netlib_mangle.h 

54d53
< #define dgetv0_ v3p_netlib_dgetv0_
71d69
< #define dlae2_ v3p_netlib_dlae2_
85d82
< #define dlanst_ v3p_netlib_dlanst_
93d89
< #define dlarnv_ v3p_netlib_dlarnv_
95d90
< #define dlaruv_ v3p_netlib_dlaruv_
98,99d92
< #define dlasr_ v3p_netlib_dlasr_
< #define dlasrt_ v3p_netlib_dlasrt_
129,132d121
< #define dsaitr_ v3p_netlib_dsaitr_
< #define dsapps_ v3p_netlib_dsapps_
< #define dsaup2_ v3p_netlib_dsaup2_
< #define dsaupd_ v3p_netlib_dsaupd_
134,139d122
< #define dsconv_ v3p_netlib_dsconv_
< #define dseigt_ v3p_netlib_dseigt_
< #define dsesrt_ v3p_netlib_dsesrt_
< #define dseupd_ v3p_netlib_dseupd_
< #define dsgets_ v3p_netlib_dsgets_
< #define dsortr_ v3p_netlib_dsortr_
143,145d125
< #define dstats_ v3p_netlib_dstats_
< #define dsteqr_ v3p_netlib_dsteqr_
< #define dstqrb_ v3p_netlib_dstqrb_
234d213
< #define second_ v3p_netlib_second_
350,379d328
< #define ztgsyl_ v3p_netlib_ztgsyl_
< #define zrot_ v3p_netlib_zrot_
< #define zlatdf_ v3p_netlib_zlatdf_
< #define zlacn2_ v3p_netlib_zlacn2_
< #define ztgsy2_ v3p_netlib_ztgsy2_
< #define ztgexc_ v3p_netlib_ztgexc_
< #define zggbak_ v3p_netlib_zggbak_
< #define zgetc2_ v3p_netlib_zgetc2_
< #define zhgeqz_ v3p_netlib_zhgeqz_
< #define zgges_ v3p_netlib_zgges_
< #define zlaswp_ v3p_netlib_zlaswp_
< #define zdrscl_ v3p_netlib_zdrscl_
< #define zlartg_ v3p_netlib_zlartg_
< #define zggbal_ v3p_netlib_zggbal_
< #define zgeqr2_ v3p_netlib_zgeqr2_
< #define zgecon_ v3p_netlib_zgecon_
< #define zunmqr_ v3p_netlib_zunmqr_
< #define zunm2r_ v3p_netlib_zunm2r_
< #define zgeqrf_ v3p_netlib_zgeqrf_
< #define ztgex2_ v3p_netlib_ztgex2_
< #define zgesc2_ v3p_netlib_zgesc2_
< #define ztgsen_ v3p_netlib_ztgsen_
< #define zgghrd_ v3p_netlib_zgghrd_
< #define zgeru_ v3p_netlib_zgeru_
< #define izmax1_ v3p_netlib_izmax1_
< #define dzsum1_ v3p_netlib_dzsum1_
< #define zgees_ v3p_netlib_zgees_
< #define ztrexc_ v3p_netlib_ztrexc_
< #define ztrsen_ v3p_netlib_ztrsen_
< #define ztrsyl_ v3p_netlib_ztrsyl_

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/v3p_netlib_prototypes.h
> ITK-3.20.0/Utilities/vxl/v3p/netlib/v3p_netlib_prototypes.h 

52d51
< #include "blas/zgeru.h"
115,126d113
< #include "arpack/dgetv0.h"
< #include "arpack/dsaitr.h"
< #include "arpack/dsapps.h"
< #include "arpack/dsaup2.h"
< #include "arpack/dsaupd.h"
< #include "arpack/dsconv.h"
< #include "arpack/dseigt.h"
< #include "arpack/dsesrt.h"
< #include "arpack/dseupd.h"
< #include "arpack/dsgets.h"
< #include "arpack/dsortr.h"
< #include "arpack/dstqrb.h"
132d118
< #include "lapack/complex16/zgges.h"
154,179d139
< #include "lapack/complex16/zdrscl.h"
< #include "lapack/complex16/zgecon.h"
< #include "lapack/complex16/zgeqr2.h"
< #include "lapack/complex16/zgeqrf.h"
< #include "lapack/complex16/zgesc2.h"
< #include "lapack/complex16/zgetc2.h"
< #include "lapack/complex16/zggbak.h"
< #include "lapack/complex16/zggbal.h"
< #include "lapack/complex16/zgghrd.h"
< #include "lapack/complex16/zhgeqz.h"
< #include "lapack/complex16/zlacn2.h"
< #include "lapack/complex16/zlartg.h"
< #include "lapack/complex16/zlaswp.h"
< #include "lapack/complex16/zlatdf.h"
< #include "lapack/complex16/zrot.h"
< #include "lapack/complex16/ztgex2.h"
< #include "lapack/complex16/ztgexc.h"
< #include "lapack/complex16/ztgsen.h"
< #include "lapack/complex16/ztgsy2.h"
< #include "lapack/complex16/ztgsyl.h"
< #include "lapack/complex16/zunm2r.h"
< #include "lapack/complex16/zunmqr.h"
< #include "lapack/complex16/zgees.h"
< #include "lapack/complex16/ztrsen.h"
< #include "lapack/complex16/ztrexc.h"
< #include "lapack/complex16/ztrsyl.h"
195,196d154
< #include "lapack/double/dlae2.h"
< #include "lapack/double/dlaev2.h"
201d158
< #include "lapack/double/dlanst.h"
208d164
< #include "lapack/double/dlarnv.h"
210d165
< #include "lapack/double/dlaruv.h"
213,214d167
< #include "lapack/double/dlasr.h"
< #include "lapack/double/dlasrt.h"
219a173
> #include "lapack/double/dlaev2.h"
230d183
< #include "lapack/double/dsteqr.h"
236d188
< #include "lapack/double/dzsum1.h"
262d213
< #include "lapack/util/izmax1.h"

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/v3p/netlib/v3p_netlib_unmangle.h
> ITK-3.20.0/Utilities/vxl/v3p/netlib/v3p_netlib_unmangle.h 

1c1
< /* This header undefines mangled names defined by v3p_
---
> /* This header undefines mangled names defined by v3p_netlib_mangle.h.
45d44
< #undef dgetv0_
62d60
< #undef dlae2_
76d73
< #undef dlanst_
84d80
< #undef dlarnv_
86d81
< #undef dlaruv_
89,90d83
< #undef dlasr_
< #undef dlasrt_
120,123d112
< #undef dsaitr_
< #undef dsapps_
< #undef dsaup2_
< #undef dsaupd_
125,130d113
< #undef dsconv_
< #undef dseigt_
< #undef dsesrt_
< #undef dseupd_
< #undef dsgets_
< #undef dsortr_
134,136d116
< #undef dstats_
< #undef dsteqr_
< #undef dstqrb_
225d204
< #undef second_
341,370d319
< #undef ztgsyl_
< #undef zrot_
< #undef zlatdf_
< #undef zlacn2_
< #undef ztgsy2_
< #undef ztgexc_
< #undef zggbak_
< #undef zgetc2_
< #undef zhgeqz_
< #undef zgges_
< #undef zlaswp_
< #undef zdrscl_
< #undef zlartg_
< #undef zggbal_
< #undef zgeqr2_
< #undef zgecon_
< #undef zunmqr_
< #undef zunm2r_
< #undef zgeqrf_
< #undef ztgex2_
< #undef zgesc2_
< #undef ztgsen_
< #undef zgghrd_
< #undef zgeru_
< #undef izmax1_
< #undef dzsum1_
< #undef zgees_
< #undef ztrexc_
< #undef ztrsen_
< #undef ztrsyl_

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/config.stlport.win32-vc60/vcl_config_compiler.h
> ITK-3.20.0/Utilities/vxl/vcl/config.stlport.win32-vc60/vcl_config_compiler.h 

515c515
< #define VCL_DEFAULT_TMPL_ARG(arg)
---
> #define VCL_DEFAULT_TMPL_ARG(arg) 
604c604
< // Set to true if there is a numeric_limits and it reports having a floating point infinity.
---
> // Set to true if there is a numeric_limits and it reports having an floating point infinity.

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/config.win32/vc60/vcl_config_compiler.h
> ITK-3.20.0/Utilities/vxl/vcl/config.win32/vc60/vcl_config_compiler.h 

521c521
< #define VCL_DEFAULT_TMPL_ARG(arg)
---
> #define VCL_DEFAULT_TMPL_ARG(arg) 
613c613
< // Set to true if there is a numeric_limits and it reports having a floating point infinity.
---
> // Set to true if there is a numeric_limits and it reports having an floating point infinity.

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/config.win32/vc70/vcl_config_compiler.h
> ITK-3.20.0/Utilities/vxl/vcl/config.win32/vc70/vcl_config_compiler.h 

522c522
< #define VCL_DEFAULT_TMPL_ARG(arg)
---
> #define VCL_DEFAULT_TMPL_ARG(arg) 
614c614
< // Set to true if there is a numeric_limits and it reports having a floating point infinity.
---
> // Set to true if there is a numeric_limits and it reports having an floating point infinity.

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/emulation/vcl_algobase.h
> ITK-3.20.0/Utilities/vxl/vcl/emulation/vcl_algobase.h 

212,213c212,213
<                                                    InputIterator last,
<                                                    ForwardIterator result)
---
>                                                InputIterator last,
>                                                ForwardIterator result)
237c237
<                        const T& x)
---
>                    const T& x)
259c259
<                                                      const T& x)
---
>                                                  const T& x)
364c364
<                                OutputIterator result)
---
>                            OutputIterator result)
372,373c372,373
<                                                      BidirectionalIterator1 last,
<                                                      BidirectionalIterator2 result)
---
>                                      BidirectionalIterator1 last,
>                                      BidirectionalIterator2 result)
400,401c400,401
<                                                                   InputIterator1 last1,
<                                                                   InputIterator2 first2)
---
>                                               InputIterator1 last1,
>                                               InputIterator2 first2)
410,412c410,412
<                                                                   InputIterator1 last1,
<                                                                   InputIterator2 first2,
<                                                                   BinaryPredicate binary_pred)
---
>                                               InputIterator1 last1,
>                                               InputIterator2 first2,
>                                               BinaryPredicate binary_pred)
421c421
<                            InputIterator2 first2)
---
>                   InputIterator2 first2)
432c432
<                            InputIterator2 first2, BinaryPredicate binary_pred)
---
>                   InputIterator2 first2, BinaryPredicate binary_pred)
444c444
<                             InputIterator2 first2, InputIterator2 last2)
---
>                         InputIterator2 first2, InputIterator2 last2)
459,460c459,460
<                             InputIterator2 first2, InputIterator2 last2,
<                             Compare comp)
---
>                         InputIterator2 first2, InputIterator2 last2,
>                         Compare comp)
474c474
<                             unsigned char* first2, unsigned char* last2)
---
>                         unsigned char* first2, unsigned char* last2)
485c485
<                                         char* first2, char* last2)
---
>                                     char* first2, char* last2)
491c491
<                                      (signed char*) first2, (signed char*) last2);
---
>                                  (signed char*) first2, (signed char*) last2);
494,496c494,496
<                                      (unsigned char*) last1,
<                                      (unsigned char*) first2,
<                                      (unsigned char*) last2);
---
>                                  (unsigned char*) last1,
>                                  (unsigned char*) first2,
>                                  (unsigned char*) last2);

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/emulation/vcl_hashtable.h
> ITK-3.20.0/Utilities/vxl/vcl/emulation/vcl_hashtable.h 

109d108
< 
113d111
< 
117d114
< 
121d117
< 
125d120
< 
129d123
< 
133d126
< 
137d129
< 
227c219
< // fbp: try to avoid instances in every module
---
> // fbp: try to avoid intances in every module
435,436c427,428
<            cur1 = cur1->next, cur2 = cur2->next)
<       {}
---
>             cur1 = cur1->next, cur2 = cur2->next)
>         {}
448c440
<   { return VCL_prime_list[VCL_num_primes - 1]; }
---
>     { return VCL_prime_list[VCL_num_primes - 1]; }

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/emulation/vcl_iterator.h
> ITK-3.20.0/Utilities/vxl/vcl/emulation/vcl_iterator.h 

541c541
<            ! x.end_marker && ! y.end_marker;
---
>         x.end_marker == false && y.end_marker == false;

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/emulation/vcl_tempbuf.h
> ITK-3.20.0/Utilities/vxl/vcl/emulation/vcl_tempbuf.h 

58,59c58
< vcl_pair<T*, vcl_ptrdiff_t> get_temporary_buffer(vcl_ptrdiff_t len, T*)
< {
---
> vcl_pair<T*, vcl_ptrdiff_t> get_temporary_buffer(vcl_ptrdiff_t len, T*) {
74,75c73
< inline void return_temporary_buffer(T* p)
< {
---
> inline void return_temporary_buffer(T* p) {
87c85
<  public:
---
> public:
111c109
<     // reflects change in initialized area
---
>     // reflects change in initalized area
113c111
<  protected:
---
> protected:

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/generic/blah
> ITK-3.20.0/Utilities/vxl/vcl/generic/blah 

37d36
< memory_tr1

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/generic/blah_tr1
> ITK-3.20.0/Utilities/vxl/vcl/generic/blah_tr1 

/usr/bin/diff: /home/jmichel/Projets/src/ITK/Utilities/vxl/vcl/generic/blah_tr1: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/generic/vcl_memory_tr1.h
> ITK-3.20.0/Utilities/vxl/vcl/generic/vcl_memory_tr1.h 

/usr/bin/diff: /home/jmichel/Projets/src/ITK/Utilities/vxl/vcl/generic/vcl_memory_tr1.h: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/iso/vcl_memory_tr1.h
> ITK-3.20.0/Utilities/vxl/vcl/iso/vcl_memory_tr1.h 

/usr/bin/diff: /home/jmichel/Projets/src/ITK/Utilities/vxl/vcl/iso/vcl_memory_tr1.h: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/win32-vc70/vcl_cstdlib.h
> ITK-3.20.0/Utilities/vxl/vcl/win32-vc70/vcl_cstdlib.h 

15c15
< inline long long vcl_abs(long long x) {return _abs64(x); }
---
> 

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/win32-vc8/ ALL
> ITK-3.20.0/Utilities/vxl/vcl/win32-vc8/ ALL 

/usr/bin/diff: opérande supplémentaire «/home/jmichel/Projets/src/ITK/Utilities/vxl/vcl/win32-vc8/»
/usr/bin/diff: Pour en savoir davantage, utilisez: « /usr/bin/diff --help ».

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_cassert.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_cassert.h 

22a23,31
> // Win32 doesn't work as you can't set a bp on abort
> #ifdef _WIN32
> #undef assert
> #ifdef NDEBUG
> # define assert(x) ((void) 0)
> #else
> extern void vcl_cassert_failure(char const *, int, char const *);
> # define assert(x) do { if (!(x)) vcl_cassert_failure(__FILE__, __LINE__, #x); } while (false)
> #endif
24,36c33
< // Only redefine the macro with MSVC 6.0
< #ifdef VCL_VC_6
< # undef assert
< # ifdef NDEBUG
< #  define assert(x) ((void) 0)
< # else
<    extern void vcl_cassert_failure(char const *, int, char const *);
< #  define assert(x) do { if (!(x)) vcl_cassert_failure(__FILE__, __LINE__, #x); } while (false)
< # endif 
< 
< #else   // For all other compilers, include the standard C/CXX header
< 
< # ifdef VCL_METRO_WERKS
---
> #ifdef VCL_METRO_WERKS
38,40c35,37
< #  include <vcl_cstdio.h>
< #  include <vcl_cstdlib.h>
< # endif
---
> # include <vcl_cstdio.h>
> # include <vcl_cstdlib.h>
> #endif
42,46c39,44
< # if !VCL_CXX_HAS_HEADER_CASSERT
< #  include <assert.h>
< # else
< #  include "iso/vcl_cassert.h"
< # endif
---
> #else
> #if !VCL_CXX_HAS_HEADER_CASSERT
> # include <assert.h>
> #else
> # include "iso/vcl_cassert.h"
> #endif

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_atomic_count.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_atomic_count.h 

/usr/bin/diff: /home/jmichel/Projets/src/ITK/Utilities/vxl/vcl/vcl_atomic_count.h: Aucun fichier ou dossier de ce type

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_cmath.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_cmath.h 

48c48
< #elif defined(VCL_VC_60)
---
> #elif defined(VCL_VC60)
51c51
< #elif defined(VCL_VC_70)     // C++ .NET earlier than 2003 is not iso compliant
---
> #elif defined(VCL_VC70)     // C++ .NET earlier than 2003 is not iso compliant
53,54d52
< #elif defined(VCL_VC_8) || defined(VCL_VC_9)     // C++ .NET earlier than 2003 is not iso compliant
< # include "win32-vc8/vcl_cmath.h"

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_compiler.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_compiler.h 

9c9
< //
---
> 
63,69d62
< #if defined(__FreeBSD__)
< # define VCL_FREEBSD
< # ifndef _GLIBCXX_USE_C99
< #  define _GLIBCXX_USE_C99 1
< # endif
< #endif
< 
141,147c134,137
< 
< // In future use VCL_VC_13_1 for 13.1, etc.
< #  if _MSC_VER >= 1600     // Visual Studio 2010 = Version 10.x
< #   define VCL_VC_10
< #  elif _MSC_VER >= 1500     // Visual Studio 2008 = Version 9.x
< #   define VCL_VC_9
< #  elif _MSC_VER >= 1400   // .NET 2005 = Version 8.x
---
> #  if _MSC_VER >= 1400     // .NET 2005 = Version 8.x
> #   ifndef _CRT_SECURE_NO_DEPRECATE
> #    define _CRT_SECURE_NO_DEPRECATE 1
> #   endif
149c139,142
< #   define VCL_VC80 1      // (deprecated)
---
> #   if _MSC_VER >= 1400
> #    define VCL_VC_80 1    // version 8.0
> #    define VCL_VC80       // (deprecated)
> #   endif
198,204d190
< 
< // Disable warnings about C standard library functions.
< #  if _MSC_VER >= 1400   // .NET 2005 = Version 8.x
< #   ifndef _CRT_SECURE_NO_DEPRECATE
< #    define _CRT_SECURE_NO_DEPRECATE 1
< #   endif
< #  endif
211,214d196
< #if defined(__CYGWIN__) // Cygwin GCC Compiler
< # define VCL_CYGWIN_GCC
< #endif
< 
276c258
<    //-------------------- template instantiation ------------------------------
---
> //-------------------- template instantiation
299c281
<    //--------------------------------------------------------------------------
---
> //--------------------------------------------------------------------------------
324c306
<    // -------------------- handy macros ---------------------------------------
---
> // -------------------- handy macros

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_complex.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_complex.h 

29c29
< #elif defined(VCL_VC_6)
---
> #elif defined(VCL_VC60)
33c33
< #elif defined(VCL_VC_70)
---
> #elif defined(VCL_VC70)
35,38d34
< 
< // ---------- Visual Studio 8 and 9
< #elif defined(VCL_VC_8) || defined(VCL_VC_9)
< # include "win32-vc8/vcl_complex.h"

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_config_manual.h.in
> ITK-3.20.0/Utilities/vxl/vcl/vcl_config_manual.h.in 

13,18d12
< // Whether new additions to the C++0x standard are available
< // and where they are found
< #define VCL_INCLUDE_CXX_0X @VCL_INCLUDE_CXX_0X@
< #define VCL_MEMORY_HAS_SHARED_PTR @VCL_MEMORY_HAS_SHARED_PTR@
< #define VCL_TR1_MEMORY_HAS_SHARED_PTR @VCL_TR1_MEMORY_HAS_SHARED_PTR@
< 
31,34d24
< 
< //: VCL_USE_ATOMIC_COUNT
< // Whether to use the atomic_count implemenation in vcl.
< #define VCL_USE_ATOMIC_COUNT @VCL_USE_ATOMIC_COUNT@

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_cstdio.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_cstdio.h 

20,23d19
< #elif defined(VCL_CYGWIN_GCC)
< # define vcl_snprintf snprintf
< # include "vcl_cstddef.h" // for size_t
< # include "iso/vcl_cstdio.h"
32c28
< #elif defined(VCL_VC_7)|| defined(VCL_VC_8)|| defined(VCL_VC_9) || defined(VCL_VC_10)
---
> #elif defined(VCL_VC_70) || defined(VCL_VC_71)|| defined(VCL_VC_80)

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_cstdlib.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_cstdlib.h 

24c24
< #elif defined(VCL_VC_6)
---
> #elif defined(VCL_VC60)
26c26
< #elif defined(VCL_VC_71) // C++ .NET 2003 is iso compliant
---
> #elif defined(VCL_VC71) // C++ .NET 2003 is iso compliant
28c28
< #elif defined(VCL_VC_70) // C++ .NET earlier than 2003 is not iso compliant
---
> #elif defined(VCL_VC70) // C++ .NET earlier than 2003 is not iso compliant
30,31d29
< #elif defined(VCL_VC_8) || defined(VCL_VC_9) // need to handle abs(__int64) correctly
< # include "win32-vc8/vcl_cstdlib.h"

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_iostream.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_iostream.h 

4c4
< //:
---
> //: 
27c27,28
< #include "vcl_iosfwd.h" // Include this to ensure the two are consistent.
---
> // Include this to ensure the two are consistent.
> #include "vcl_iosfwd.h"
31c32
< // headers. Thus in conditional logic, the compilers that
---
> // headers. Thus in conditional logic, the compilers that 
33c34
< // special cases, and the #else arm should contain the
---
> // special cases, and the #else arm should contain the 
35c36
< //
---
> 
40c41
< //
---
> 
50c51
<    // -------------------- miscellaneous fixes which can go at the end: -------
---
> // -------------------- miscellaneous fixes which can go at the end:
52c53
< // Need std::ios::nocreate to avoid creating an empty file on
---
> // Need std::ios::nocreate to avoid creating an empty file on 

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_memory.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_memory.h 

14,20d13
< 
< # if VCL_INCLUDE_CXX_0X
< // This is where C++0x emulation goes when available
< ****Error: shared_ptr emulation not available****
< // #include "emulation/vcl_shared_ptr.h"
< # endif // VCL_INCLUDE_CXX_0X
< 
28d20
< 
30,43c22
< 
< # if VCL_INCLUDE_CXX_0X
< #  if VCL_MEMORY_HAS_SHARED_PTR
< #   include "iso/vcl_memory_tr1.h"
< #  elif VCL_TR1_MEMORY_HAS_SHARED_PTR
< #   include "tr1/vcl_memory.h"
< #  else
< // This is where C++0x emulation goes when available
< ****Error: shared_ptr emulation not available****
< // #include "emulation/vcl_shared_ptr.h"
< #  endif // VCL_MEMORY_HAS_SHARED_PTR
< # endif // VCL_INCLUDE_CXX_0X
< 
< #endif // !VCL_USE_NATIVE_STL
---
> #endif

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_valarray.h
> ITK-3.20.0/Utilities/vxl/vcl/vcl_valarray.h 

13c13
< #elif defined(VCL_VC_6)
---
> #elif defined(VCL_VC60)
16c16
< #elif defined(VCL_VC_70)
---
> #elif defined(VCL_VC70)
18,20d17
< 
< #elif defined(VCL_VC_8) || defined(VCL_VC_9)
< # include "win32-vc8/vcl_valarray.h"

=======================================================================

< OTB/Utilities/ITK/Utilities/vxl/vcl/vcl_where_root_dir.h.in
> ITK-3.20.0/Utilities/vxl/vcl/vcl_where_root_dir.h.in 

13,14d12
< #ifndef __vcl_where_root_dir_h_
< #define __vcl_where_root_dir_h_
18d15
< #endif // __vcl_where_root_dir_h_

=======================================================================