Commit d886b240 authored by Thomas Feuvrier's avatar Thomas Feuvrier
Browse files

Renommage du répertoire OSSIM par otbossim.

parent d68d57fd
......@@ -4,7 +4,7 @@ IF(NOT OTB_USE_EXTERNAL_ITK)
SUBDIRS( ITK )
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
SUBDIRS(BGL otbsvm dxflib InsightJournal OSSIM)
SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim)
IF(BUILD_TESTING)
SUBDIRS( Dart )
......
PROJECT(OSSIM)
PROJECT(otbossim)
INCLUDE(CheckIncludeFile)
CHECK_INCLUDE_FILE("dirent.h" CMAKE_HAVE_DIRENT_H)
......@@ -45,6 +45,6 @@ INCLUDE_DIRECTORIES(${OTB_BINARY_DIR}/Utilities/ITK/Utilities)
ENDIF(OTB_USE_EXTERNAL_ITK)
CONFIGURE_FILE(${OTB_SOURCE_DIR}/Utilities/OSSIM/include/ossim/ossimConfig.h.in
${OTB_BINARY_DIR}/Utilities/OSSIM/include/ossim/ossimConfig.h)
CONFIGURE_FILE(${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h.in
${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h)
SUBDIRS(src include)
During the OSSIM integration operation, the include of <tiffio.h>, <tiff.h> and <jpeglib.h> have
1. During the OSSIM integration operation, the include of <tiffio.h>, <tiff.h> and <jpeglib.h> have
been replaced by <itk_tiff.h> and <itkjpeg/8/jpeglib.h> respectively.
The ossim library is linked again ${ITK_TIFF_LIBRARY} and itkjpeg8.
......@@ -6,5 +6,11 @@ The ossim library is linked again ${ITK_TIFF_LIBRARY} and itkjpeg8.
This allows us to avoid looking for the right tiff and jpeg headers by ourselves, since it is already done
by ITK.
2. During generating otb::MapProjection<ossimLlxyProjection>, pb with polymorphism :
virtual void computeMetersPerPixel( double deltaDegreesPerPixelLat,
double deltaDegreesPerPixelLon,
ossimDpt &metersPerPixel)
The method is redefined in the file "ossimLlxyProjection.h"
The OTB Development Team.
FILE(GLOB_RECURSE ossim_HDRS "*.h")
INSTALL(FILES ${ossim_HDRS}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/OSSIM/include
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include
COMPONENT Development)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment