diff --git a/CMakeLists.txt b/CMakeLists.txt index 34f32004cf9932b09cc834a6c846c2e897e1e2cb..71cb27c21398a1d51c3c5a649da7ac50d7d502c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -277,7 +277,7 @@ IF(OTB_COMPILE_JPEG2000) ENDIF(OTB_COMPILE_JPEG2000) #----------------------------------------------------------------------------- -# Option for OpenThreads (necessary because used by the new version of OSSIM library +# Option for OpenThreads (necessary because used by the new version of OSSIM library) # Find OpenThread library IF(EXISTS "${CMAKE_ROOT}/Modules/FindOpenThreads.cmake") FIND_PACKAGE(OpenThreads) @@ -508,9 +508,14 @@ ENDIF(OTB_USE_PQXX) #------------------------------- # Boost Library #------------------------------- +SET (Boost_MINOR_VERSION 0) FIND_PACKAGE(Boost) IF(Boost_FOUND) - OPTION(OTB_USE_EXTERNAL_BOOST "Use an outside build of Boost." ON) + IF(NOT ${Boost_MINOR_VERSION} EQUAL 40) + OPTION(OTB_USE_EXTERNAL_BOOST "Use an outside build of Boost." ON) + ELSE(NOT ${Boost_MINOR_VERSION} EQUAL 40) + OPTION(OTB_USE_EXTERNAL_BOOST "Use an outside build of Boost." OFF) + ENDIF(NOT ${Boost_MINOR_VERSION} EQUAL 40) ELSE(Boost_FOUND) OPTION(OTB_USE_EXTERNAL_BOOST "Use an outside build of Boost." OFF) ENDIF(Boost_FOUND) diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h index 4c81568e018f7114319e5b171d29713f8421709d..fb3e49a8e8d76d0bb7034dc43f4fe0804bc1fd97 100644 --- a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h +++ b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h @@ -72,7 +72,7 @@ public: typedef typename Superclass::InputImagePixelType InputImagePixelType; typedef typename InputImageType::PixelType PixelType; - typedef typename PixelType::ValueType ValueType; + typedef typename InputImageType::InternalPixelType ValueType; typedef typename InputImageType::SizeType SizeType; typedef typename InputImageType::RegionType RegionType; @@ -81,6 +81,7 @@ public: itkStaticConstMacro(OutputImageDimension, unsigned int, OutputImageType::ImageDimension); /** Get the Radius (all to 1) */ + itkSetMacro(Radius, SizeType); itkGetConstReferenceMacro(Radius, SizeType); /** Fix the whisker */ diff --git a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h index 860182735d06aca15995007a6f045eddca078dd4..24b610bbef218dcda6b517bb9bc47ca457dc2fd4 100644 --- a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h +++ b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h @@ -81,13 +81,28 @@ public: typedef typename FunctionType::OutputType FunctionValueType; typedef typename FunctionType::InputType FunctionPositionType; - itkGetObjectMacro(Function, FunctionType); +// itkGetObjectMacro(Function, FunctionType); + + /** Set the internal spatial function. */ + void SetFunction(FunctionPointerType function) + { + m_Function = function; + this->Modified(); + } + FunctionPointerType GetFunction() + { + return m_Function; + } + + /** Image dimensions */ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension); + + /** Accessors */ itkGetMacro(Radius, InputImageSizeType); void SetRadius(InputImageSizeType& rad) diff --git a/Code/BasicFilters/otbStreamingMinMaxImageFilter.h b/Code/BasicFilters/otbStreamingMinMaxImageFilter.h index 4cbe75c264f5b9d22c0f0cfd16b82ae8056397f8..60120be19280e631620e707a85da6b2672d739bb 100644 --- a/Code/BasicFilters/otbStreamingMinMaxImageFilter.h +++ b/Code/BasicFilters/otbStreamingMinMaxImageFilter.h @@ -195,6 +195,10 @@ public: { this->GetFilter()->SetInput(input); } + const InputImageType * GetInput() + { + return this->GetFilter()->GetInput(); + } /** Return the computed Minimum. */ PixelType GetMinimum() const @@ -203,11 +207,11 @@ public: } PixelObjectType* GetMinimumOutput() { - return this->GetFilter()->MinimumOutput(); + return this->GetFilter()->GetMinimumOutput(); } const PixelObjectType* GetMinimumOutput() const { - return this->GetFilter()->MinimumOutput(); + return this->GetFilter()->GetMinimumOutput(); } /** Return the computed Maximum. */ PixelType GetMaximum() const diff --git a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h b/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h index f684babd32376ef3c4aed0f09f8bc42c2434311b..6431f3434ab3df7ab4fa9b5fa1a16e6c5b6937dd 100644 --- a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h +++ b/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h @@ -195,11 +195,11 @@ public: typedef typename StatFilterType::PixelObjectType PixelObjectType; typedef typename StatFilterType::MatrixObjectType MatrixObjectType; - void SetInput(TInputImage * input) + void SetInput(InputImageType * input) { this->GetFilter()->SetInput(input); } - TInputImage * GetInput() + const InputImageType * GetInput() { return this->GetFilter()->GetInput(); } @@ -211,11 +211,11 @@ public: } PixelObjectType* GetMinimumOutput() { - return this->GetFilter()->MinimumOutput(); + return this->GetFilter()->GetMinimumOutput(); } const PixelObjectType* GetMinimumOutput() const { - return this->GetFilter()->MinimumOutput(); + return this->GetFilter()->GetMinimumOutput(); } /** Return the computed Maximum. */ @@ -225,11 +225,11 @@ public: } PixelObjectType* GetMaximumOutput() { - return this->GetFilter()->MaximumOutput(); + return this->GetFilter()->GetMaximumOutput(); } const PixelObjectType* GetMaximumOutput() const { - return this->GetFilter()->MaximumOutput(); + return this->GetFilter()->GetMaximumOutput(); } protected: diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.txx b/Code/BasicFilters/otbStreamingResampleImageFilter.txx index 18a3eba2534c09a5246003be6e9189f3b9a5e573..3690fe3706eadd2ff11c32d0198d79a00cbf3906 100644 --- a/Code/BasicFilters/otbStreamingResampleImageFilter.txx +++ b/Code/BasicFilters/otbStreamingResampleImageFilter.txx @@ -106,7 +106,7 @@ StreamingResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecisionTy deformationFieldLargestSize[dim] = static_cast<unsigned int>( vcl_ceil( largestSize[dim]* vcl_abs(this->GetOutputSpacing()[dim] / - this->GetDeformationFieldSpacing()[dim]))) + 1 ; + this->GetDeformationFieldSpacing()[dim]))) + 1; } m_DeformationFilter->SetOutputSize(deformationFieldLargestSize); m_DeformationFilter->SetOutputIndex(this->GetOutputStartIndex()); diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsImageFilter.h index 00b615460feb748cbf845b01ba48342b0cbb8293..223c54cac1d593e8efa315bbd32a0c7916dcf4bf 100644 --- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h +++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.h @@ -230,6 +230,10 @@ public: { this->GetFilter()->SetInput(input); } + const InputImageType * GetInput() + { + return this->GetFilter()->GetInput(); + } /** Return the computed Minimum. */ PixelType GetMinimum() const @@ -238,11 +242,11 @@ public: } PixelObjectType* GetMinimumOutput() { - return this->GetFilter()->MinimumOutput(); + return this->GetFilter()->GetMinimumOutput(); } const PixelObjectType* GetMinimumOutput() const { - return this->GetFilter()->MinimumOutput(); + return this->GetFilter()->GetMinimumOutput(); } /** Return the computed Maximum. */ PixelType GetMaximum() const diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h index db5e25eeaf4ca3cef37e358077f06e63aad65e7c..a860aab4ba6e4f66a68fac82d01957f6a9491521 100644 --- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h +++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h @@ -223,11 +223,11 @@ public: typedef typename StatFilterType::PixelObjectType PixelObjectType; typedef typename StatFilterType::MatrixObjectType MatrixObjectType; - void SetInput(TInputImage * input) + void SetInput(InputImageType * input) { this->GetFilter()->SetInput(input); } - TInputImage * GetInput() + const InputImageType * GetInput() { return this->GetFilter()->GetInput(); } @@ -239,11 +239,11 @@ public: } PixelObjectType* GetMinimumOutput() { - return this->GetFilter()->MinimumOutput(); + return this->GetFilter()->GetMinimumOutput(); } const PixelObjectType* GetMinimumOutput() const { - return this->GetFilter()->MinimumOutput(); + return this->GetFilter()->GetMinimumOutput(); } /** Return the computed Maximum. */ @@ -253,11 +253,11 @@ public: } PixelObjectType* GetMaximumOutput() { - return this->GetFilter()->MaximumOutput(); + return this->GetFilter()->GetMaximumOutput(); } const PixelObjectType* GetMaximumOutput() const { - return this->GetFilter()->MaximumOutput(); + return this->GetFilter()->GetMaximumOutput(); } /** Return the computed Mean. */ diff --git a/Code/Common/otbVectorDataExtractROI.txx b/Code/Common/otbVectorDataExtractROI.txx index 867380a00179217c7785e1c05f00fe28096c0949..9a622b46fbb79f128855ee40cac5b38fdeb52742 100644 --- a/Code/Common/otbVectorDataExtractROI.txx +++ b/Code/Common/otbVectorDataExtractROI.txx @@ -252,7 +252,7 @@ VectorDataExtractROI<TVectorData> // Get the VertexList // -2 cause we don't want the last point // wich is the same as the first one (closed Ring) - for (unsigned int i = 0 ; i<polygon->GetVertexList()->Size() - 2 ; i++ ) + for (unsigned int i = 0; i<polygon->GetVertexList()->Size() - 2; i++ ) { // Get the components of the polygon 2 by 2 VertexType firstVertex; @@ -291,7 +291,7 @@ VectorDataExtractROI<TVectorData> else { // Get the VertexList - for (unsigned int i = 0 ; i<line->GetVertexList()->Size() -1 ; i++ ) + for (unsigned int i = 0; i<line->GetVertexList()->Size() -1; i++ ) { // Get the components of the line 2 by 2 VertexType firstVertex; diff --git a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx index c870dafa3152378b34e99d34e6c023c52775d771..b8ffee670ab7ab0d77c472eeaba28eb9eff728e6 100644 --- a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx +++ b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx @@ -79,7 +79,6 @@ void PostGISCreateTableTransactor::operator ()(pqxx::nontransaction& T) m_Result = T.exec(addGeometryCommand.str()); - /** creation index GIST */ //FIXME not working yet // std::stringstream addGISTIndexCommand; diff --git a/Code/IO/otbCurlHelper.cxx b/Code/IO/otbCurlHelper.cxx index 44609f7f9e3f9efab9f272d555f08f0157884115..cee44309ca094d5c0594f3a6e49b30badf6b8dca 100644 --- a/Code/IO/otbCurlHelper.cxx +++ b/Code/IO/otbCurlHelper.cxx @@ -181,7 +181,7 @@ int CurlHelper::RetrieveFileMulti(const std::vector<std::string>& listURLs, int lStillRunning; while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(multiHandle, &lStillRunning)) - ; + ; // Now get that URL while (lStillRunning) @@ -219,7 +219,7 @@ int CurlHelper::RetrieveFileMulti(const std::vector<std::string>& listURLs, while ( CURLM_CALL_MULTI_PERFORM == curl_multi_perform(multiHandle, &lStillRunning) ) - ; + ; break; } } diff --git a/Code/IO/otbMapFileProductWriter.h b/Code/IO/otbMapFileProductWriter.h index dc8873d693209f174df2a78e3ebf966a7eab55aa..f48650e87f799cbca0caced41d43dbbef456f379 100644 --- a/Code/IO/otbMapFileProductWriter.h +++ b/Code/IO/otbMapFileProductWriter.h @@ -150,9 +150,9 @@ private: /**MapFile IndexTule build*/ virtual void AddBBoxToIndexTile(OutputPointType lowerLeftCorner, - OutputPointType lowerRightCorner, - OutputPointType upperRightCorner, - OutputPointType upperLeftCorner, + OutputPointType lowerRightCorner, + OutputPointType upperRightCorner, + OutputPointType upperLeftCorner, unsigned int x, unsigned int y); /** Method To Generate the mapFile*/ diff --git a/Code/IO/otbMapFileProductWriter.txx b/Code/IO/otbMapFileProductWriter.txx index 965c51976d3d46dba62d772dcac7fdcddd4221de..b7ab41e1fb08a1cb8a56c6e45d262feac43c041a 100644 --- a/Code/IO/otbMapFileProductWriter.txx +++ b/Code/IO/otbMapFileProductWriter.txx @@ -396,8 +396,8 @@ MapFileProductWriter<TInputImage> m_ResampleVectorImage->TransformIndexToPhysicalPoint(indexTile, inputPoint); outputPoint = m_Transform->TransformPoint(inputPoint); OutputPointType upperLeftCorner = outputPoint; - - // Build The indexTile + + // Build The indexTile this->AddBBoxToIndexTile(lowerLeftCorner, lowerRightCorner, upperRightCorner, @@ -527,7 +527,7 @@ MapFileProductWriter<TInputImage> file <<"\tLAYER" << std::endl; file <<"\t\tNAME '"<<tempIndexShapeName.str()<<"'"<< std::endl; - file <<"\t\t\t#GROUP 'earthsat'"<< std::endl; + file <<"\t\t\t#GROUP 'earthsat'"<< std::endl; file <<"\t\t\tTYPE RASTER" << std::endl; file <<"\t\t\tTILEITEM 'LOCATION'" << std::endl; file <<"\t\t\tTILEINDEX \'"<<m_IndexShapeFileName<<"\'" << std::endl; diff --git a/Code/IO/otbOGRIOHelper.txx b/Code/IO/otbOGRIOHelper.txx index 4d071b1d9208344af61a9c247628c72ba7a543c4..c2bb39c3e0785c82217c144d9dd904a61efae73c 100644 --- a/Code/IO/otbOGRIOHelper.txx +++ b/Code/IO/otbOGRIOHelper.txx @@ -626,13 +626,13 @@ unsigned int OGRIOHelper<TVectorData> { // Take into account the fields stored in the // vectordatakeywordlist - for (unsigned int fieldIdx = 0 ; fieldIdx < kwl.GetNumberOfFields(); fieldIdx++) + for (unsigned int fieldIdx = 0; fieldIdx < kwl.GetNumberOfFields(); fieldIdx++) { - if (ogrCurrentLayer->CreateField(kwl.GetNthField(fieldIdx).first) != OGRERR_NONE ) - { - itkExceptionMacro(<< "Failed to create Field "<<kwl.GetNthField(fieldIdx).first->GetNameRef()); - } - } + if (ogrCurrentLayer->CreateField(kwl.GetNthField(fieldIdx).first) != OGRERR_NONE ) + { + itkExceptionMacro(<< "Failed to create Field "<<kwl.GetNthField(fieldIdx).first->GetNameRef()); + } + } } switch (dataNode->GetNodeType()) @@ -674,16 +674,16 @@ unsigned int OGRIOHelper<TVectorData> { OGRFeature *ogrFeature; ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn()); - + // Add the fields to the features - for (unsigned int i = 0 ; i < kwl.GetNumberOfFields(); i++) + for (unsigned int i = 0; i < kwl.GetNumberOfFields(); i++) { // Get the key of the Nth OGRFieldRefn const char * key = kwl.GetNthField(i).first->GetNameRef(); // Edit the value of the field and add it to the current feature ogrFeature->SetField(ogrFeature->GetFieldIndex(key) , kwl.GetFieldAsString(key).c_str()); } - + ogrFeature->SetField("Name", dataNode->GetNodeId()); ogrFeature->SetGeometry(&ogrPoint); @@ -730,14 +730,14 @@ unsigned int OGRIOHelper<TVectorData> ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn()); // Add the fields to the features - for (unsigned int i = 0 ; i < kwl.GetNumberOfFields(); i++) + for (unsigned int i = 0; i < kwl.GetNumberOfFields(); i++) { // Get the key of the Nth OGRFieldRefn const char * key = kwl.GetNthField(i).first->GetNameRef(); // Edit the value of the field and add it to the current feature ogrFeature->SetField(ogrFeature->GetFieldIndex(key) , kwl.GetFieldAsString(key).c_str()); } - + ogrFeature->SetField("Name", dataNode->GetNodeId()); ogrFeature->SetGeometry(&ogrLine); @@ -810,26 +810,26 @@ unsigned int OGRIOHelper<TVectorData> //Save it in the structure if (ogrCollection == NULL) - { + { OGRFeature *ogrFeature; ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn()); - + // Add the fields to the features - for (unsigned int i = 0 ; i < kwl.GetNumberOfFields(); i++) + for (unsigned int i = 0; i < kwl.GetNumberOfFields(); i++) { // Get the key of the Nth OGRFieldRefn const char * key = kwl.GetNthField(i).first->GetNameRef(); // Edit the value of the field and add it to the current feature ogrFeature->SetField(ogrFeature->GetFieldIndex(key) , kwl.GetFieldAsString(key).c_str()); } - + ogrFeature->SetGeometry(ogrPolygon); - + if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE) { itkExceptionMacro(<< "Failed to create feature in shapefile."); } - + OGRFeature::DestroyFeature(ogrFeature); } else diff --git a/Code/Learning/otbSVMMarginSampler.h b/Code/Learning/otbSVMMarginSampler.h index 5b3de783ae91d6fd7f7a715847c84f4962f66fd8..6fba4a013b3a99435420d062892ef6d426fb100e 100644 --- a/Code/Learning/otbSVMMarginSampler.h +++ b/Code/Learning/otbSVMMarginSampler.h @@ -125,4 +125,3 @@ private: - diff --git a/Code/OBIA/otbImageToLabelMapWithAttributesFilter.txx b/Code/OBIA/otbImageToLabelMapWithAttributesFilter.txx index 6fb700933fbf12b0e5103c8025b44320b231b0e3..15f829f7dbcc0ba9f7787ea41aeb020c107068f6 100644 --- a/Code/OBIA/otbImageToLabelMapWithAttributesFilter.txx +++ b/Code/OBIA/otbImageToLabelMapWithAttributesFilter.txx @@ -92,7 +92,6 @@ ImageToLabelMapWithAttributesFilter<TInputImage, TLabeledImage, TOutputLabel, TO } - template <class TInputImage, class TLabeledImage, class TOutputLabel, class TObjectLabel> void ImageToLabelMapWithAttributesFilter<TInputImage, TLabeledImage, TOutputLabel, TObjectLabel> @@ -127,7 +126,6 @@ ImageToLabelMapWithAttributesFilter<TInputImage, TLabeledImage, TOutputLabel, TO } - } #endif diff --git a/Code/Visualization/otbDragFullWindowActionHandler.h b/Code/Visualization/otbDragFullWindowActionHandler.h index 73f1ffbd99cdd99c7e0c1a0471518a57cfd3d79e..d1ed383941d7df1203a7bc1abb2fbc1bf72098b2 100644 --- a/Code/Visualization/otbDragFullWindowActionHandler.h +++ b/Code/Visualization/otbDragFullWindowActionHandler.h @@ -77,36 +77,36 @@ public: { switch (event) { - case FL_PUSH: - { - PointType screenPoint = m_View->GetFullWidget()->GetMousePosition(); - PointType ImagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint); - m_IndexPushed[0] = ImagePoint[0]; - m_IndexPushed[1] = ImagePoint[1]; - return true; - } - case FL_RELEASE: - { - PointType screenPoint = m_View->GetFullWidget()->GetMousePosition(); - PointType ImagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint); - m_IndexReleased[0] = ImagePoint[0]; - m_IndexReleased[1] = ImagePoint[1]; - - // Compute the shift - m_MoveX = -m_IndexReleased[0] + m_IndexPushed[0]; - m_MoveY = -m_IndexReleased[1] + m_IndexPushed[1]; - - // Compute the origin and the size of the visible region - IndexType indexBegin,indexEnd; - indexBegin[0] = static_cast<unsigned int>(m_Model->GetExtractRegion().GetIndex()[0] + m_MoveX); - indexBegin[1] = static_cast<unsigned int>(m_Model->GetExtractRegion().GetIndex()[1] + m_MoveY); - indexEnd[0] = indexBegin[0] + m_Model->GetExtractRegion().GetSize()[0]; - indexEnd[1] = indexBegin[1] + m_Model->GetExtractRegion().GetSize()[1]; - m_Model->SetExtractRegionByIndex(indexBegin, indexEnd); - m_Model->Update(); - return true; - } - } + case FL_PUSH: + { + PointType screenPoint = m_View->GetFullWidget()->GetMousePosition(); + PointType ImagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint); + m_IndexPushed[0] = ImagePoint[0]; + m_IndexPushed[1] = ImagePoint[1]; + return true; + } + case FL_RELEASE: + { + PointType screenPoint = m_View->GetFullWidget()->GetMousePosition(); + PointType ImagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint); + m_IndexReleased[0] = ImagePoint[0]; + m_IndexReleased[1] = ImagePoint[1]; + + // Compute the shift + m_MoveX = -m_IndexReleased[0] + m_IndexPushed[0]; + m_MoveY = -m_IndexReleased[1] + m_IndexPushed[1]; + + // Compute the origin and the size of the visible region + IndexType indexBegin,indexEnd; + indexBegin[0] = static_cast<unsigned int>(m_Model->GetExtractRegion().GetIndex()[0] + m_MoveX); + indexBegin[1] = static_cast<unsigned int>(m_Model->GetExtractRegion().GetIndex()[1] + m_MoveY); + indexEnd[0] = indexBegin[0] + m_Model->GetExtractRegion().GetSize()[0]; + indexEnd[1] = indexBegin[1] + m_Model->GetExtractRegion().GetSize()[1]; + m_Model->SetExtractRegionByIndex(indexBegin, indexEnd); + m_Model->Update(); + return true; + } + } return false; } } diff --git a/Code/Visualization/otbVectorDataActionHandler.h b/Code/Visualization/otbVectorDataActionHandler.h index 24e27442e7701523a01a3640b0e276073ca403f9..2518adc038e917ce5eaec4fdeead693b209f079c 100644 --- a/Code/Visualization/otbVectorDataActionHandler.h +++ b/Code/Visualization/otbVectorDataActionHandler.h @@ -41,11 +41,11 @@ public: /** Method for creation through the object factory */ itkNewMacro(Self) - ; +; /** Runtime information */ itkTypeMacro(VectorDataActionHandler, ImageWidgetActionHandler) - ; +; /** Model typedefs */ typedef TModel ModelType; diff --git a/Code/Visualization/otbVectorDataModel.cxx b/Code/Visualization/otbVectorDataModel.cxx index f40c4e4b2fe6ea4152513c17dea6d65b8ff0e097..07a2472ef0402a45035804e1ead1cd84e06388a4 100644 --- a/Code/Visualization/otbVectorDataModel.cxx +++ b/Code/Visualization/otbVectorDataModel.cxx @@ -259,66 +259,66 @@ VectorDataModel::AddNode( TreeNodeType * node ) { case FEATURE_POINT: { - m_CurrentNodeType = FEATURE_POINT; - PointType point = node->Get()->GetPoint(); - VertexType vertex; - vertex[0] = point[0]; - vertex[1] = point[1]; - this->AddPointToGeometry(vertex, false); + m_CurrentNodeType = FEATURE_POINT; + PointType point = node->Get()->GetPoint(); + VertexType vertex; + vertex[0] = point[0]; + vertex[1] = point[1]; + this->AddPointToGeometry(vertex, false); //Add Other Fields CopyFileds( node ); - this->EndGeometry(false); - break; + this->EndGeometry(false); + break; } case FEATURE_LINE: { - m_CurrentNodeType = FEATURE_LINE; - const LineType * line = node->Get()->GetLine(); - LineType::VertexListType::ConstIterator vIt = line->GetVertexList()->Begin(); - - while (vIt != line->GetVertexList()->End()) - { - PointType point = vIt.Value(); - VertexType vertex; - vertex[0] = point[0]; - vertex[1] = point[1]; - this->AddPointToGeometry(vertex, false); - } + m_CurrentNodeType = FEATURE_LINE; + const LineType * line = node->Get()->GetLine(); + LineType::VertexListType::ConstIterator vIt = line->GetVertexList()->Begin(); + + while (vIt != line->GetVertexList()->End()) + { + PointType point = vIt.Value(); + VertexType vertex; + vertex[0] = point[0]; + vertex[1] = point[1]; + this->AddPointToGeometry(vertex, false); + } //Add Other Fields CopyFileds( node ); - this->EndGeometry(false); - break; + this->EndGeometry(false); + break; } case FEATURE_POLYGON: { - m_CurrentNodeType = FEATURE_POLYGON; + m_CurrentNodeType = FEATURE_POLYGON; const PolygonType * extRing = node->Get()->GetPolygonExteriorRing(); PolygonType::VertexListType::ConstIterator vIt = extRing->GetVertexList()->Begin(); while (vIt != extRing->GetVertexList()->End()) - { - PointType point = vIt.Value(); - VertexType vertex; - vertex[0] = point[0]; - vertex[1] = point[1]; - this->AddPointToGeometry(vertex, false); - vIt++; - } + { + PointType point = vIt.Value(); + VertexType vertex; + vertex[0] = point[0]; + vertex[1] = point[1]; + this->AddPointToGeometry(vertex, false); + vIt++; + } //Add Other Fields CopyFileds( node ); - this->EndGeometry(false); - break; + this->EndGeometry(false); + break; } default: { - // discard - break; + // discard + break; } } diff --git a/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx b/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx index 4ced323b4fdc4f9197984b9b7bd95f2ab63aa5f5..8e76341668b88b718479accdfdd9fb2d31adfb0c 100644 --- a/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx +++ b/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx @@ -218,7 +218,6 @@ int main(int argc, char** argv) - // Software Guide : BeginLatex // // \end{itemize} diff --git a/Examples/FeatureExtraction/ExtractRoadExample.cxx b/Examples/FeatureExtraction/ExtractRoadExample.cxx index aaa5ac9d115d9b587cfa82c3d4320148bf64af8c..6573004b9c744a0687cb2a57605d2d050ff0cd78 100644 --- a/Examples/FeatureExtraction/ExtractRoadExample.cxx +++ b/Examples/FeatureExtraction/ExtractRoadExample.cxx @@ -41,11 +41,9 @@ // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - #include "otbPolyLineParametricPathWithValue.h" #include "otbRoadExtractionFilter.h" #include "otbDrawPathListFilter.h" - // Software Guide : EndCodeSnippet #include "otbImage.h" @@ -85,10 +83,8 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef double InputPixelType; typedef unsigned char OutputPixelType; - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -100,11 +96,9 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef otb::VectorImage<InputPixelType, Dimension> InputVectorImageType; typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::Image<OutputPixelType, Dimension> OutputImageType; - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -117,10 +111,8 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef otb::PolyLineParametricPathWithValue<InputPixelType, Dimension> PathType; - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -131,10 +123,8 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef otb::RoadExtractionFilter<InputVectorImageType, PathType> RoadExtractionFilterType; - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -145,10 +135,8 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef otb::DrawPathListFilter<InputImageType, PathType, InputImageType> DrawPathFilterType; - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -160,10 +148,8 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef itk::RescaleIntensityImageFilter<InputImageType, OutputImageType> RescalerType; - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -175,10 +161,8 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef otb::ImageFileReader<InputVectorImageType> ReaderType; typedef otb::ImageFileWriter<OutputImageType> WriterType; - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -189,14 +173,12 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - ReaderType::Pointer reader = ReaderType::New(); RoadExtractionFilterType::Pointer roadExtractionFilter = RoadExtractionFilterType::New(); DrawPathFilterType::Pointer drawingFilter = DrawPathFilterType::New(); RescalerType::Pointer rescaleFilter = RescalerType::New(); WriterType::Pointer writer = WriterType::New(); - // Software Guide : EndCodeSnippet reader->SetFileName(argv[1]); @@ -211,7 +193,6 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - InputVectorImageType::PixelType ReferencePixel; ReferencePixel.SetSize(4); ReferencePixel.SetElement(0, ::atof(argv[3])); @@ -219,7 +200,6 @@ int main(int argc, char * argv[]) ReferencePixel.SetElement(2, ::atof(argv[5])); ReferencePixel.SetElement(3, ::atof(argv[6])); roadExtractionFilter->SetReferencePixel(ReferencePixel); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -230,9 +210,7 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - roadExtractionFilter->SetAlpha(atof(argv[7])); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -246,9 +224,7 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - roadExtractionFilter->SetAmplitudeThreshold(atof(argv[8])); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -259,9 +235,7 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - roadExtractionFilter->SetTolerance(atof(argv[9])); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -272,10 +246,8 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - roadExtractionFilter->SetMaxAngle(atof(argv[10])); roadExtractionFilter->SetAngularThreshold(atof(argv[10])); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -289,10 +261,8 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - roadExtractionFilter->SetFirstMeanDistanceThreshold(atof(argv[11])); roadExtractionFilter->SetSecondMeanDistanceThreshold(atof(argv[12])); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -304,9 +274,7 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - roadExtractionFilter->SetDistanceThreshold(atof(argv[13])); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -318,13 +286,11 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - reader->GenerateOutputInformation(); InputImageType::Pointer blackBackground = InputImageType::New(); blackBackground->SetRegions(reader->GetOutput()->GetLargestPossibleRegion()); blackBackground->Allocate(); blackBackground->FillBuffer(0); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -362,12 +328,10 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - roadExtractionFilter->SetInput(reader->GetOutput()); drawingFilter->SetInput(blackBackground); drawingFilter->SetInputPath(roadExtractionFilter->GetOutput()); rescaleFilter->SetInput(drawingFilter->GetOutput()); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -378,9 +342,7 @@ int main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - rescaleFilter->Update(); - // Software Guide : EndCodeSnippet // output image enhancement diff --git a/Examples/IO/ImageSeriesIOExample.cxx b/Examples/IO/ImageSeriesIOExample.cxx index 6fc3ae8d80771406f0bc3f5a764573240cdf72a7..3773c4be67a9c25797894e3468bd4686238cdb83 100644 --- a/Examples/IO/ImageSeriesIOExample.cxx +++ b/Examples/IO/ImageSeriesIOExample.cxx @@ -90,7 +90,6 @@ int main(int argc, char** argv) typedef otb::ObjectList<ImageReaderType> ReaderListType; ReaderListType::Pointer readerList = ReaderListType::New(); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -106,7 +105,6 @@ int main(int argc, char** argv) typedef otb::ImageList<InputImageType> ImageListType; ImageListType::Pointer imageList = ImageListType::New(); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -133,7 +131,6 @@ int main(int argc, char** argv) readerList->PushBack(imageReader); } - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -153,7 +150,6 @@ int main(int argc, char** argv) ImageListToVectorImageFilterType::Pointer iL2VI = ImageListToVectorImageFilterType::New(); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -173,7 +169,6 @@ int main(int argc, char** argv) ImageWriterType::Pointer imageWriter = ImageWriterType::New(); imageWriter->SetFileName(argv[1]); - // Software Guide : EndCodeSnippet // Software Guide : BeginLatex @@ -185,7 +180,6 @@ int main(int argc, char** argv) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - unsigned long size = (10000 * 10000 * sizeof(PixelType)) / NbImages; std::cout << "Streaming size: " << size << std::endl; @@ -195,7 +189,6 @@ int main(int argc, char** argv) imageWriter->SetInput(iL2VI->GetOutput()); imageWriter->Update(); - // Software Guide : EndCodeSnippet return EXIT_SUCCESS; diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt index 06a840e2bd01a1a1ff114bb721826e075e217cea..551c69bae8cb357eeb757a357239861970806d3e 100644 --- a/Testing/Code/BasicFilters/CMakeLists.txt +++ b/Testing/Code/BasicFilters/CMakeLists.txt @@ -1064,8 +1064,18 @@ ADD_TEST(bfTvVarianceImageFilter ${BASICFILTERS_TESTS8} # ------ otb::BoxAndWhiskerImageFilter ------------- -ADD_TEST(bfTuBoxAndWhiskerImageFilter ${BASICFILTERS_TESTS8} +ADD_TEST(bfTuBoxAndWhiskerImageFilterNew ${BASICFILTERS_TESTS8} otbBoxAndWhiskerImageFilterNew ) + +ADD_TEST(bfTvBoxAndWhiskerImageFilter ${BASICFILTERS_TESTS8} + --compare-image ${EPSILON_7} + ${BASELINE}/bfBoxAndWhiskerImageFilter_05_05.tif + ${TEMP}/bfBoxAndWhiskerImageFilter_05_05.tif + otbBoxAndWhiskerImageFilter + ${INPUTDATA}/poupees.tif + ${TEMP}/bfBoxAndWhiskerImageFilter_05_05.tif + 05 05) + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbBasicFiltersTests9 ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1460,6 +1470,17 @@ ADD_TEST(bfTvFunctionWithNeighborhoodToImageFilterNew ${BASICFILTERS_TESTS11} otbFunctionWithNeighborhoodToImageFilterNew ) +ADD_TEST(bfTvFunctionWithNeighborhoodToImageFilter ${BASICFILTERS_TESTS11} + --compare-image ${EPSILON_7} + ${BASELINE}/bfTvFunctionWithNeighborhoodToImageFilterTest.tif + ${TEMP}/bfTvFunctionWithNeighborhoodToImageFilterTest.tif + otbFunctionWithNeighborhoodToImageFilter + ${INPUTDATA}/poupees_1canal.hd + ${TEMP}/bfTvFunctionWithNeighborhoodToImageFilterTest.tif + 2 # radius +) + + ADD_TEST(bfTuStreamingInnerProductVectorImageFilterNew ${BASICFILTERS_TESTS11} otbStreamingInnerProductVectorImageFilterNew ) @@ -1896,6 +1917,7 @@ otbAmplitudePhaseToRGBFunctor.cxx otbVarianceImageFilterNew.cxx otbVarianceImageFilter.cxx otbBoxAndWhiskerImageFilterNew.cxx +otbBoxAndWhiskerImageFilter.cxx otbFlexibleDistanceWithMissingValueNew.cxx otbFlexibleDistanceWithMissingValue.cxx ) @@ -1966,6 +1988,7 @@ otbKeyPointDensityImageFilterNew.cxx otbKeyPointDensityImageFilterTest.cxx otbImagePCAShapeModelEstimatorTest.cxx otbFunctionWithNeighborhoodToImageFilterNew.cxx +otbFunctionWithNeighborhoodToImageFilter.cxx otbStreamingInnerProductVectorImageFilterNew.cxx otbStreamingInnerProductVectorImageFilter.cxx otbEstimateInnerProductPCAImageFilterNew.cxx diff --git a/Testing/Code/BasicFilters/otbAmplitudePhaseToRGBFunctorNew.cxx b/Testing/Code/BasicFilters/otbAmplitudePhaseToRGBFunctorNew.cxx index f30c6876485aa1b6582dc307974a80a3fc9b84e8..2fe9f59b9992fb944fd3dd2641956f84b802cd43 100644 --- a/Testing/Code/BasicFilters/otbAmplitudePhaseToRGBFunctorNew.cxx +++ b/Testing/Code/BasicFilters/otbAmplitudePhaseToRGBFunctorNew.cxx @@ -42,5 +42,7 @@ int otbAmplitudePhaseToRGBFunctorNew(int argc, char * argv[]) colormapper->GetFunctor().SetMaximum(150); colormapper->GetFunctor().SetMinimum(70); + std::cout << colormapper << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx b/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx index 7de44f22a4113885f9ce45a70c5499ae9465c012..25f6efca0eba0d34432bc8cf36fced101fa472b8 100644 --- a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx +++ b/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx @@ -32,7 +32,9 @@ int otbBCOInterpolateImageFunctionNew(int argc, char * argv[]) typedef otb::BCOInterpolateImageFunction<ImageType, double> InterpolatorType; // Instantiating object - InterpolatorType::Pointer filter = InterpolatorType::New(); + InterpolatorType::Pointer interp = InterpolatorType::New(); + + std::cout << interp << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx b/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx index 2106904dd8ee24b8b628d0134869966955284645..98b8822434021c202bf406b20eba4824248a9a41 100644 --- a/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx @@ -28,5 +28,6 @@ int otbBSplineDecompositionImageFilterNew(int argc, char * argv[]) // Instantiating object BSplineDecompositionImageFilterType::Pointer filter = BSplineDecompositionImageFilterType::New(); + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx b/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx index 701675e5753a2932faf50a68abda9a632d3f7ad6..6e14abdaaa8881bfe0711a779189880835ccde99 100644 --- a/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx @@ -28,5 +28,7 @@ int otbBSplineInterpolateImageFunctionNew(int argc, char * argv[]) // Instantiating object InterpolatorType::Pointer filter = InterpolatorType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests11.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests11.cxx index fe3bb994698b808e89ce946eb3f0c989f3476d9c..65f7de65368050d5b7576ed61a3c37cdd9fc5924 100644 --- a/Testing/Code/BasicFilters/otbBasicFiltersTests11.cxx +++ b/Testing/Code/BasicFilters/otbBasicFiltersTests11.cxx @@ -40,6 +40,7 @@ void RegisterTests() REGISTER_TEST(otbKeyPointDensityImageFilterTest); REGISTER_TEST(otbImagePCAShapeModelEstimatorTest); REGISTER_TEST(otbFunctionWithNeighborhoodToImageFilterNew); + REGISTER_TEST(otbFunctionWithNeighborhoodToImageFilter); REGISTER_TEST(otbStreamingInnerProductVectorImageFilterNew); REGISTER_TEST(otbStreamingInnerProductVectorImageFilter); REGISTER_TEST(otbEstimateInnerProductPCAImageFilterNew); diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests8.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests8.cxx index 3d16f1defa105151ee0b09f29a4988e9861cdf74..0c6b9a9cb19ea5324af22ad30280136b3af51c08 100644 --- a/Testing/Code/BasicFilters/otbBasicFiltersTests8.cxx +++ b/Testing/Code/BasicFilters/otbBasicFiltersTests8.cxx @@ -43,6 +43,7 @@ void RegisterTests() REGISTER_TEST(otbVarianceImageFilterNew); REGISTER_TEST(otbVarianceImageFilter); REGISTER_TEST(otbBoxAndWhiskerImageFilterNew); + REGISTER_TEST(otbBoxAndWhiskerImageFilter); REGISTER_TEST(otbFlexibleDistanceWithMissingValueNew); REGISTER_TEST(otbFlexibleDistanceWithMissingValue); } diff --git a/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx b/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx index b85d0c7fb20cba50fbbcbbbcbab9e724fe79c839..5c324ec3f794721f501becea4267ebf1838a333b 100644 --- a/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx @@ -37,5 +37,7 @@ int otbBinaryImageDensityFunctionNew(int, char*[]) /**Instantiation of a Smart Pointer*/ FunctionType::Pointer filter = FunctionType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx b/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx index 78728548e350210f239fe123b1a86064be6ccabd..c4e7be7217e3f2d5f542e7a01fd5e32d68ded4eb 100644 --- a/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx +++ b/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx @@ -31,5 +31,7 @@ int otbBinaryImageMinimalBoundingRegionCalculatorNew(int argc, char* argv[]) //Instantiation BoundingRegionCalculatorType::Pointer brct = BoundingRegionCalculatorType::New(); + std::cout << brct << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx index 86d8b8a814dbb45f28fc72a6abed503e6bb18b2a..d66b2282d5b9f0faa5b1ce84e4ab2f20641e5d80 100644 --- a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx @@ -38,5 +38,7 @@ int otbBinaryImageToDensityImageFilterNew(int, char*[]) /**Instantiation of a Smart Pointer*/ FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx new file mode 100644 index 0000000000000000000000000000000000000000..c03d2b7ac55209282e96fd9bde205026acf06592 --- /dev/null +++ b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx @@ -0,0 +1,66 @@ +/*========================================================================= + + Program: ORFEO Toolbox + Language: C++ + Date: $Date$ + Version: $Revision$ + + + Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. + See OTBCopyright.txt 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. + +=========================================================================*/ +#if defined(_MSC_VER) +#pragma warning ( disable : 4786 ) +#endif + +#include "otbBoxAndWhiskerImageFilter.h" +#include "itkExceptionObject.h" +#include "otbImageFileReader.h" +#include "otbImageFileWriter.h" +#include "otbVectorImage.h" + +int otbBoxAndWhiskerImageFilter(int argc, char * argv[]) +{ + const char * inputFilename = argv[1]; + const char * outputFilename = argv[2]; + + unsigned int RadiusX((unsigned int) ::atoi(argv[3])); + unsigned int RadiusY((unsigned int) ::atoi(argv[4])); + + typedef double PixelType; + const unsigned int Dimension = 2; + + typedef otb::VectorImage<PixelType, Dimension> ImageType; + + typedef otb::ImageFileReader<ImageType> ReaderType; + typedef otb::ImageFileWriter<ImageType> WriterType; + + typedef otb::BoxAndWhiskerImageFilter<ImageType> FilterType; + + FilterType::SizeType Radius; + Radius[0] = RadiusX; + Radius[1] = RadiusY; + + FilterType::Pointer filter = FilterType::New(); + + filter->SetRadius(Radius); + + ReaderType::Pointer reader = ReaderType::New(); + WriterType::Pointer writer = WriterType::New(); + + reader->SetFileName(inputFilename); + writer->SetFileName(outputFilename); + + filter->SetInput(reader->GetOutput()); + writer->SetInput(filter->GetOutput()); + + writer->Update(); + + return EXIT_SUCCESS; +} diff --git a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx index 6f3dec000d6ee19242f5dea131ce77cbf90a6487..f8e8a7a26096eda81f0152c6b30d622710141086 100644 --- a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx @@ -33,5 +33,7 @@ int otbBoxAndWhiskerImageFilterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx b/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx index 9d10497518f21986b6e007de9a6db87cc7409d3c..f4372e96a1fdfa87ffbab5b27fac109a571c507a 100644 --- a/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx @@ -33,6 +33,7 @@ int otbChangeLabelImageFilterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); - return EXIT_SUCCESS; + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx b/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx index 9e79de3f1a8d03a47faba834c6aa42b34b06050f..477a507617bb2fb9d08b7ec45b0e1460ec46bcc5 100644 --- a/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx @@ -35,5 +35,7 @@ int otbClosingOpeningMorphologicalFilterNew(int argc, char * argv[]) // instantiating the opening closing filter ClosingOpeningFilterType::Pointer openingClosing = ClosingOpeningFilterType::New(); + std::cout << openingClosing << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx index e8e31658d2932d43549ed52e3f642d98effbcc30..f943d241c387c1802cd13a22e420ecbdd506a8a8 100644 --- a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx +++ b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx @@ -30,6 +30,7 @@ int otbContinuousMinimumMaximumImageCalculatorNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); - return EXIT_SUCCESS; + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbConvolutionImageFilterNew.cxx b/Testing/Code/BasicFilters/otbConvolutionImageFilterNew.cxx index d8115ed0b763c120e6c83405ac6f4e654d93bc12..fd6c60e2ae7069f48933f3fa14835848f4e979b5 100644 --- a/Testing/Code/BasicFilters/otbConvolutionImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbConvolutionImageFilterNew.cxx @@ -34,5 +34,7 @@ int otbConvolutionImageFilterNew(int argc, char * argv[]) FilterType::Pointer conv = FilterType::New(); + std::cout << conv << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx index 481cd37aefba1277f2435fd7f2b3b1be2950db4b..e1001c5772a6b6807475538d50cbe14c0453feae 100644 --- a/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx @@ -37,5 +37,7 @@ int otbEdgeDensityImageFilterNew(int, char*[]) /**Instantiation of an object*/ EdgeDensityFilterType::Pointer filter = EdgeDensityFilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx index 70c54e46d058b79675a7c1d97aca400efd46c896..9ad120e4885ff925fc9c6b54b7b323f5e93e37ba 100644 --- a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx @@ -30,5 +30,7 @@ int otbEdgeDetectorImageFilterNew(int, char*[]) /**Instantiation of an object*/ FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx b/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx index a93a609774070f5606b15cbe68a89d9466904af8..65d12c7ce57e4e5d8d2e0d23a024487c51f01f60 100644 --- a/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx @@ -30,5 +30,7 @@ int otbEstimateInnerProductPCAImageFilterNew(int argc, char* argv[]) // Instantiation object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx index 5a85a5e1a084955ad798cfce2c6febddefe9337f..7325443b2339b58cce182af54cc951f98c606053 100644 --- a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx +++ b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx @@ -31,5 +31,7 @@ int otbEuclideanDistanceWithMissingValueNew(int argc, char * argv[]) DistanceType::Pointer dist = DistanceType::New(); + std::cout << dist << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx b/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx index f8cb261a3ae7f8a3fdf3be3daf77efd05dbccfec..2d50973f7e8f2877073502718fe8372851284faf 100644 --- a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx +++ b/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx @@ -35,5 +35,7 @@ int otbFlexibleDistanceWithMissingValueNew(int argc, char * argv[]) DistanceType::Pointer dist = DistanceType::New(); + std::cout << dist << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbFrostFilterNew.cxx b/Testing/Code/BasicFilters/otbFrostFilterNew.cxx index 0d1cba298585399194560bf889ef6fb8ba0f51a0..cfa8059dae48d484335ea799f48bc24a641f3a1a 100644 --- a/Testing/Code/BasicFilters/otbFrostFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbFrostFilterNew.cxx @@ -41,5 +41,7 @@ int otbFrostFilterNew(int argc, char * argv[]) FilterType::Pointer frost = FilterType::New(); + std::cout << frost << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx b/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx index 83e902da567636a18378bbf315afec2594fa212b..67a4186be010bf0e5f118ffc6523fcf6502a214c 100644 --- a/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx @@ -30,7 +30,9 @@ int otbFunctionToImageFilterNew(int argc, char * argv[]) typedef otb::FunctionToImageFilter<ImageType, ImageType, FunctionType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx new file mode 100644 index 0000000000000000000000000000000000000000..d308afeff7972c0b55fe234da7682a1a246c4f2c --- /dev/null +++ b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx @@ -0,0 +1,56 @@ +/*========================================================================= + + Program: ORFEO Toolbox + Language: C++ + Date: $Date$ + Version: $Revision$ + + + Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. + See OTBCopyright.txt 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. + +=========================================================================*/ +#include "itkExceptionObject.h" +#include "otbImage.h" +#include "otbFunctionWithNeighborhoodToImageFilter.h" +#include "itkVarianceImageFunction.h" +#include "otbImageFileReader.h" +#include "otbStreamingImageFileWriter.h" + +int otbFunctionWithNeighborhoodToImageFilter(int argc, char * argv[]) +{ + const unsigned int Dimension = 2; + typedef double PixelType; + typedef otb::Image<PixelType, Dimension> InputImageType; + typedef otb::Image<PixelType, Dimension> OutputImageType; + typedef otb::ImageFileReader<InputImageType> ReaderType; + typedef otb::StreamingImageFileWriter<OutputImageType> WriterType; + typedef itk::VarianceImageFunction<InputImageType> FunctionType; + typedef otb::FunctionWithNeighborhoodToImageFilter<InputImageType, OutputImageType, FunctionType> FilterType; + + // Instantiating object + FilterType::Pointer filter = FilterType::New(); + ReaderType::Pointer reader = ReaderType::New(); + WriterType::Pointer writer = WriterType::New(); + + reader->SetFileName(argv[1]); + writer->SetFileName(argv[2]); + filter->SetInput(reader->GetOutput()); + + FunctionType::Pointer function = FunctionType::New(); + function->SetNeighborhoodRadius(atoi(argv[3])); + function->SetInputImage(reader->GetOutput()); + + filter->SetFunction(function); + + writer->SetInput(filter->GetOutput()); + writer->SetNumberOfStreamDivisions(2); + writer->Update(); + + return EXIT_SUCCESS; +} diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx index bd096fc899ed76d0982196d954e6384f302758dc..354339991fa7cbddf29482459e9214a2e9a843c8 100644 --- a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx @@ -68,7 +68,9 @@ int otbFunctionWithNeighborhoodToImageFilterNew(int argc, char * argv[]) typedef otb::FunctionWithNeighborhoodToImageFilter<ImageType, ImageType, FunctionType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbGaborFilterGeneratorNew.cxx b/Testing/Code/BasicFilters/otbGaborFilterGeneratorNew.cxx index e16381dc9cfa596d770f22d04002cfaa3c6138b1..b1db3aabc8ad3b9641ee00e72c8537c33aab1592 100644 --- a/Testing/Code/BasicFilters/otbGaborFilterGeneratorNew.cxx +++ b/Testing/Code/BasicFilters/otbGaborFilterGeneratorNew.cxx @@ -26,5 +26,7 @@ int otbGaborFilterGeneratorNew(int argc, char * argv[]) // Instantiating object GaborGeneratorType::Pointer gabor = GaborGeneratorType::New(); + std::cout << gabor << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx b/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx index bdc9859fa8d86b195dcfc9dad5318ddff714a3ed..2054b5fa77b7af104fb2a4bc4a58ae72e0592510 100644 --- a/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx @@ -35,5 +35,7 @@ int otbImageAndVectorImageOperationFilterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx b/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx index 0bff119fe957f75a1fbcad4623f6cfdc4eba7ff7..7216ff32efe60c2c7b429e3b995815d6b5ecf045 100644 --- a/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx @@ -34,7 +34,9 @@ int otbImageListToImageListApplyFilterNew(int argc, char * argv[]) ImageListToImageListApplyFilterType; // Instantiating object - ImageListToImageListApplyFilterType::Pointer object = ImageListToImageListApplyFilterType::New(); + ImageListToImageListApplyFilterType::Pointer filter = ImageListToImageListApplyFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx index fc227f7db10a7317b9e5192d31df7df778e2908e..6079947e3391bfd931e4d068217fda1d1619ba23 100644 --- a/Testing/Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx @@ -34,7 +34,9 @@ int otbImageListToVectorImageFilterNew(int argc, char * argv[]) typedef otb::ImageListToVectorImageFilter<ImageListType, VectorImageType> ImageListToVectorImageFilterType; // Instantiating object - ImageListToVectorImageFilterType::Pointer object = ImageListToVectorImageFilterType::New(); + ImageListToVectorImageFilterType::Pointer filter = ImageListToVectorImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx index 118e5495863677223726def30ac990b89dd17e9c..d72766d382c51db64d2c8910c444625627b393cc 100644 --- a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx @@ -28,7 +28,9 @@ int otbImportGeoInformationImageFilterNew(int argc, char * argv[]) typedef otb::ImportGeoInformationImageFilter<ImageType, ImageType> ImportGeoInformationImageFilterType; // Instantiating object - ImportGeoInformationImageFilterType::Pointer object = ImportGeoInformationImageFilterType::New(); + ImportGeoInformationImageFilterType::Pointer filter = ImportGeoInformationImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx index f25de1c1eff2fe72aa34778cf658bb6e9dbaa1fa..d605ca9a23b86c087c01508c2a24af9a0c04c6e1 100644 --- a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx @@ -30,5 +30,7 @@ int otbInnerProductPCAImageFilterNew(int argc, char* argv[]) // Instantiation object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbInverseLogPolarTransformNew.cxx b/Testing/Code/BasicFilters/otbInverseLogPolarTransformNew.cxx index ee087fb4405ce8d2876751a90c78bc2bf6ddbcfd..d75fb7c315c726c8a5ed636a702d36aece62ff95 100644 --- a/Testing/Code/BasicFilters/otbInverseLogPolarTransformNew.cxx +++ b/Testing/Code/BasicFilters/otbInverseLogPolarTransformNew.cxx @@ -26,5 +26,7 @@ int otbInverseLogPolarTransformNew(int argc, char* argv[]) // Instantiation InverseLogPolarTransformType::Pointer transform = InverseLogPolarTransformType::New(); + std::cout << transform << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx index 4c03bfa8175dcf4264663147a8c28cf4e7f11117..9a5902f892a1055f3d770db4f4c9cf6a21e9c67e 100644 --- a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx @@ -41,5 +41,7 @@ int otbKeyPointDensityImageFilterNew(int, char*[]) /**Instantiation of an object*/ FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilterNew.cxx b/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilterNew.cxx index 89e16714769312c2067ab3eb6db930445692baf9..8d743523ce5202310138a671aa72cf0fd5650edd 100644 --- a/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilterNew.cxx @@ -37,5 +37,7 @@ int otbLabelizeConfidenceConnectedImageFilterNew(int argc, char * argv[]) LabelizeFilterPointerType filter = LabelizeFilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilterNew.cxx b/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilterNew.cxx index 087a98126201dd55788d6d3202442ba9265c4f14..e6b66ffd12bff411958ee98d81c4aa7a04b6b28c 100644 --- a/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilterNew.cxx @@ -37,5 +37,7 @@ int otbLabelizeConnectedThresholdImageFilterNew(int argc, char * argv[]) LabelizeFilterPointerType filter = LabelizeFilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx b/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx index 2b6b9ba7c2b2eca8060c06be4613621c96ae763d..b4ecb156a3bab59c7d45def48247285f4206cd04 100644 --- a/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx @@ -37,5 +37,7 @@ int otbLabelizeNeighborhoodConnectedImageFilterNew(int argc, char * argv[]) LabelizeFilterPointerType filter = LabelizeFilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbListSampleToHistogramListGeneratorNew.cxx b/Testing/Code/BasicFilters/otbListSampleToHistogramListGeneratorNew.cxx index cc0b3b640a5367c44b56e5676d0adf358e651691..a72e917585bc98e73c53ad5598d813bc405dd1b5 100644 --- a/Testing/Code/BasicFilters/otbListSampleToHistogramListGeneratorNew.cxx +++ b/Testing/Code/BasicFilters/otbListSampleToHistogramListGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbListSampleToHistogramListGeneratorNew(int argc, char * argv[]) // Instantiation HistogramGeneratorType::Pointer generator = HistogramGeneratorType::New(); + std::cout << generator << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx b/Testing/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx index 4b1b412cf4bd749752edf4f3db8b62bc0813cb7b..c11beefe29da3ed8533371e4bdb286f60d349a62 100644 --- a/Testing/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx +++ b/Testing/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbListSampleToVariableDimensionHistogramGeneratorNew(int argc, char * argv[ // Instantiation HistogramGeneratorType::Pointer generator = HistogramGeneratorType::New(); + std::cout << generator << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbLogPolarTransformNew.cxx b/Testing/Code/BasicFilters/otbLogPolarTransformNew.cxx index df860547a87b73d2d73198ab3f07f2f983f08f1f..bdf974168d2e52966238ce5e163a883fce1de280 100644 --- a/Testing/Code/BasicFilters/otbLogPolarTransformNew.cxx +++ b/Testing/Code/BasicFilters/otbLogPolarTransformNew.cxx @@ -26,5 +26,7 @@ int otbLogPolarTransformNew(int argc, char* argv[]) // Instantiation LogPolarTransformType::Pointer transform = LogPolarTransformType::New(); + std::cout << transform << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx index 427630b577a0e87534a95a4f6cfabbfd876337b2..934b13622f3dfe74835b0aa19349f14b935caf52 100644 --- a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx @@ -35,5 +35,7 @@ int otbMatrixTransposeMatrixImageFilterNew(int argc, char * argv[]) // Instantiation MatrixTransposeMatrixImageFilterType::Pointer filter = MatrixTransposeMatrixImageFilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx index 174788333445ccda93b945165e92995e41dfdbed..02d16b5fd0c3093eea5bc6b35575f985a9f7c3c1 100644 --- a/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx @@ -27,6 +27,9 @@ int otbMeanShiftImageFilterNew(int argc, char * argv[]) typedef otb::MeanShiftImageFilter<ImageType, ImageType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx index 36ff22bae4aacce2e1e4499c5fc4a5815e7f0008..51c454ecc4535fff279929957e6f82135e479e31 100644 --- a/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx @@ -28,6 +28,9 @@ int otbMeanShiftVectorImageFilterNew(int argc, char * argv[]) typedef otb::MeanShiftVectorImageFilter<ImageType, ImageType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx b/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx index 367f265f9c616d2cfe420d965e9de7d4b9963bcd..9db1bf6196e9ff2078657040c7c3a1d99e1ae52a 100644 --- a/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx @@ -30,5 +30,7 @@ int otbNormalizeInnerProductPCAImageFilterNew(int argc, char* argv[]) // Instantiation object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx b/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx index d420a410b138939736bae75a812911fc3892820a..acd725acd818b413ed3146a4aab8ab509c8c7ee7 100644 --- a/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx @@ -35,5 +35,7 @@ int otbOpeningClosingMorphologicalFilterNew(int argc, char * argv[]) // instantiating the opening closing filter OpeningClosingFilterType::Pointer openingClosing = OpeningClosingFilterType::New(); + std::cout << openingClosing << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbOverlapSaveConvolutionImageFilterNew.cxx b/Testing/Code/BasicFilters/otbOverlapSaveConvolutionImageFilterNew.cxx index 0761a5cc61e42f531eee1db2f7bcf5a8bbb3dd79..43e143d2c5373306dc554d9b6773e8a2785105c4 100644 --- a/Testing/Code/BasicFilters/otbOverlapSaveConvolutionImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbOverlapSaveConvolutionImageFilterNew.cxx @@ -34,5 +34,7 @@ int otbOverlapSaveConvolutionImageFilterNew(int argc, char * argv[]) FilterType::Pointer conv = FilterType::New(); + std::cout << conv << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx index 6c770b47d6bba36dc27e273977d6dfe40cd955fb..cc679219d14d70fbd9c06f496498e53dd022baeb 100644 --- a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx @@ -34,7 +34,9 @@ int otbPerBandVectorImageFilterNew(int argc, char * argv[]) PerBandVectorImageFilterType; // Instantiating object - PerBandVectorImageFilterType::Pointer object = PerBandVectorImageFilterType::New(); + PerBandVectorImageFilterType::Pointer filter = PerBandVectorImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx b/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx index 387669e8167fd7288714b2072511e2097d03e213..88fb2ee6ab4aa94ba9849f4b868ee88022f39139 100644 --- a/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx @@ -32,6 +32,7 @@ int otbPersistentVectorizationFilterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); - return EXIT_SUCCESS; + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbPointSetDensityEpanechnikovFunctionNew.cxx b/Testing/Code/BasicFilters/otbPointSetDensityEpanechnikovFunctionNew.cxx index 43404336d34b00699c42e3578267b24979e075c6..8b0c31e54543f736b17f84aca512251496db0fd1 100644 --- a/Testing/Code/BasicFilters/otbPointSetDensityEpanechnikovFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbPointSetDensityEpanechnikovFunctionNew.cxx @@ -35,5 +35,7 @@ int otbPointSetDensityEpanechnikovFunctionNew(int, char*[]) /**Instantiation of a Smart Pointer*/ FunctionType::Pointer filter = FunctionType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx b/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx index 804a76dc1fe04884ad53d4df3143d40bf6a661a6..fd91daa83e00124924ef63f9e9bc94a89a254386 100644 --- a/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx @@ -35,5 +35,7 @@ int otbPointSetDensityFunctionNew(int, char*[]) /**Instantiation of a Smart Pointer*/ FunctionType::Pointer filter = FunctionType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbPointSetDensityGaussianFunctionNew.cxx b/Testing/Code/BasicFilters/otbPointSetDensityGaussianFunctionNew.cxx index ad772644dc7e8b04460cc4d6e83faaf3b2b37854..c5557f90732741127fd88b5e65e25abafebdf9f9 100644 --- a/Testing/Code/BasicFilters/otbPointSetDensityGaussianFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbPointSetDensityGaussianFunctionNew.cxx @@ -35,5 +35,7 @@ int otbPointSetDensityGaussianFunctionNew(int, char*[]) /**Instantiation of a Smart Pointer*/ FunctionType::Pointer filter = FunctionType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx index 7e67485695e100703dbefb90f99fb7573ae87c92..68c603e91d5efe530b1637dcb9440206487fa985 100644 --- a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx @@ -37,5 +37,7 @@ int otbPointSetToDensityImageFilterNew(int, char*[]) FunctionType::Pointer filter = FunctionType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx b/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx index c9bff5d1a2ac70ee6f5de75074671601bc5f8e52..5b52f87f30f6ad1edf50d8a5d6711d2398802d36 100644 --- a/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx @@ -35,5 +35,7 @@ int otbPrintableImageFilterNew(int argc, char * argv[]) FilterType::Pointer printableImage = FilterType::New(); + std::cout << printableImage << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx b/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx index 37922931394fb27502e205ef26b68befca5aec06..0b40f3bfdcb1539d8b2a54fd5fbb2730cc370ca8 100644 --- a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx @@ -28,5 +28,7 @@ int otbProlateInterpolateImageFunctionNew(int argc, char * argv[]) // Instantiating object ProlateInterpolatorType::Pointer prolate = ProlateInterpolatorType::New(); + std::cout << prolate << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbScalarImageTextureFunctorNew.cxx b/Testing/Code/BasicFilters/otbScalarImageTextureFunctorNew.cxx index 3cb0877e0b12d9995e31e9af96e287338ac480d2..dbeac7bc354d6cd1aede901ae8c4112129f02c8d 100644 --- a/Testing/Code/BasicFilters/otbScalarImageTextureFunctorNew.cxx +++ b/Testing/Code/BasicFilters/otbScalarImageTextureFunctorNew.cxx @@ -38,7 +38,9 @@ int otbScalarImageTextureFunctorNew(int argc, char * argv[]) FunctorType> UnaryFunctorNeighborhoodImageFilterType; // Instantiating object - UnaryFunctorNeighborhoodImageFilterType::Pointer object = UnaryFunctorNeighborhoodImageFilterType::New(); + UnaryFunctorNeighborhoodImageFilterType::Pointer filter = UnaryFunctorNeighborhoodImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctorNew.cxx b/Testing/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctorNew.cxx index faa8f3af78f2a0886ef1c16af5c086a722657417..32c208266ce233b930c4d70835f02a3b377ebba8 100644 --- a/Testing/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctorNew.cxx +++ b/Testing/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctorNew.cxx @@ -41,5 +41,7 @@ int otbScalarToRainbowRGBPixelFunctorNew(int argc, char * argv[]) colormapper->GetFunctor().SetMaximum(150); colormapper->GetFunctor().SetMinimum(70); + std::cout << colormapper << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbScalarVectorImageTextureFunctorNew.cxx b/Testing/Code/BasicFilters/otbScalarVectorImageTextureFunctorNew.cxx index fe82a5c9da4dc2d37b43ad9c62ff0cd9c675b281..7f9ac335387a645896dbf4b4e27ccb1b7fae493e 100644 --- a/Testing/Code/BasicFilters/otbScalarVectorImageTextureFunctorNew.cxx +++ b/Testing/Code/BasicFilters/otbScalarVectorImageTextureFunctorNew.cxx @@ -41,7 +41,9 @@ int otbScalarVectorImageTextureFunctorNew(int argc, char * argv[]) FunctorType> UnaryFunctorNeighborhoodImageFilterType; // Instantiating object - UnaryFunctorNeighborhoodImageFilterType::Pointer object = UnaryFunctorNeighborhoodImageFilterType::New(); + UnaryFunctorNeighborhoodImageFilterType::Pointer filter = UnaryFunctorNeighborhoodImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx b/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx index 37c71a2e1075ae99aa8b3d2572dac01bfb0e4324..71c0373502ab2558edc45e5cf282209906fb5ed8 100644 --- a/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx @@ -29,7 +29,9 @@ int otbSpatialObjectToImageDrawingFilterNew(int argc, char * argv[]) typedef itk::GroupSpatialObject<Dimension> SpatialObjectType; typedef otb::SpatialObjectToImageDrawingFilter<SpatialObjectType, ImageType> SpatialObjectToImageDrawingFilterType; // Instantiating object - SpatialObjectToImageDrawingFilterType::Pointer object = SpatialObjectToImageDrawingFilterType::New(); + SpatialObjectToImageDrawingFilterType::Pointer filter = SpatialObjectToImageDrawingFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx b/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx index 7ab3b604ffff3831bcbb876866c625bcfed10949..0f3f74b54a3bb9b353fce3a711dcbc3d4ab2bd26 100644 --- a/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx @@ -29,7 +29,9 @@ int otbSpectralAngleDistanceImageFilterNew(int argc, char * argv[]) typedef otb::SpectralAngleDistanceImageFilter<InputImageType, OutputImageType> DistanceFilterType; // Instantiating object - DistanceFilterType::Pointer object = DistanceFilterType::New(); + DistanceFilterType::Pointer filter = DistanceFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx index 0a629b3a61d3350d6887c499417d4158556eaba1..10660a3baf858dede567e2c06a6e505d1267f551 100644 --- a/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx +++ b/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx @@ -33,7 +33,9 @@ int otbStreamingCompareImageFilterNew(int argc, char * argv[]) typedef otb::StreamingCompareImageFilter<ImageType> StreamingCompareImageFilterType; // Instantiating object - StreamingCompareImageFilterType::Pointer object = StreamingCompareImageFilterType::New(); + StreamingCompareImageFilterType::Pointer filter = StreamingCompareImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx index 669047bdc40c7979f045fb0b386422956e4a7914..12719f2e8c31255d6489f88d6f8f2bd71c8bc09b 100644 --- a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx @@ -30,5 +30,7 @@ int otbStreamingInnerProductVectorImageFilterNew(int argc, char* argv[]) // Instantiation object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx index 83fc1c8402e495bf33ac1b92bb9c1d00ecfad16b..822030ea02bad61f463be7241d05e8d56a973eca 100644 --- a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx @@ -29,7 +29,9 @@ int otbStreamingMinMaxImageFilterNew(int argc, char * argv[]) typedef otb::StreamingMinMaxImageFilter<ImageType> StreamingMinMaxImageFilterType; // Instantiating object - StreamingMinMaxImageFilterType::Pointer object = StreamingMinMaxImageFilterType::New(); + StreamingMinMaxImageFilterType::Pointer filter = StreamingMinMaxImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx index b68a742992022fff7672161431fa1d037743c075..fdb48345eed763adcabfe17e4fb40e5d87b0fcc8 100644 --- a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx @@ -29,7 +29,9 @@ int otbStreamingMinMaxVectorImageFilterNew(int argc, char * argv[]) typedef otb::StreamingMinMaxVectorImageFilter<ImageType> StreamingMinMaxVectorImageFilterType; // Instantiating object - StreamingMinMaxVectorImageFilterType::Pointer object = StreamingMinMaxVectorImageFilterType::New(); + StreamingMinMaxVectorImageFilterType::Pointer filter = StreamingMinMaxVectorImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx index 6a139bef680831ce9957882c096a9697d15e7a9c..af92b754c92cd4f7628c169df4abc5be44b0d0b3 100644 --- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx @@ -33,7 +33,9 @@ int otbStreamingResampleImageFilterNew(int argc, char * argv[]) InterpolatorPrecisionType> StreamingResampleImageFilterType; // Instantiating object - StreamingResampleImageFilterType::Pointer object = StreamingResampleImageFilterType::New(); + StreamingResampleImageFilterType::Pointer filter = StreamingResampleImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx index dfd1c3c577ac59bec6756e07ec2628a8188962b2..490fba01680d612b56e50d788224ef542166194d 100644 --- a/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx @@ -26,7 +26,9 @@ int otbStreamingShrinkImageFilterNew(int argc, char * argv[]) typedef otb::VectorImage<PixelType, Dimension> ImageType; typedef otb::StreamingShrinkImageFilter<ImageType, ImageType> ShrinkType; - ShrinkType::Pointer shrink = ShrinkType::New(); + ShrinkType::Pointer filter = ShrinkType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx index dc4a663930094d699dbfc2d0da78153c4dd09813..94a1c450ce2db93d5f1ed84bc8f7d36466990510 100644 --- a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx @@ -29,7 +29,9 @@ int otbStreamingStatisticsImageFilterNew(int argc, char * argv[]) typedef otb::StreamingStatisticsImageFilter<ImageType> StreamingStatisticsImageFilterType; // Instantiating object - StreamingStatisticsImageFilterType::Pointer object = StreamingStatisticsImageFilterType::New(); + StreamingStatisticsImageFilterType::Pointer filter = StreamingStatisticsImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx index ceaf3664eced38145c20cfc79db5d91ed04d5225..3e818149d192de0c110ca79f0b2ee15fd4c58130 100644 --- a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx @@ -29,7 +29,9 @@ int otbStreamingStatisticsVectorImageFilterNew(int argc, char * argv[]) typedef otb::StreamingStatisticsVectorImageFilter<ImageType> StreamingStatisticsVectorImageFilterType; // Instantiating object - StreamingStatisticsVectorImageFilterType::Pointer object = StreamingStatisticsVectorImageFilterType::New(); + StreamingStatisticsVectorImageFilterType::Pointer filter = StreamingStatisticsVectorImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbUnaryFunctorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbUnaryFunctorImageFilterNew.cxx index 502899da46cd18c827639705f36fd9e74975186a..3c6cc60dd8cea15fe690cbbe1756b511e6640a4b 100644 --- a/Testing/Code/BasicFilters/otbUnaryFunctorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbUnaryFunctorImageFilterNew.cxx @@ -33,5 +33,7 @@ int otbUnaryFunctorImageFilterNew(int argc, char * argv[]) FunctorType> FilterType; FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx index 3525cccd230777dcdf131f0137a6c2328a598fff..8001c99ad20e91328d778523de9d5c189c73f46e 100644 --- a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx @@ -36,5 +36,7 @@ int otbUnaryImageFunctorWithVectorImageFilterNew(int argc, char * argv[]) // Instantiating object UnaryImageFunctorWithVectorImageFilterType::Pointer filter = UnaryImageFunctorWithVectorImageFilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx index 50ef6a2ef9b7152d80baa2bf3933b0e39afc333e..7e5aefb2a115cd3d34ddec4b0b6345f3f1d972c7 100644 --- a/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx @@ -27,7 +27,9 @@ int otbVarianceImageFilterNew(int argc, char * argv[]) typedef otb::VarianceImageFilter<ImageType, ImageType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx index f41f837bdd426dda699012e2213ffac927147ba3..5da7b4ad1726e495e790a74ae217be83ca9cd45e 100644 --- a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx @@ -33,7 +33,9 @@ int otbVectorImageTo3DScalarImageFilterNew(int argc, char * argv[]) typedef otb::VectorImageTo3DScalarImageFilter<VectorImageType, ImageType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx index 11753174698e30b5552e179b045695151da31ed1..31d328ebda31a73d7cb103b6e46cfc0833216835 100644 --- a/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx @@ -29,7 +29,9 @@ int otbVectorImageToAmplitudeImageFilterNew(int argc, char * argv[]) typedef otb::VectorImageToAmplitudeImageFilter<VectorImageType, ImageType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx index 793377ddaa18e2637b3f4a02c28488422586adb1..4e7daa8d9dd990065026864bc8de0139675e89bb 100644 --- a/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx @@ -34,7 +34,9 @@ int otbVectorImageToImageListFilterNew(int argc, char * argv[]) typedef otb::VectorImageToImageListFilter<VectorImageType, ImageListType> VectorImageToImageListFilterType; // Instantiating object - VectorImageToImageListFilterType::Pointer object = VectorImageToImageListFilterType::New(); + VectorImageToImageListFilterType::Pointer filter = VectorImageToImageListFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx index edd9fff7f9de9e10e06886971f8ec00ee1162c24..72742f2536436593dcff239999f0edca9df3ca53 100644 --- a/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx @@ -29,7 +29,9 @@ int otbVectorImageToIntensityImageFilterNew(int argc, char * argv[]) typedef otb::VectorImageToIntensityImageFilter<InputImageType, OutputImageType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx index 3855fa7c7080278a65993480ffa19f3cc0c5e257..59937d18594ec633d6f40e64ad825f9b30aaf323 100644 --- a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx @@ -30,7 +30,9 @@ int otbVectorRescaleIntensityImageFilterNew(int argc, char * argv[]) typedef otb::VectorRescaleIntensityImageFilter<InputImageType, OutputImageType> VectorRescaleIntensityImageFilterType; // Instantiating object - VectorRescaleIntensityImageFilterType::Pointer object = VectorRescaleIntensityImageFilterType::New(); + VectorRescaleIntensityImageFilterType::Pointer filter = VectorRescaleIntensityImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx index f7ab26122050007f1990e7210a04fc9464fc3281..3b01bd7585e9d89b540a0f1457e5f8ca484bd49b 100644 --- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx @@ -28,5 +28,7 @@ int otbWindowedSincInterpolateImageBlackmanFunctionNew(int argc, char * argv[]) // Instantiating objects InterpolatorType::Pointer interp = InterpolatorType::New(); + std::cout << interp << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx index dcde2c0a3cee2804a1d15699dad257561600bf42..c06d5456b93484bd6e67931d004dc2bdb9806efb 100644 --- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx @@ -28,5 +28,7 @@ int otbWindowedSincInterpolateImageCosineFunctionNew(int argc, char * argv[]) // Instantiating objects InterpolatorType::Pointer interp = InterpolatorType::New(); + std::cout << interp << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx index feee46905328806340de2f95d408983a1c9bcc66..1ea979c0ae0f24ff9565b11a2030c4019f582085 100644 --- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx +++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx @@ -53,5 +53,7 @@ int otbWindowedSincInterpolateImageFunctionBaseNew(int argc, char * argv[]) // Instantiating object WindowedSincInterpolatorType::Pointer winInterp = WindowedSincInterpolatorType::New(); + std::cout << winInterp << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx index 7988bcdf8fa1d209c655f3417e185495c8431d5a..75824a8b5543f27f22fade22b34daeff478e0d75 100644 --- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx @@ -28,5 +28,7 @@ int otbWindowedSincInterpolateImageGaussianFunctionNew(int argc, char * argv[]) // Instantiating objects InterpolatorType::Pointer interp = InterpolatorType::New(); + std::cout << interp << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx index 69be5375abef9a831df3817b1c266bb958928ce1..c39c3ce14fe513b05d80124cfb45d6b3289529c1 100644 --- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx @@ -28,5 +28,7 @@ int otbWindowedSincInterpolateImageHammingFunctionNew(int argc, char * argv[]) // Instantiating objects InterpolatorType::Pointer interp = InterpolatorType::New(); + std::cout << interp << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx index 5bb7adbad000d00e6562526f65baa0df14aaec61..e3b924221a4bb22e7efb276700ee11f2a081b438 100644 --- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx @@ -28,5 +28,7 @@ int otbWindowedSincInterpolateImageLanczosFunctionNew(int argc, char * argv[]) // Instantiating objects InterpolatorType::Pointer interp = InterpolatorType::New(); + std::cout << interp << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx index bc26683c0e1b3f1d7c3199c290fc7139bdc85fd4..2fe6be521b2306a44d25381a86caf9075a870855 100644 --- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx +++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx @@ -28,5 +28,7 @@ int otbWindowedSincInterpolateImageWelchFunctionNew(int argc, char * argv[]) // Instantiating objects InterpolatorType::Pointer interp = InterpolatorType::New(); + std::cout << interp << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx index ecdfe1e43ff4de93b555da13c990ba8596aee3dd..43fa600f3b91002a253e579ca0f89231833b970f 100644 --- a/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx +++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx @@ -29,5 +29,7 @@ int otbKullbackLeiblerDistanceImageFilterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx index f9ffd42a84c9c61bb53b9f4ba1326ef24ec0a051..46c55477f9df1fb0ad5872cebb4383c204502f72 100644 --- a/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx +++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx @@ -31,5 +31,7 @@ int otbKullbackLeiblerProfileImageFilterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx index 4fb58b1df71d913409b0dda3baeea193589b440a..8e35d06e4008ca6914f6d4736bb247384dd189d5 100644 --- a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx +++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx @@ -34,5 +34,7 @@ int otbKullbackLeiblerSupervizedDistanceImageFilterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx b/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx index 81479557b473b61332c15e2fe20c63ad40bfcf14..5c2ac7f02627c7709422fd6ad60baa9cdec6e97f 100644 --- a/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx +++ b/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx @@ -30,5 +30,7 @@ int otbConcatenateVectorImageFilterNew(int argc, char * argv[]) // Instantiating adaptor object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx index 0af8d61c48615609b17d758e7c254d9ec2cc4951..a3873c9e0542bda69e053010b759234e103c7c7b 100644 --- a/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx +++ b/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx @@ -39,5 +39,7 @@ int otbDrawLineSpatialObjectListNew(int argc, char* argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx index 5569479b01ae6b60b210729d10035d2ff8b0bbd5..b72e915e7875db593402e90f1b2d860e819e44c2 100644 --- a/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx +++ b/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx @@ -39,5 +39,7 @@ int otbDrawLineSpatialObjectNew(int argc, char* argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbDrawPathFilterNew.cxx b/Testing/Code/Common/otbDrawPathFilterNew.cxx index a9b7001ad425e309366c2e6b551db0a39ed8eb1b..9ed9504cf4d9e56e84f15d31abfd0227caf3cd9b 100644 --- a/Testing/Code/Common/otbDrawPathFilterNew.cxx +++ b/Testing/Code/Common/otbDrawPathFilterNew.cxx @@ -32,5 +32,7 @@ int otbDrawPathFilterNew(int argc, char * argv[]) DrawPathFilterType::Pointer filter = DrawPathFilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbDrawPathListFilterNew.cxx b/Testing/Code/Common/otbDrawPathListFilterNew.cxx index 7e3458f0d66a8b9908dd0a5ff4c9cc1deb3acd20..4393373410e0de805addd5205072dd1f4319b8bf 100644 --- a/Testing/Code/Common/otbDrawPathListFilterNew.cxx +++ b/Testing/Code/Common/otbDrawPathListFilterNew.cxx @@ -30,7 +30,9 @@ int otbDrawPathListFilterNew(int argc, char * argv[]) typedef otb::DrawPathListFilter<ImageType, PathType, ImageType> DrawPathListFilterType; // Instantiating object - DrawPathListFilterType::Pointer object = DrawPathListFilterType::New(); + DrawPathListFilterType::Pointer filter = DrawPathListFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbExtractROINew.cxx b/Testing/Code/Common/otbExtractROINew.cxx index 51f4a1883c9f289bdf071ebb992a02e97cb795e3..75516405717c8d34dcc5690294cf43074bcba96d 100644 --- a/Testing/Code/Common/otbExtractROINew.cxx +++ b/Testing/Code/Common/otbExtractROINew.cxx @@ -30,5 +30,7 @@ int otbExtractROINew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbGISTableNew.cxx b/Testing/Code/Common/otbGISTableNew.cxx index a7d50e3f339ff09c31f30e504d305a6212679bbf..f5f4c94088a4516f94908c8a8f5ae3eca3f55e24 100644 --- a/Testing/Code/Common/otbGISTableNew.cxx +++ b/Testing/Code/Common/otbGISTableNew.cxx @@ -30,5 +30,7 @@ int otbGISTableNew(int argc, char * argv[]) //Instantiation GISTableType::Pointer data = GISTableType::New(); + std::cout << data << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbGISTableSourceNew.cxx b/Testing/Code/Common/otbGISTableSourceNew.cxx index 8ed3fae20105d65e2d38a1e1cf24bdb84c733982..e870fdfa06940615d49830c497ac14ad3c5e6921 100644 --- a/Testing/Code/Common/otbGISTableSourceNew.cxx +++ b/Testing/Code/Common/otbGISTableSourceNew.cxx @@ -33,5 +33,7 @@ int otbGISTableSourceNew(int argc, char * argv[]) //Instantiation GISTableSourceType::Pointer object = GISTableSourceType::New(); + std::cout << object << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx b/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx index 863efe4ac5312fbdf860f1c68739acee0bc1398e..96664c48e94a96affd7115ce665e19b413813d68 100644 --- a/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx +++ b/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx @@ -31,5 +31,7 @@ int otbGISTableToGISTableFilterNew(int argc, char * argv[]) //Instantiation GISFilterType::Pointer data = GISFilterType::New(); + std::cout << data << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbGISTableToVectorDataFilterNew.cxx b/Testing/Code/Common/otbGISTableToVectorDataFilterNew.cxx index ed186cee09e2293526aa1bf2f4297573e551ca51..107deb05d056d84b79ef31725589e00fec984f51 100644 --- a/Testing/Code/Common/otbGISTableToVectorDataFilterNew.cxx +++ b/Testing/Code/Common/otbGISTableToVectorDataFilterNew.cxx @@ -36,9 +36,11 @@ int otbGISTableToVectorDataFilterNew(int argc, char * argv[]) typedef otb::GISTableToVectorDataFilter<GISTableType, VectorDataType> GISTableToVectorDataFilter; - GISTableToVectorDataFilter::Pointer MyFilter = GISTableToVectorDataFilter::New(); + GISTableToVectorDataFilter::Pointer filter = GISTableToVectorDataFilter::New(); //data->itkGetObjectMacro ( ) + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx b/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx index 32d8dccfa9a3ffdd663dfc3f7aa336d3e2c607d7..61de3e66ec99704ed7246f7931988c88bc47c541 100644 --- a/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx +++ b/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx @@ -60,5 +60,7 @@ int otbGenericInterpolateImageFunctionNew(int argc, char * argv[]) // Instantiating object GenericFunctionType::Pointer generic = GenericFunctionType::New(); + std::cout << generic << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageListNew.cxx b/Testing/Code/Common/otbImageListNew.cxx index 1900c7347d69492e66f7c134e9b1f2c003e09af7..2475962eb248fbd7f03b3de15fc1f0bb354fd388 100644 --- a/Testing/Code/Common/otbImageListNew.cxx +++ b/Testing/Code/Common/otbImageListNew.cxx @@ -31,5 +31,7 @@ int otbImageListNew(int argc, char * argv[]) // Instantiating ImageList object ImageListType::Pointer imageList = ImageListType::New(); + std::cout << imageList << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageListSourceNew.cxx b/Testing/Code/Common/otbImageListSourceNew.cxx index 5b879c7eb4ce3d315dd7f6f858aa236a9d3272ea..3b777db92bcd7dc6ccbfc7c90f24da9b27aef464 100644 --- a/Testing/Code/Common/otbImageListSourceNew.cxx +++ b/Testing/Code/Common/otbImageListSourceNew.cxx @@ -30,5 +30,7 @@ int otbImageListSourceNew(int argc, char * argv[]) // Instantiating ImageListSource object ImageListSourceType::Pointer imageList = ImageListSourceType::New(); + std::cout << imageList << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageListToImageFilterNew.cxx b/Testing/Code/Common/otbImageListToImageFilterNew.cxx index dc1b316deb7472d1148f1faf8d01f70089638c5f..8d8c21ceb1c27ffb68a148c81ddbd988e019202e 100644 --- a/Testing/Code/Common/otbImageListToImageFilterNew.cxx +++ b/Testing/Code/Common/otbImageListToImageFilterNew.cxx @@ -32,5 +32,7 @@ int otbImageListToImageFilterNew(int argc, char * argv[]) // Instantiating ImageListSource object ImageListToImageFilterType::Pointer imageList = ImageListToImageFilterType::New(); + std::cout << imageList << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageListToImageListFilterNew.cxx b/Testing/Code/Common/otbImageListToImageListFilterNew.cxx index 816c0edfebd27b7f4e96c55066e0db813e7b2ac3..5d231137781904893169e3e06f582da00187e917 100644 --- a/Testing/Code/Common/otbImageListToImageListFilterNew.cxx +++ b/Testing/Code/Common/otbImageListToImageListFilterNew.cxx @@ -32,5 +32,7 @@ int otbImageListToImageListFilterNew(int argc, char * argv[]) // Instantiating ImageListSource object ImageToImageListFilterType::Pointer imageList = ImageToImageListFilterType::New(); + std::cout << imageList << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx b/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx index cac151e27f465399a23235227aaf7f7385ddc734..95c0dc6ba61cf79802e63243938be34094d636e4 100644 --- a/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx +++ b/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx @@ -31,5 +31,7 @@ int otbImageOfVectorsToMonoChannelExtractROINew(int argc, char * argv[]) // Instantiating object FilterType::Pointer object = FilterType::New(); + std::cout << object << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx b/Testing/Code/Common/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx index 7ea525a4747c351619c2095760b48adaf84f2a9e..413ca26a10aa1556c0b8d3d88b4aa5909dca9b8b 100644 --- a/Testing/Code/Common/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx +++ b/Testing/Code/Common/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx @@ -24,5 +24,7 @@ int otbImageRegionNonUniformMultidimensionalSplitterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageRegionTileMapSplitterNew.cxx b/Testing/Code/Common/otbImageRegionTileMapSplitterNew.cxx index 3e024049ddee1846706d8965b8ccffb536af3f80..7d5a33ca369ef00327de501306e923825ac71a93 100644 --- a/Testing/Code/Common/otbImageRegionTileMapSplitterNew.cxx +++ b/Testing/Code/Common/otbImageRegionTileMapSplitterNew.cxx @@ -24,5 +24,7 @@ int otbImageRegionTileMapSplitterNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageToImageListFilterNew.cxx b/Testing/Code/Common/otbImageToImageListFilterNew.cxx index ec058218086cdb9fb8f5f2100470804fdb6b7825..4cc9b8cd3f7b5eb0d80dcf0996959d9fcda9232c 100644 --- a/Testing/Code/Common/otbImageToImageListFilterNew.cxx +++ b/Testing/Code/Common/otbImageToImageListFilterNew.cxx @@ -32,5 +32,7 @@ int otbImageToImageListFilterNew(int argc, char * argv[]) // Instantiating ImageListSource object ImageToImageListFilterType::Pointer imageList = ImageToImageListFilterType::New(); + std::cout << imageList << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx b/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx index 9477766dfbc56f2490a5a267423de305dc158ffb..734448f97fbedadc3d3adf6b84991d4186c9826a 100644 --- a/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx +++ b/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx @@ -37,5 +37,7 @@ int otbImageToLineSpatialObjectListNew(int argc, char* argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageToPathFilterNew.cxx b/Testing/Code/Common/otbImageToPathFilterNew.cxx index b55ac77ac8c45cc45113f27c5f1f05983b8455de..7ba84f0ac5ca1d86f7bb050d8a38c69b8441a2b9 100644 --- a/Testing/Code/Common/otbImageToPathFilterNew.cxx +++ b/Testing/Code/Common/otbImageToPathFilterNew.cxx @@ -31,5 +31,7 @@ int otbImageToPathFilterNew(int argc, char * argv[]) ImageToPathFilterType::Pointer pathFilter = ImageToPathFilterType::New(); + std::cout << pathFilter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx b/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx index a90ff169d24c8ce537cbc6317fb532c3c34931fd..91d2fed6236209ccb46f1f3824a2b2a7df8f0740 100644 --- a/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx +++ b/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx @@ -33,5 +33,7 @@ int otbImageToVectorImageCastFilterNew(int argc, char * argv[]) // Instantiation VectorImageCastFilterType::Pointer caster = VectorImageCastFilterType::New(); + std::cout << caster << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx b/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx index 678d0bb62ee4a6b40c1a2ca0020e24c7cfd3c64d..7de6a07632b2de302046b30e70fdb2d01202dd55 100644 --- a/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx +++ b/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx @@ -37,5 +37,7 @@ int otbLineSpatialObjectListToPointSetFilterNew(int argc, char* argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbLineSpatialObjectNew.cxx b/Testing/Code/Common/otbLineSpatialObjectNew.cxx index 62cad29d45cace0e9f7415545b679176eaec2cef..979f4384a3470a0e9d140690c952f479236a00fa 100644 --- a/Testing/Code/Common/otbLineSpatialObjectNew.cxx +++ b/Testing/Code/Common/otbLineSpatialObjectNew.cxx @@ -27,5 +27,7 @@ int otbLineSpatialObjectNew(int argc, char * argv[]) // Instantiating object LineSpatialObjectType::Pointer object = LineSpatialObjectType::New(); + std::cout << object << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx b/Testing/Code/Common/otbMultiChannelExtractROINew.cxx index 44509cdcd54cf0b823a2e3e4cbdcf7dffc0d3770..bd0916e25929a70f8ae02bd31a0a7ec970b2f9bb 100644 --- a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx +++ b/Testing/Code/Common/otbMultiChannelExtractROINew.cxx @@ -32,5 +32,7 @@ int otbMultiChannelExtractROINew(int argc, char * argv[]) ExtractROIFilterType::Pointer extractROIFilter = ExtractROIFilterType::New(); + std::cout << extractROIFilter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx b/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx index 9160f99c5cf302b80b145f045f2fb8ccc1f9d367..6811805067d47af6cd266e19393679400571c143 100644 --- a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx +++ b/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx @@ -33,5 +33,7 @@ int otbMultiToMonoChannelExtractROINew(int argc, char * argv[]) ExtractROIFilterType::Pointer extractROIFilter = ExtractROIFilterType::New(); + std::cout << extractROIFilter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbObjectListNew.cxx b/Testing/Code/Common/otbObjectListNew.cxx index 4c7f8e276343af55b31abcf5adfa48a429091a05..333e972c72efd5e1848d4531ed4e7dbc3881712a 100644 --- a/Testing/Code/Common/otbObjectListNew.cxx +++ b/Testing/Code/Common/otbObjectListNew.cxx @@ -28,5 +28,7 @@ int otbObjectListNew(int argc, char * argv[]) ImageListType::Pointer imageList = ImageListType::New(); + std::cout << imageList << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx b/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx index 3ced444b06e7d81e47c1b37a121ee59a20cdfc7d..d2bec4ffbdd02d8354a1f5ba2df480c439876e04 100644 --- a/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx +++ b/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx @@ -34,5 +34,7 @@ int otbObjectListToObjectListFilterNew(int argc, char * argv[]) ObjectListFilterType::Pointer objectList = ObjectListFilterType::New(); + std::cout << objectList << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbParserTest.cxx b/Testing/Code/Common/otbParserTest.cxx index d70a211e2031244002dbfd4de930b09290745dec..760c0bdd0de7c65aaf8981c04adbc187286f6e63 100644 --- a/Testing/Code/Common/otbParserTest.cxx +++ b/Testing/Code/Common/otbParserTest.cxx @@ -28,6 +28,8 @@ int otbParserTestNew(int argc, char * argv[]) // Instantiating object ParserType::Pointer parser = ParserType::New(); + std::cout << parser << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx b/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx index 19247094320ef138ee752441e5f47caf6be1ab49..c5311bddceb3aad218235e19ba99278e6c4dd2e7 100644 --- a/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx +++ b/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx @@ -35,5 +35,7 @@ int otbPathListToHistogramGeneratorNew(int argc, char* argv[]) GeneratorType::Pointer histogram = GeneratorType::New(); + std::cout << histogram << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbPathListToPathListFilterNew.cxx b/Testing/Code/Common/otbPathListToPathListFilterNew.cxx index 1447cb006d654048bb726c118b549f6fa5d1aae3..a1016c5e4877131242d5ef2a8be09a232ca1bb91 100644 --- a/Testing/Code/Common/otbPathListToPathListFilterNew.cxx +++ b/Testing/Code/Common/otbPathListToPathListFilterNew.cxx @@ -30,5 +30,7 @@ int otbPathListToPathListFilterNew(int argc, char * argv[]) // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx b/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx index 8648ecb0ffcd81a225d4da03ae00f05452c6eb6f..453cae3494f120de1e78ff56764c2e8af05ad6c8 100644 --- a/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx +++ b/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx @@ -30,5 +30,7 @@ int otbPolyLineParametricPathWithValueNew(int argc, char * argv[]) PolyLineParametricPathWithValueType::Pointer object = PolyLineParametricPathWithValueType::New(); object->SetValue(0); + std::cout << object << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbPolygonNew.cxx b/Testing/Code/Common/otbPolygonNew.cxx index cc9d3ebed418c527f2121c05717fd7f48b5d41ab..2ab7553a8f4236e4581a314420aa07e220b3badd 100644 --- a/Testing/Code/Common/otbPolygonNew.cxx +++ b/Testing/Code/Common/otbPolygonNew.cxx @@ -27,5 +27,7 @@ int otbPolygonNew(int argc, char * argv[]) // Instantiating object PolygonType::Pointer polygon = PolygonType::New(); + std::cout << polygon << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx b/Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx index fa8ff0022026667ccfd12e8b840daec2ee42fe17..0bfcd7cfc70bb007adfa77adf0cb67d17a2684f5 100644 --- a/Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx +++ b/Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx @@ -28,5 +28,7 @@ int otbPostGISConnectionImplementationNew(int argc, char * argv[]) //Instantiation GISConnectionType::Pointer data = GISConnectionType::New(); + std::cout << data << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbPostGISTableNew.cxx b/Testing/Code/Common/otbPostGISTableNew.cxx index 7f23c3b63dee623a719e995bdc38b4db2ad47131..0ac4f8832d7d8f36e40b5e2a89ece3727476c15a 100644 --- a/Testing/Code/Common/otbPostGISTableNew.cxx +++ b/Testing/Code/Common/otbPostGISTableNew.cxx @@ -30,5 +30,7 @@ int otbPostGISTableNew(int argc, char * argv[]) //Instantiation PostGISTableType::Pointer data = PostGISTableType::New(); + std::cout << data << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx b/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx index ec32cd70b0799b0a6ededa59467d325110c528b9..1c8ed65476ec204673d50201653ca6354384b18e 100644 --- a/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx +++ b/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx @@ -31,5 +31,7 @@ int otbQuickLookImageGeneratorNew(int argc, char* argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbRectangleNew.cxx b/Testing/Code/Common/otbRectangleNew.cxx index a94cb60e92c4a487f38f80712893181a59f4d679..ca8168671e0b1c6f3efc7dee2179c53c2f44b97d 100644 --- a/Testing/Code/Common/otbRectangleNew.cxx +++ b/Testing/Code/Common/otbRectangleNew.cxx @@ -25,5 +25,7 @@ int otbRectangleNew(int argc, char * argv[]) //Instantiating object RectangleType::Pointer polygon = RectangleType::New(); + std::cout << polygon << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbRemoteSensingRegionNew.cxx b/Testing/Code/Common/otbRemoteSensingRegionNew.cxx index 799e8f3126e3e70e1ba7a4841f6ee3ce7adff2e3..1374b742f6ba935b1a3431747484021992030f6d 100644 --- a/Testing/Code/Common/otbRemoteSensingRegionNew.cxx +++ b/Testing/Code/Common/otbRemoteSensingRegionNew.cxx @@ -26,5 +26,7 @@ int otbRemoteSensingRegionNew(int argc, char * argv[]) TypedRegion Cartoregion; + std::cout << Cartoregion << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx b/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx index 5a4577a4d25d89f5cc79e3926ff7b3e164d3eddd..05cd5db12b4cee7379fb1efd914cdac1f74e6884 100644 --- a/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx +++ b/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx @@ -28,5 +28,7 @@ int otbShiftScaleImageAdaptorNew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbSpatialObjectSourceNew.cxx b/Testing/Code/Common/otbSpatialObjectSourceNew.cxx index a2b044e831bd66cee80b29017181f58eff73c26b..3e62e0eac7dc5f3d9c6af73af4c6e282dda1deb9 100644 --- a/Testing/Code/Common/otbSpatialObjectSourceNew.cxx +++ b/Testing/Code/Common/otbSpatialObjectSourceNew.cxx @@ -29,5 +29,7 @@ int otbSpatialObjectSourceNew(int argc, char* argv[]) // Instantiation SpatialObjectSourceType::Pointer source = SpatialObjectSourceType::New(); + std::cout << source << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbStandardFilterWatcherNew.cxx b/Testing/Code/Common/otbStandardFilterWatcherNew.cxx index 60337ebaf391687007480397bb2f1a1f6bde8df7..b9480e78f2146af3b265f96929aaf3db9ba1f5a8 100644 --- a/Testing/Code/Common/otbStandardFilterWatcherNew.cxx +++ b/Testing/Code/Common/otbStandardFilterWatcherNew.cxx @@ -64,6 +64,5 @@ int otbStandardFilterWatcherNew(int argc, char * argv[]) return EXIT_FAILURE; } - return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx index 31d67a0b01c793c422a1c4b223da6bc79e85b6e1..6413495d14a2a4a40e699b45e1205ec39655e563 100644 --- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx +++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx @@ -51,5 +51,7 @@ int otbUnaryFunctorNeighborhoodImageFilterNew(int argc, char * argv[]) // Instantiating object UnaryFunctorNeighborhoodImageFilterType::Pointer object = UnaryFunctorNeighborhoodImageFilterType::New(); + std::cout << object << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx index 6b153481884704cedd8ae4e7a16c91651a81e0b0..a804e32400074ab0431f44a1241653775101f489 100644 --- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx +++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx @@ -79,8 +79,10 @@ int otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew(int argc, char * argv[]) UnaryFunctorNeighborhoodWithOffsetImageFilterType; // Instantiating object - UnaryFunctorNeighborhoodWithOffsetImageFilterType::Pointer object = + UnaryFunctorNeighborhoodWithOffsetImageFilterType::Pointer filter = UnaryFunctorNeighborhoodWithOffsetImageFilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx b/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx index 6d908c5e1c6f78c4497e3aaf6f589501b36a9c09..b1fddb1106b9b19b848aa10d146254b97d0dbfcd 100644 --- a/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx +++ b/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx @@ -48,7 +48,9 @@ int otbUnaryFunctorWithIndexImageFilterNew(int argc, char * argv[]) FunctorType> UnaryFunctorWithIndexImageFilterType; // Instantiating object - UnaryFunctorWithIndexImageFilterType::Pointer object = UnaryFunctorWithIndexImageFilterType::New(); + UnaryFunctorWithIndexImageFilterType::Pointer filter = UnaryFunctorWithIndexImageFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbVectorDataExtractROINew.cxx b/Testing/Code/Common/otbVectorDataExtractROINew.cxx index 1d482166cd8cda009bf2427a51907850895e90ea..2410388f49b469a29441fa9a49fab669a7b70495 100644 --- a/Testing/Code/Common/otbVectorDataExtractROINew.cxx +++ b/Testing/Code/Common/otbVectorDataExtractROINew.cxx @@ -25,5 +25,7 @@ int otbVectorDataExtractROINew(int argc, char * argv[]) FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbVectorDataNew.cxx b/Testing/Code/Common/otbVectorDataNew.cxx index 421092c2a00353e7ee23c14492b190e4d6e8e881..a25195e78966bec6bec63c12ab5c10cee5223ab2 100644 --- a/Testing/Code/Common/otbVectorDataNew.cxx +++ b/Testing/Code/Common/otbVectorDataNew.cxx @@ -28,5 +28,7 @@ int otbVectorDataNew(int argc, char * argv[]) //Instantiation VectorDataType::Pointer data = VectorDataType::New(); + std::cout << data << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbVectorDataSourceNew.cxx b/Testing/Code/Common/otbVectorDataSourceNew.cxx index ec3aec3c8c3030c43db7aa5cdd1d40f3f4f62b17..4b5c58af765f8be544d5f0b37e295776d54f5890 100644 --- a/Testing/Code/Common/otbVectorDataSourceNew.cxx +++ b/Testing/Code/Common/otbVectorDataSourceNew.cxx @@ -28,7 +28,9 @@ int otbVectorDataSourceNew(int argc, char * argv[]) typedef otb::VectorDataSource<InputVectorDataType> VectorDataSourceType; // Instantiating VectorDataSource object - VectorDataSourceType::Pointer VectorData = VectorDataSourceType::New(); + VectorDataSourceType::Pointer vectorData = VectorDataSourceType::New(); + + std::cout << vectorData << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx b/Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx index 63c3463146bbdeaf8cffaea7ca1c4c95fb967bab..0fe7016b4d3089f9e3bb6daa3dfe3c5435e61c44 100644 --- a/Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx +++ b/Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx @@ -35,5 +35,7 @@ int otbVectorDataToGISTableFilterNew(int argc, char * argv[]) VectorDataToGISTableFilterType::Pointer vectorData = VectorDataToGISTableFilterType::New(); + std::cout << vectorData << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbVectorDataToImageFilterNew.cxx b/Testing/Code/Common/otbVectorDataToImageFilterNew.cxx index 14eae25dbe6d6607ef1bbd4e0d5837b3c211cf7f..f97101d0afaae4c4c5bfe4ccb4899933ebfcc7fd 100644 --- a/Testing/Code/Common/otbVectorDataToImageFilterNew.cxx +++ b/Testing/Code/Common/otbVectorDataToImageFilterNew.cxx @@ -31,5 +31,7 @@ int otbVectorDataToImageFilterNew(int argc, char * argv[]) typedef otb::VectorDataToImageFilter<VectorDataType, ImageType> VectorDataToImageFilterType; VectorDataToImageFilterType::Pointer vectorDataRendering = VectorDataToImageFilterType::New(); + std::cout << vectorDataRendering << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx b/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx index 296ff8f59b93341d1b7bc17730163c37e6f61ffd..20aa4200e6b93008b8618aed87d578bc32283a75 100644 --- a/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx +++ b/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx @@ -29,5 +29,7 @@ int otbVectorDataToVectorDataFilterNew(int argc, char * argv[]) VectorDataFilterType::Pointer vectorData = VectorDataFilterType::New(); + std::cout << vectorData << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx b/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx index a573a9fcd1ca22a20b67d7abfe1b6a6d536ad474..b2227b98006dbc3ccdc6ad576e858986b7ba4826 100644 --- a/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx +++ b/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx @@ -27,7 +27,9 @@ int otbVectorImageToASImageAdaptorNew(int argc, char * argv[]) typedef otb::VectorImageToASImageAdaptor<ImageType> FilterType; // Instantiating object - FilterType::Pointer object = FilterType::New(); + FilterType::Pointer filter = FilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx index 9bdbe8756e2bf5eb2727e7be56933a837f49260f..f34a6f632dd6277d7cb3843a67f10be6921c8734 100644 --- a/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbBSplinesInterpolateDeformationFieldGeneratorNew(int argc, char * argv[]) // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx index b3f1dbc8c1902789bd6858ee60d12c533474c25e..23adeee1ad637d3739be63e98174b721793ee2f5 100644 --- a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbBSplinesInterpolateTransformDeformationFieldGeneratorNew(int argc, char * // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx index 6ea001e23e1bc39436971a81b267418a656bcba6..217e93b0b8db83247e4baa41b3ac6a2a39d045a6 100644 --- a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx +++ b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx @@ -33,5 +33,7 @@ int otbDisparityMapEstimationMethodNew(int argc, char* argv[]) // Instantiation DMEstimationType::Pointer dmestimator = DMEstimationType::New(); + std::cout << dmestimator << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbFineRegistrationImageFilterNew.cxx b/Testing/Code/DisparityMap/otbFineRegistrationImageFilterNew.cxx index 8b5717c83a5d712d6af067b031cd151c281f508e..fd53b6f573e7cdc4e2f116a3109d03acc42e1ce0 100644 --- a/Testing/Code/DisparityMap/otbFineRegistrationImageFilterNew.cxx +++ b/Testing/Code/DisparityMap/otbFineRegistrationImageFilterNew.cxx @@ -34,7 +34,9 @@ int otbFineRegistrationImageFilterNew( int argc, char * argv[] ) typedef otb::Image<DeformationValueType,2> FieldImageType; typedef otb::FineRegistrationImageFilter<ImageType,ImageType,FieldImageType> RegistrationFilterType; - RegistrationFilterType::Pointer Registration = RegistrationFilterType::New(); + RegistrationFilterType::Pointer filter = RegistrationFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx b/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx index f8793aeaa54b58c41ca58c06ecf40cf825034c02..5d653ddc131bf54381c19ec5bb293d6a5e5a332a 100644 --- a/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx +++ b/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx @@ -40,7 +40,9 @@ int otbNCCRegistrationFilterNew(int argc, char* argv[]) RegistrationFilterType; // Instantiation - RegistrationFilterType::Pointer registrator = RegistrationFilterType::New(); + RegistrationFilterType::Pointer filter = RegistrationFilterType::New(); + + std::cout << filter << std::endl; return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew.cxx index 7cbea8395fe56d818cefd4becc1365b5fc074aea..c8d3688242cacaf67a43971d70bdaf05fdce50be 100644 --- a/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew(int argc, cha // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx index a34fa974ec3e69cac8aa48550f62445765e262ac..d57e9fa2f4b33c2da9dacce1e302e30712bbebda 100644 --- a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew(int argc, // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGeneratorNew.cxx index 9381bd5439a07db3fd27f03e864373d2af70205a..c12cf1f21f2baa477fe37c032f22014ccdb0fe75 100644 --- a/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbNearestPointDeformationFieldGeneratorNew(int argc, char * argv[]) // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGeneratorNew.cxx index f77592f996ac85bc608f5462a6e339511bf3cecc..7f3555f1f66ded98add72527425b155efcbafb9f 100644 --- a/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbNearestTransformDeformationFieldGeneratorNew(int argc, char * argv[]) // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbPointSetToDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbPointSetToDeformationFieldGeneratorNew.cxx index 6ec01f27118d3edde88f48f86dd182478689c631..b50831725477240362636b95124b8a23f85f32cb 100644 --- a/Testing/Code/DisparityMap/otbPointSetToDeformationFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbPointSetToDeformationFieldGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbPointSetToDeformationFieldGeneratorNew(int argc, char * argv[]) // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx index 0b15b170eb2824527d63c4e9072f616bd6a07a58..6972da9f92f63a18655bad0320bf579a6595186c 100644 --- a/Testing/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx @@ -32,5 +32,7 @@ int otbPointSetWithTransformToDeformationFieldGeneratorNew(int argc, char * argv // Instantiating object FilterType::Pointer filter = FilterType::New(); + std::cout << filter << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx b/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx index 0909e26bdb5ab3146e9ce5c13988c1d876298c58..2ffc20a75cba3c2dbe1a64e5aedb6fbdebdb841b 100644 --- a/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx +++ b/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx @@ -34,5 +34,7 @@ int otbStreamingWarpImageFilterNew(int argc, char* argv[]) // Objects creation ImageWarperType::Pointer warper = ImageWarperType::New(); + std::cout << warper << std::endl; + return EXIT_SUCCESS; } diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt index 4b72e1693ef05336ca973b91a361ec8285e79196..30506970fcf6fb79e65d4bc88355234b465fd701 100644 --- a/Testing/Code/FeatureExtraction/CMakeLists.txt +++ b/Testing/Code/FeatureExtraction/CMakeLists.txt @@ -1366,6 +1366,9 @@ ADD_TEST(feTvScalarImageToPanTexTextureFilter ${FEATUREEXTRACTION_TESTS15} # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + + # A enrichir SET(BasicFeatureExtraction_SRCS1 otbFeatureExtractionTests1.cxx diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx index 7484bd825e53a40fc5fc45276e700a7f154cea47..bf19b43c4f067ba6f1e4386ad9c1846f45e88435 100644 --- a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx +++ b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx @@ -63,14 +63,15 @@ int otbAlignImageToPath(int argc, char * argv[]) typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageToPathListAlignFilter<InputImageType, PathType> ListAlignFilterType; + typedef ListAlignFilterType::ValueType ValueType; + typedef ListAlignFilterType::SizeType SizeType; typedef itk::ImageFileWriter<OutputImageType> WriterType; ReaderType::Pointer reader = ReaderType::New(); WriterType::Pointer writer = WriterType::New(); InputImageType::Pointer ImageIn = InputImageType::New(); - typedef otb::ImageToPathListAlignFilter<InputImageType, PathType> TestType; - TestType::Pointer testList = TestType::New(); + ListAlignFilterType::Pointer testList = ListAlignFilterType::New(); reader->SetFileName(inputFilename); @@ -82,6 +83,39 @@ int otbAlignImageToPath(int argc, char * argv[]) otbGenericMsgDebugMacro(<< "Before update"); testList->Update(); otbGenericMsgDebugMacro(<< "After update"); + + ValueType pathValue; + pathValue = testList->GetPathValue(); + testList->SetPathValue(pathValue); + + ValueType backgroundValue; + backgroundValue = testList->GetBackgroundValue(); + testList->SetBackgroundValue(backgroundValue); + + SizeType size; + size = testList->GetSize(); + testList->SetSize(size); + + bool isMeaningfulSegment; + isMeaningfulSegment = testList->GetisMeaningfulSegment(); + testList->SetisMeaningfulSegment(isMeaningfulSegment); + + int NbGradDirection; + NbGradDirection = testList->GetNbGradDirection(); + testList->SetNbGradDirection(NbGradDirection); + + int NbLineDirection; + NbLineDirection = testList->GetNbLineDirection(); + testList->SetNbLineDirection(NbLineDirection); + + double MinGradNorm; + MinGradNorm = testList->GetMinGradNorm(); + testList->SetMinGradNorm(MinGradNorm); + + double Eps; + Eps = testList->GetEps(); + testList->SetEps(Eps); + ListAlignFilterOutputPathListType * sortiePath = testList->GetOutput(); otbGenericMsgDebugMacro(<< "Writing :"); diff --git a/Testing/Code/Learning/CMakeLists.txt b/Testing/Code/Learning/CMakeLists.txt index eb5b1825d7f2439d495aadf45d2f9d3ab364ca24..cdd2cb3b3b42208ee86370515ecbf1690d1c1170 100644 --- a/Testing/Code/Learning/CMakeLists.txt +++ b/Testing/Code/Learning/CMakeLists.txt @@ -209,7 +209,7 @@ ADD_TEST(leTvPeriodicSOM ${LEARNING_TESTS2} --compare-image ${EPSILON} ${BASELINE}/lePeriodicSOMPoupeesSubOutputMap1.hdr ${TEMP}/lePeriodicSOMPoupeesSubOutputMap1.hdr - otbSOM + otbPeriodicSOMTest ${INPUTDATA}/poupees_sub.png ${TEMP}/lePeriodicSOMPoupeesSubOutputMap1.hdr 32 32 10 10 5 1.0 0.1 0) @@ -234,12 +234,31 @@ ADD_TEST(leTvSOMActivationBuilder ${LEARNING_TESTS2} ADD_TEST(leTuSOMbasedImageFilterNew ${LEARNING_TESTS2} otbSOMbasedImageFilterNew ) +ADD_TEST(leTvSOMbasedImageFilter ${LEARNING_TESTS2} + --compare-image ${NOTOL} + ${BASELINE}/leSOMbasedImageFilterOuptut.hdr + ${TEMP}/leSOMbasedImageFilterOuptut.hdr + otbSOMbasedImageFilterTest + ${INPUTDATA}/poupees_sub.png + ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr + ${TEMP}/leSOMbasedImageFilterOuptut.hdr + ) + # ------ otb::SOMWithMissingValue ----------------------------------- ADD_TEST(leTuSOMWithMissingValueNew ${LEARNING_TESTS2} otbSOMWithMissingValueNew ) +ADD_TEST(leTvSOMWithMissingValue ${LEARNING_TESTS2} + --compare-image ${EPSILON} + ${BASELINE}/leSOMWithMissingValue.hdr + ${TEMP}/leSOMWithMissingValue.hdr + otbSOMWithMissingValueTest + ${INPUTDATA}/poupees_sub.png + ${TEMP}/leSOMWithMissingValue.hdr + 32 32 10 10 5 1.0 0.1 0) + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbLearningTESTS3 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -317,6 +336,17 @@ ADD_TEST(leTvSVMImageClassificationFilter ${LEARNING_TESTS3} ADD_TEST(leTuSVMImageClassificationWithRuleFilterNew ${LEARNING_TESTS3} otbSVMImageClassificationWithRuleFilterNew) +ADD_TEST(leTvSVMImageClassificationWithRuleFilter ${LEARNING_TESTS3} + --compare-image ${NOTOL} + ${BASELINE}/leSVMImageClassificationWithRuleFilterOutput.tif + ${TEMP}/leSVMImageClassificationWithRuleFilterOutput.tif + otbSVMImageClassificationWithRuleFilter + ${INPUTDATA}/ROI_QB_MUL_4.tif + ${INPUTDATA}/svm_model_image + ${TEMP}/leSVMImageClassificationWithRuleFilterOutput.tif) + + + ADD_TEST(leTvSVMModelGenericKernelsTest ${LEARNING_TESTS3} --compare-n-ascii ${NOTOL} 16 ${BASELINE_FILES}/leTvSVMModelGenericKernelsTest1.txt @@ -545,7 +575,9 @@ otbPeriodicSOM.cxx otbSOMActivationBuilderNew.cxx otbSOMActivationBuilder.cxx otbSOMbasedImageFilterNew.cxx +otbSOMbasedImageFilter.cxx otbSOMWithMissingValueNew.cxx +otbSOMWithMissingValue.cxx ) SET(BasicLearning_SRCS3 otbLearningTests3.cxx @@ -559,6 +591,7 @@ otbSEMClassifierNew.cxx otbSVMImageClassificationFilterNew.cxx otbSVMImageClassificationFilter.cxx otbSVMImageClassificationWithRuleFilterNew.cxx +otbSVMImageClassificationWithRuleFilter.cxx otbSVMModelGenericKernelsTest.cxx otbSVMModelCopyTest.cxx otbSVMModelCopyGenericKernelTest.cxx diff --git a/Testing/Code/Learning/otbLearningTests2.cxx b/Testing/Code/Learning/otbLearningTests2.cxx index 4513c35bd544f0d2f264638883880f8442004ed8..ae2e012e1ed4dbaed3d06cd1da76477f1911bde2 100644 --- a/Testing/Code/Learning/otbLearningTests2.cxx +++ b/Testing/Code/Learning/otbLearningTests2.cxx @@ -38,9 +38,11 @@ void RegisterTests() REGISTER_TEST(otbSOMNew); REGISTER_TEST(otbSOM); REGISTER_TEST(otbPeriodicSOMNew); - REGISTER_TEST(otbPeriodicSOM); + REGISTER_TEST(otbPeriodicSOMTest); REGISTER_TEST(otbSOMActivationBuilderNew); REGISTER_TEST(otbSOMActivationBuilder); REGISTER_TEST(otbSOMbasedImageFilterNew); + REGISTER_TEST(otbSOMbasedImageFilterTest); REGISTER_TEST(otbSOMWithMissingValueNew); + REGISTER_TEST(otbSOMWithMissingValueTest); } diff --git a/Testing/Code/Learning/otbLearningTests3.cxx b/Testing/Code/Learning/otbLearningTests3.cxx index 66a35a1cef0a9ae0ae101774202a5be14050df50..a37f39892d92390728818c82cf7242ce309f4469 100644 --- a/Testing/Code/Learning/otbLearningTests3.cxx +++ b/Testing/Code/Learning/otbLearningTests3.cxx @@ -34,6 +34,7 @@ void RegisterTests() REGISTER_TEST(otbSVMImageClassificationFilterNew); REGISTER_TEST(otbSVMImageClassificationFilter); REGISTER_TEST(otbSVMImageClassificationWithRuleFilterNew); + REGISTER_TEST(otbSVMImageClassificationWithRuleFilter); REGISTER_TEST(otbSVMModelGenericKernelsTest); REGISTER_TEST(otbSVMKernelsTest); REGISTER_TEST(otbSVMModelCopyTest); diff --git a/Testing/Code/Learning/otbPeriodicSOM.cxx b/Testing/Code/Learning/otbPeriodicSOM.cxx index 52c6f4b6f3a8eec534fe0ca498f4a510462c8109..c43115a3e8ffc038dfe4b60d8ad7a87de44da74e 100644 --- a/Testing/Code/Learning/otbPeriodicSOM.cxx +++ b/Testing/Code/Learning/otbPeriodicSOM.cxx @@ -26,7 +26,7 @@ #include "itkListSample.h" #include "itkImageRegionIterator.h" -int otbPeriodicSOM(int argc, char* argv[]) +int otbPeriodicSOMTest(int argc, char* argv[]) { const unsigned int Dimension = 2; char * inputFileName = argv[1]; diff --git a/Testing/Code/Learning/otbSOMWithMissingValue.cxx b/Testing/Code/Learning/otbSOMWithMissingValue.cxx new file mode 100644 index 0000000000000000000000000000000000000000..07ac541a9ff684f9ba90f44e9e45032fee116000 --- /dev/null +++ b/Testing/Code/Learning/otbSOMWithMissingValue.cxx @@ -0,0 +1,104 @@ +/*========================================================================= + + Program: ORFEO Toolbox + Language: C++ + Date: $Date$ + Version: $Revision$ + + + Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. + See OTBCopyright.txt 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. + +=========================================================================*/ +#include "itkExceptionObject.h" +#include "otbVectorImage.h" +#include "otbSOMMap.h" +#include "itkRGBPixel.h" +#include "otbImageFileReader.h" +#include "otbImageFileWriter.h" +#include "itkListSample.h" +#include "itkImageRegionIterator.h" + +#include "itkVariableLengthVector.h" +#include "otbSOMWithMissingValue.h" +#include "otbFlexibleDistanceWithMissingValue.h" + + + +int otbSOMWithMissingValueTest(int argc, char* argv[]) +{ + const unsigned int Dimension = 2; + char * inputFileName = argv[1]; + char * outputFileName = argv[2]; + unsigned int sizeX = atoi(argv[3]); + unsigned int sizeY = atoi(argv[4]); + unsigned int neighInitX = atoi(argv[5]); + unsigned int neighInitY = atoi(argv[6]); + unsigned int nbIterations = atoi(argv[7]); + double betaInit = atof(argv[8]); + double betaEnd = atof(argv[9]); + double initValue = atof(argv[10]); + + + typedef double PixelType; + typedef otb::VectorImage<PixelType, Dimension> ImageType; + typedef ImageType::PixelType VectorType; + + typedef otb::Statistics::FlexibleDistanceWithMissingValue<VectorType> DistanceType; + typedef otb::SOMMap<VectorType, DistanceType, Dimension> MapType; + typedef itk::Statistics::ListSample<VectorType> SampleListType; + typedef otb::Functor::CzihoSOMLearningBehaviorFunctor LearningBehaviorFunctorType; + typedef otb::Functor::CzihoSOMNeighborhoodBehaviorFunctor NeighborhoodBehaviorFunctorType; + typedef otb::SOMWithMissingValue<SampleListType, MapType, + LearningBehaviorFunctorType, NeighborhoodBehaviorFunctorType> SOMType; + + typedef otb::ImageFileReader<ImageType> ReaderType; + typedef otb::ImageFileWriter<MapType> WriterType; + + ReaderType::Pointer reader = ReaderType::New(); + reader->SetFileName(inputFileName); + reader->Update(); + + SampleListType::Pointer listSample = SampleListType::New(); + + itk::ImageRegionIterator<ImageType> it(reader->GetOutput(), reader->GetOutput()->GetLargestPossibleRegion()); + + it.GoToBegin(); + + while (!it.IsAtEnd()) + { + listSample->PushBack(it.Get()); + ++it; + } + + std::cout << "LIST SAMPLE SIZE: " << listSample->GetMeasurementVectorSize() << std::endl; + + // Instantiation + SOMType::Pointer som = SOMType::New(); + som->SetListSample(listSample); + SOMType::SizeType size; + size[0] = sizeX; + size[1] = sizeY; + som->SetMapSize(size); + SOMType::SizeType radius; + radius[0] = neighInitX; + radius[1] = neighInitY; + som->SetNeighborhoodSizeInit(radius); + som->SetNumberOfIterations(nbIterations); + som->SetBetaInit(betaInit); + som->SetBetaEnd(betaEnd); + som->SetMaxWeight(initValue); + som->SetRandomInit(false); + + WriterType::Pointer writer = WriterType::New(); + writer->SetFileName(outputFileName); + writer->SetInput(som->GetOutput()); + writer->Update(); + + return EXIT_SUCCESS; +} diff --git a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx index 75e00b51a2feed11d23295f77feb30e27355d53b..1775de686d14085423cd51c39ece62389b2f6fca 100644 --- a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx +++ b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx @@ -24,7 +24,7 @@ #include "itkListSample.h" #include "otbSOMMap.h" -#include "otbPeriodicSOM.h" +//#include "otbPeriodicSOM.h" #include "otbSOMWithMissingValue.h" #include "otbFlexibleDistanceWithMissingValue.h" diff --git a/Testing/Code/Learning/otbSOMbasedImageFilter.cxx b/Testing/Code/Learning/otbSOMbasedImageFilter.cxx new file mode 100644 index 0000000000000000000000000000000000000000..413b13f9af9c6be65b1cab156528b9931a94dd88 --- /dev/null +++ b/Testing/Code/Learning/otbSOMbasedImageFilter.cxx @@ -0,0 +1,65 @@ +/*========================================================================= + + Program: ORFEO Toolbox + Language: C++ + Date: $Date$ + Version: $Revision$ + + + Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. + See OTBCopyright.txt 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. + +=========================================================================*/ +#include "otbSOMbasedImageFilter.h" +#include "otbVectorImage.h" +#include "otbImage.h" +#include "otbSOMMap.h" +#include "otbImageFileReader.h" +#include "otbStreamingImageFileWriter.h" +#include "itkEuclideanDistance.h" + + +int otbSOMbasedImageFilterTest(int argc, char * argv[]) +{ + const char * infname = argv[1]; + const char * somfname = argv[2]; + const char * outfname = argv[3]; + + const unsigned int Dimension = 2; + + typedef double ComponentType; + typedef itk::VariableLengthVector<ComponentType> PixelType; + typedef itk::Statistics::EuclideanDistance<PixelType> DistanceType; + typedef otb::VectorImage<ComponentType, Dimension> ImageType; + typedef otb::ImageFileReader<ImageType> ReaderType; + typedef otb::SOMMap<ImageType::PixelType> SOMMapType; + typedef otb::SOMbasedImageFilter<ImageType, ImageType, DistanceType, SOMMapType> SOMbasedImageFilterType; + typedef otb::ImageFileReader<ImageType> ReaderType; + typedef otb::ImageFileReader<SOMMapType> SOMReaderType; + typedef otb::StreamingImageFileWriter<ImageType> WriterType; + + // Instantiating object + SOMbasedImageFilterType::Pointer filter = SOMbasedImageFilterType::New(); + + ReaderType::Pointer reader = ReaderType::New(); + reader->SetFileName(infname); + + SOMReaderType::Pointer somreader = SOMReaderType::New(); + somreader->SetFileName(somfname); + somreader->Update(); + + filter->SetMap(somreader->GetOutput()); + filter->SetInput(reader->GetOutput()); + + WriterType::Pointer writer = WriterType::New(); + writer->SetInput(filter->GetOutput()); + writer->SetFileName(outfname); + writer->Update(); + + return EXIT_SUCCESS; +} diff --git a/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx b/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx new file mode 100644 index 0000000000000000000000000000000000000000..2b12c2a3c73e1e5da1d2cc147a2af8993c9f8af6 --- /dev/null +++ b/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx @@ -0,0 +1,59 @@ +/*========================================================================= + + Program: ORFEO Toolbox + Language: C++ + Date: $Date$ + Version: $Revision$ + + + Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. + See OTBCopyright.txt 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. + +=========================================================================*/ +#include "otbSVMImageClassificationWithRuleFilter.h" +#include "otbVectorImage.h" +#include "otbImage.h" +#include "otbImageFileReader.h" +#include "otbStreamingImageFileWriter.h" + +int otbSVMImageClassificationWithRuleFilter(int argc, char * argv[]) +{ + const char * infname = argv[1]; + const char * modelfname = argv[2]; + const char * outfname = argv[3]; + + const unsigned int Dimension = 2; + typedef double PixelType; + typedef unsigned short LabeledPixelType; + + typedef otb::VectorImage<PixelType, Dimension> ImageType; + typedef otb::Image<LabeledPixelType, Dimension> LabeledImageType; + typedef otb::SVMImageClassificationWithRuleFilter<ImageType, LabeledImageType> ClassificationFilterType; + typedef ClassificationFilterType::ModelType ModelType; + typedef otb::ImageFileReader<ImageType> ReaderType; + typedef otb::StreamingImageFileWriter<LabeledImageType> WriterType; + + // Instantiating object + ClassificationFilterType::Pointer filter = ClassificationFilterType::New(); + + ReaderType::Pointer reader = ReaderType::New(); + reader->SetFileName(infname); + + ModelType::Pointer model = ModelType::New(); + model->LoadModel(modelfname); + + filter->SetModel(model); + filter->SetInput(reader->GetOutput()); + + WriterType::Pointer writer = WriterType::New(); + writer->SetInput(filter->GetOutput()); + writer->SetFileName(outfname); + writer->Update(); + + return EXIT_SUCCESS; +} diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt index 01c28dd1df707b8f629ac43ed610a3fdb8a1b739..b1a074849c11c7eb246f835e2e56007e3f6d4841 100644 --- a/Testing/Code/Projections/CMakeLists.txt +++ b/Testing/Code/Projections/CMakeLists.txt @@ -237,6 +237,35 @@ ADD_TEST(prTvSensorModelErs ${PROJECTIONS_TESTS1} ${TEMP}/prTvSensorModelErs.txt ) + +SET(SARSENSORMODEL_TYPES + "RADARSAT1/GOMA/SCENE01/" + "RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml" + "ENVISAT_ASAR_SCENE01/ASA_APS_1PNDPA20030821_7713.N1" + "PALSAR/200801280007/l1data/VOL-ALPSRP037120700-H1.1__A" + "TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos" +) + +FOREACH( file ${SARSENSORMODEL_TYPES}) + # Get the sensor name + SET(sharp_regexp "([0-9A-Za-z_]*)[ ]*/[ ]*(.*)") + STRING(REGEX REPLACE "${sharp_regexp}" "\\1" sensor_name "${file}") + # Tests + ADD_TEST(prTvSensorModelGrid_${sensor_name} ${PROJECTIONS_TESTS1} + --compare-n-images ${NOTOL} 2 + ${BASELINE}/prTvSensorModelGridDeltaX_${sensor_name}.tif + ${TEMP}/prTvSensorModelGridDeltaX_${sensor_name}.tif + ${BASELINE}/prTvSensorModelGridDeltaY_${sensor_name}.tif + ${TEMP}/prTvSensorModelGridDeltaY_${sensor_name}.tif + otbSensorModelGrid + ${LARGEINPUT}/${file} + ${TEMP}/prTvSensorModelGridDeltaX_${sensor_name}.tif + ${TEMP}/prTvSensorModelGridDeltaY_${sensor_name}.tif + 10 10 + ) +ENDFOREACH( file ${SARSENSORMODEL_TYPES}) + + ENDIF(OTB_DATA_USE_LARGEINPUT) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -667,7 +696,9 @@ otbCreateProjectionWithOTB.cxx otbCreateInverseForwardSensorModel.cxx otbRegionProjectionResampler.cxx otbSensorModel.cxx +otbSensorModelGrid.cxx ) + SET(Projections_SRCS2 otbProjectionsTests2.cxx otbOrthoRectificationFilterNew.cxx diff --git a/Testing/Code/Projections/otbProjectionsTests1.cxx b/Testing/Code/Projections/otbProjectionsTests1.cxx index 9881d16c2749aafb63e1ddd35223a4f180aca198..fcc2ac75844c716b1fbcfbc07f7c00c67ceb9947 100644 --- a/Testing/Code/Projections/otbProjectionsTests1.cxx +++ b/Testing/Code/Projections/otbProjectionsTests1.cxx @@ -37,4 +37,5 @@ void RegisterTests() REGISTER_TEST(otbCreateInverseForwardSensorModel); REGISTER_TEST(otbRegionProjectionResampler); REGISTER_TEST(otbSensorModel); + REGISTER_TEST(otbSensorModelGrid); } diff --git a/Testing/Code/Projections/otbSensorModelGrid.cxx b/Testing/Code/Projections/otbSensorModelGrid.cxx new file mode 100644 index 0000000000000000000000000000000000000000..822fc887bb81fa1bb26c0ffd910f61d9fb8328e6 --- /dev/null +++ b/Testing/Code/Projections/otbSensorModelGrid.cxx @@ -0,0 +1,128 @@ +/*========================================================================= + + Program: ORFEO Toolbox + Language: C++ + Date: $Date$ + Version: $Revision$ + + + Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. + See OTBCopyright.txt 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. + +=========================================================================*/ + +#if defined(_MSC_VER) +#pragma warning ( disable : 4786 ) +#endif + +#include <iostream> + +#include "otbImage.h" +#include "otbVectorImage.h" +#include "otbImageFileReader.h" +#include "otbImageFileWriter.h" +#include "otbForwardSensorModel.h" +#include "otbInverseSensorModel.h" + +int otbSensorModelGrid(int argc, char* argv[]) +{ + if (argc != 6) + { + std::cout << argv[0] << " <input filename> <output filename in x> <output filename in y> <size_x> <size_y>" << std::endl; + + return EXIT_FAILURE; + } + + char * filename = argv[1]; + char * outFilenameX = argv[2]; + char * outFilenameY = argv[3]; + unsigned int size_x((unsigned int)atoi(argv[4])); + unsigned int size_y((unsigned int)atoi(argv[5])); + + typedef otb::VectorImage<double, 2> VectorImageType; + typedef otb::Image<double, 2> ImageType; + typedef otb::ImageFileReader<VectorImageType> ReaderType; + typedef otb::ImageFileWriter<ImageType> WriterType; + typedef VectorImageType::SizeType SizeType; + + ReaderType::Pointer reader = ReaderType::New(); + reader->SetFileName(filename); + reader->UpdateOutputInformation(); + + WriterType::Pointer writeErrorX = WriterType::New(); + writeErrorX->SetFileName(outFilenameX); + + WriterType::Pointer writeErrorY = WriterType::New(); + writeErrorY->SetFileName(outFilenameY); + + SizeType sizeIn = reader->GetOutput()->GetLargestPossibleRegion().GetSize(); + SizeType sizeOut; + sizeOut[0] = size_x; + sizeOut[1] = size_y; + + ImageType::RegionType region; + region.SetIndex(0,0); + region.SetSize(sizeOut); + + ImageType::Pointer outputErrorX = ImageType::New(); + outputErrorX->SetRegions(region); + outputErrorX->Allocate(); + + ImageType::Pointer outputErrorY = ImageType::New(); + outputErrorY->SetRegions(region); + outputErrorY->Allocate(); + + double averageElevation = 16.19688987731934; + + typedef otb::ForwardSensorModel<double> ForwardSensorModelType; + ForwardSensorModelType::Pointer forwardSensorModel = ForwardSensorModelType::New(); + forwardSensorModel->SetImageGeometry(reader->GetOutput()->GetImageKeywordlist()); + forwardSensorModel->SetAverageElevation(averageElevation); + + typedef otb::InverseSensorModel<double> InverseSensorModelType; + InverseSensorModelType::Pointer inverseSensorModel = InverseSensorModelType::New(); + inverseSensorModel->SetImageGeometry(reader->GetOutput()->GetImageKeywordlist()); + inverseSensorModel->SetAverageElevation(averageElevation); + + double deltaX = static_cast<double>(sizeIn[0]) / static_cast<double>(size_x); + double deltaY = static_cast<double>(sizeIn[1]) / static_cast<double>(size_y); + + for(unsigned int i = 0 ; i < size_x; ++i) + { + for(unsigned int j = 0 ; j < size_y; ++j) + { + itk::Point<double, 2> imagePoint; + imagePoint[0] = deltaX * i; + imagePoint[1] = deltaY * j; + + itk::Point<double, 2> geoPoint; + geoPoint = forwardSensorModel->TransformPoint(imagePoint); + + itk::Point<double, 2> reversedImagePoint; + reversedImagePoint = inverseSensorModel->TransformPoint(geoPoint); + + double errorX = imagePoint[0] - reversedImagePoint[0]; + double errorY = imagePoint[1] - reversedImagePoint[1]; + + ImageType::IndexType index; + index[0]= i; + index[1]= j; + + outputErrorX->SetPixel(index, errorX); + outputErrorY->SetPixel(index, errorY); + } + } + + writeErrorX->SetInput(outputErrorX); + writeErrorX->Update(); + + writeErrorY->SetInput(outputErrorY); + writeErrorY->Update(); + + return EXIT_SUCCESS; +} diff --git a/Testing/Utilities/siftfast.cpp b/Testing/Utilities/siftfast.cpp index 1a3002c44e7d196f7e2ae44f73b9755406c2ec6e..3b2da1c717aa97b485e992aa770b7c85c2b81cba 100644 --- a/Testing/Utilities/siftfast.cpp +++ b/Testing/Utilities/siftfast.cpp @@ -19,7 +19,11 @@ #include <iostream> -#include <sys/timeb.h> // ftime(), struct timeb +#ifdef __FreeBSD__ +# include <sys/time.h> +#else +# include <sys/timeb.h> // ftime(), struct timeb +#endif #ifdef _WIN32 #include <io.h> @@ -38,15 +42,26 @@ typedef unsigned long long u64; inline u32 timeGetTime() { + u32 millisec = 0; #ifdef _WIN32 _timeb t; _ftime(&t); + millisec = (u32)(t.time*1000+t.millitm); #else +# ifdef __FreeBSD__ + // tv_sec is multiplied by 1000 to maintain same result as above + // tv_usec is in micro-seconds, so multiply by 1000 to maintain same + // result as above + timeval t; + gettimeofday(&t, NULL); + millisec = (u32)(t.tv_sec*1000+t.tv_usec/1000); +# else timeb t; ftime(&t); + millisec = (u32)(t.time*1000+t.millitm); +# endif #endif - - return (u32)(t.time*1000+t.millitm); + return millisec; } // code from david lowe diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt index 76ba81f251db3d6e6e9e419802b2abc19b0c5762..b3f6afcfc462069dddd4158ce06592a06c8909cd 100644 --- a/Utilities/otbossim/CMakeLists.txt +++ b/Utilities/otbossim/CMakeLists.txt @@ -53,72 +53,26 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION) # Removing sources not in use any more (switched to ossim plugins) LIST(REMOVE_ITEM ossim_projection_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/ossim/projection/ossimCosmoSkymedModel.cpp") - # Adjust the compiler flags to avoid problems with ossim code. -# IF(CMAKE_COMPILER_IS_GNUCXX) -# FOREACH(f ${ossim_base_SRCS} ${ossim_elevation_SRCS} ${ossim_font_SRCS} ${ossim_imaging_SRCS} ${ossim_matrix_SRCS} -# ${ossim_parallel_SRCS} ${ossim_projection_SRCS} ${ossim_support_data_SRCS} -# ${ossim_vec_SRCS} ${ossim_vpfutil_SRCS} ${ossim_plugin_SRCS} ${ossim_init_SRCS} -# ${ossim_kbool_SRCS} ${ossim_dll_main_SRCS} ) -# SET_SOURCE_FILES_PROPERTIES( ${f} PROPERTIES COMPILE_FLAGS -w ) -# ENDFOREACH(f) -# ELSE(CMAKE_COMPILER_IS_GNUCXX) -# IF(NOT BORLAND) -# IF(NOT CYGWIN) -# IF(NOT MINGW) -# FOREACH(f ${ossim_base_SRCS} ${ossim_elevation_SRCS} ${ossim_font_SRCS} ${ossim_imaging_SRCS} ${ossim_matrix_SRCS} -# ${ossim_parallel_SRCS} ${ossim_projection_SRCS} ${ossim_support_data_SRCS} -# ${ossim_vec_SRCS} ${ossim_vpfutil_SRCS} ${ossim_plugin_SRCS} ${ossim_init_SRCS} -# ${ossim_kbool_SRCS} ${ossim_dll_main_SRCS} ) -# SET_SOURCE_FILES_PROPERTIES( ${f} PROPERTIES COMPILE_FLAGS /W0 ) -# ENDFOREACH(f) -# ENDIF(NOT MINGW) -# ENDIF(NOT CYGWIN) -# ENDIF(NOT BORLAND) -# ENDIF(CMAKE_COMPILER_IS_GNUCXX) -# - -IF(NOT OTB_BUILD_SHARED_LIB) - IF(WIN32) - IF(NOT BORLAND) + + IF(NOT OTB_BUILD_SHARED_LIB) + IF(WIN32) IF(NOT CYGWIN) IF(NOT MINGW) SET(ossim_init_SRCS ${ossim_init_SRCS} ${ossim_dll_main_SRCS}) ENDIF(NOT MINGW) ENDIF(NOT CYGWIN) - ENDIF(NOT BORLAND) - ENDIF(WIN32) -ENDIF(NOT OTB_BUILD_SHARED_LIB) + ENDIF(WIN32) + ENDIF(NOT OTB_BUILD_SHARED_LIB) ADD_EXECUTABLE(version-config src/ossim/version-config.cpp) - #FIND_PROGRAM( VERSION_CONFIG_PROGRAM - # NAMES version-config - # PATHS ${EXECUTABLE_OUTPUT_PATH} - # ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE} - # ${EXECUTABLE_OUTPUT_PATH}/Release - # ${EXECUTABLE_OUTPUT_PATH}/Debug - # ${EXECUTABLE_OUTPUT_PATH}/MinSizeRel - # ${EXECUTABLE_OUTPUT_PATH}/RelWithDebInfo - # NO_DEFAULT_PATH ) - - - IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" MATCHES "^2\\.4$") - ADD_CUSTOM_COMMAND( - OUTPUT ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h - COMMAND ${OTB_BINARY_DIR}/bin/version-config - ARGS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h" "${OSSIM_VERSION}" - DEPENDS version-config - COMMENT "Generating ossimVersion.h" ) - ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" MATCHES "^2\\.4$") - ADD_CUSTOM_COMMAND( + + ADD_CUSTOM_COMMAND( OUTPUT ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h COMMAND version-config ARGS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h" "${OSSIM_VERSION}" DEPENDS version-config COMMENT "Generating ossimVersion.h" ) - ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" MATCHES "^2\\.4$") - - SET_SOURCE_FILES_PROPERTIES( src/ossim/init/ossimInit.cpp PROPERTIES diff --git a/Utilities/otbossim/src/ossim/projection/ossimBilinearProjection.cpp b/Utilities/otbossim/src/ossim/projection/ossimBilinearProjection.cpp index 3aef0937f34cb5a24e3e44b0444873b2d0040909..e6fe4ce3662f538f42fe5ee1013db9fdd996a05b 100644 --- a/Utilities/otbossim/src/ossim/projection/ossimBilinearProjection.cpp +++ b/Utilities/otbossim/src/ossim/projection/ossimBilinearProjection.cpp @@ -215,7 +215,8 @@ bool ossimBilinearProjection::saveState(ossimKeywordlist& kwl, bool ossimBilinearProjection::loadState(const ossimKeywordlist& kwl, const char* prefix) { - // Load the base class. + std::cout << "ossimBilinearProjection::loadState() BEGIN" << std::endl; + // Load the base class. ossimProjection::loadState(kwl, prefix); // Start with clear lists. @@ -279,6 +280,7 @@ bool ossimBilinearProjection::loadState(const ossimKeywordlist& kwl, } initializeBilinear(); + std::cout << "ossimBilinearProjection::loadState() END" << std::endl; return true; } diff --git a/Utilities/otbsiftfast/siftfast.cpp b/Utilities/otbsiftfast/siftfast.cpp index 2520e11731c20b5f0a19377872c939559c4da188..3c3cb25e983ff7e7540a45499470a01698281f4e 100644 --- a/Utilities/otbsiftfast/siftfast.cpp +++ b/Utilities/otbsiftfast/siftfast.cpp @@ -19,7 +19,11 @@ #include <iostream> -#include <sys/timeb.h> // ftime(), struct timeb +#ifdef __FreeBSD__ +# include <sys/time.h> +#else +# include <sys/timeb.h> // ftime(), struct timeb +#endif #ifdef _WIN32 #include <io.h> @@ -38,15 +42,26 @@ typedef unsigned long long u64; inline u32 timeGetTime() { + u32 millisec = 0; #ifdef _WIN32 _timeb t; _ftime(&t); + millisec = (u32)(t.time*1000+t.millitm); #else +# ifdef __FreeBSD__ + // tv_sec is multiplied by 1000 to maintain same result as above + // tv_usec is in micro-seconds, so multiply by 1000 to maintain same + // result as above + timeval t; + gettimeofday(&t, NULL); + millisec = (u32)(t.tv_sec*1000+t.tv_usec/1000); +# else timeb t; ftime(&t); + millisec = (u32)(t.time*1000+t.millitm); +# endif #endif - - return (u32)(t.time*1000+t.millitm); + return millisec; } // code from david lowe