diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt index e0ab06c98b4d37e5829b0d2790fb2b3dee5d221a..c52c291535bccccc774c64420df5cc3a3bfc30d1 100644 --- a/Code/IO/CMakeLists.txt +++ b/Code/IO/CMakeLists.txt @@ -40,6 +40,7 @@ ADD_LIBRARY(OTBIO ${OTBIO_SRCS}) # ) TARGET_LINK_LIBRARIES (OTBIO ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} ${OPENTHREADS_LIBRARY} OTBCommon OTBBasicFilters OTBCurlAdapters) TARGET_LINK_LIBRARIES (OTBIO ITKIO ITKCommon ${LIBKML_LIBRARIES} ${TINYXML_LIBRARIES} ${LIBLAS_LIBRARIES}) +TARGET_LINK_LIBRARIES (OTBIO OTBOGRAdapters) IF( OTB_USE_JPEG2000 ) TARGET_LINK_LIBRARIES (OTBIO otbopenjpeg) diff --git a/Code/IO/otbOGRIOHelper.cxx b/Code/IO/otbOGRIOHelper.cxx index 48bb209b20751346272856cb8c80d7c8aa845d4b..21b8699474aa52551b7f501e5d84c8e547f25b2b 100644 --- a/Code/IO/otbOGRIOHelper.cxx +++ b/Code/IO/otbOGRIOHelper.cxx @@ -18,7 +18,7 @@ #include "otbOGRIOHelper.h" #include "ogrsf_frmts.h" - +#include "otbOGR.h" #include "itkTimeProbe.h" namespace otb @@ -165,7 +165,9 @@ OGRIOHelper OGRIOHelper ::OGRIOHelper() -{} +{ + otb::ogr::Drivers::Init(); +} OGRIOHelper diff --git a/Testing/Fa/Failing/CMakeLists.txt b/Testing/Fa/Failing/CMakeLists.txt index cd356e1b0d809e3078ab4c90914262b514c94cf7..5ca733305d3dbb6d9414fa8ddb9d1b1926a5840b 100644 --- a/Testing/Fa/Failing/CMakeLists.txt +++ b/Testing/Fa/Failing/CMakeLists.txt @@ -27,12 +27,6 @@ ADD_TEST(NAME FA-0000495-StreamingImageFileWriterProgressReporting ${TEMP}/FA-0000495-output1.tif ${TEMP}/FA-0000495-output2.tif) - -ADD_TEST(NAME otbVectorDataToLabelImageFilterWithoutReader - COMMAND ${CXX_TEST_PATH}/otbVectorDataToLabelImageFilterWithoutReader - ${TEMP}/rasterizedVectorData.tif) - - # ------- Vectorization issue ----------------------------------- # http://bugs.orfeo-toolbox.org/view.php?id=94 ADD_TEST(FA-0000094-fe-PolygonsVectorization ${CXX_TEST_PATH}/0000094-PolygonsVectorization diff --git a/Testing/Fa/Resolved/CMakeLists.txt b/Testing/Fa/Resolved/CMakeLists.txt index 1895c89ee8d0d29712378566f161f13fc36f2d8a..12bd8c6be1e30d2a3dcb1d7d0d54f6b812967007 100644 --- a/Testing/Fa/Resolved/CMakeLists.txt +++ b/Testing/Fa/Resolved/CMakeLists.txt @@ -267,3 +267,9 @@ ENDIF(BUILD_APPLICATIONS) ADD_TEST(FA-0000437-WriteImageCentOS ${CXX_TEST_PATH}/0000437-WriteImageCentOS ${OTB_DATA_ROOT}/Baseline/OTB/Fa/FA-0000437-WriteImageCentOSInput.tif ${TEMP}/FA-0000437-WriteImageCentOSOutput.tif) + + +ADD_TEST(NAME otbVectorDataToLabelImageFilterWithoutReader + COMMAND ${CXX_TEST_PATH}/otbVectorDataToLabelImageFilterWithoutReader + ${TEMP}/rasterizedVectorData.tif) +