MRG

CMake/ImportExpat.cmake

@@ -25,8 +25,8 @@ IF(OTB_USE_EXTERNAL_EXPAT)
     MESSAGE(STATUS "  Expat library  : ${EXPAT_LIBRARY}")
 ELSE(OTB_USE_EXTERNAL_EXPAT)
     ADD_DEFINITIONS(-DOTB_USE_INTERNAL_EXPAT)
-    #INCLUDE_DIRECTORIES(BEFORE "${OTB_SOURCE_DIR}/Utilities/otbexpat")
-    #INCLUDE_DIRECTORIES(BEFORE "${OTB_BINARY_DIR}/Utilities/otbexpat")
+    INCLUDE_DIRECTORIES(BEFORE "${OTB_SOURCE_DIR}/Utilities/otbexpat")
+    INCLUDE_DIRECTORIES(BEFORE "${OTB_BINARY_DIR}/Utilities/otbexpat")
     IF(NOT BUILD_SHARED_LIBS)
       ADD_DEFINITIONS(-DXML_STATIC)
     ENDIF(NOT BUILD_SHARED_LIBS)

Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h

@@ -107,9 +107,10 @@ public:
   template <class TInputImage>
   void AddImage(TInputImage * image)
   {
-    typedef TInputImage                      InputImageType;
-    typedef Image<ValueType, 2>              ImageType;
-
+    typedef TInputImage                                   InputImageType;
+    typedef typename InputImageType::InternalPixelType    InternalPixelType;
+    typedef Image<InternalPixelType, 2>                   ImageType;
+   
     //Mono-Channel Factories
     typedef LocalHistogramIFFactory<ImageType,
       CoordRepType, TPrecision>               LocalHistogramIFFactoryType;

Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.txx

@@ -88,7 +88,6 @@ SarRadiometricCalibrationToImageFilter<TInputImage, TOutputImage>
   {
       imageMetadataInterface->GetRadiometricCalibrationIncidenceAngle()->GetPoint(i, &point);
       imageMetadataInterface->GetRadiometricCalibrationIncidenceAngle()->GetPointData(i, &pointValue);
-      std::cout << pointValue << " / "<<point<<std::endl;
   }
   incidenceAngle->SetPolynomalSize(imageMetadataInterface->GetRadiometricCalibrationIncidenceAnglePolynomialDegree());