diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt index 0c7b8b08154e13a57d9bcfd6df32b53c8bb7bd6c..dd69964108837ac38adff2b026f72c9da8f88e8c 100644 --- a/Utilities/otbossim/CMakeLists.txt +++ b/Utilities/otbossim/CMakeLists.txt @@ -7,7 +7,7 @@ SET(OSSIM_RELEASE_NUMBER "?") SET(OSSIM_VERSION "${OSSIM_MAJOR_VERSION_NUMBER}-${OSSIM_MINOR_VERSION_NUMBER}-${OSSIM_PATCH_VERSION_NUMBER}" ) # svn revision number of this ossim fork (used for .so versioning) -SET(OSSIM_SVN_REVISION "20059") +SET(OSSIM_SVN_REVISION "20113") # patch number for OTB modifications applied on top of OSSIM_SVN_REVISION (used for .so versioning) SET(OSSIM_OTB_PATCH "1") diff --git a/Utilities/otbossim/include/ossim/base/ossimGzStream.h b/Utilities/otbossim/include/ossim/base/ossimGzStream.h index 133c827a198cdbb7db481f6acc31ad2bc9c97d8d..f338cbb0d6a2027eae5926a1f57440f2d9201a73 100644 --- a/Utilities/otbossim/include/ossim/base/ossimGzStream.h +++ b/Utilities/otbossim/include/ossim/base/ossimGzStream.h @@ -19,7 +19,7 @@ // // File : gzstream.h // Revision : $Revision: 13050 $ -// Revision_date : $Date: 2008-06-19 20:07:35 +0200 (jeu., 19 juin 2008) $ +// Revision_date : $Date: 2008-06-20 02:07:35 +0800 (Fri, 20 Jun 2008) $ // Author(s) : Deepak Bandyopadhyay, Lutz Kettner // // Standard streambuf implementation following Nicolai Josuttis, "The diff --git a/Utilities/otbossim/include/ossim/kbool/graph.h b/Utilities/otbossim/include/ossim/kbool/graph.h index 4aaf038a3e150104b3459a79feea0406bada4c2c..7c51be019aece3bd2efe22536b6a95751500697c 100644 --- a/Utilities/otbossim/include/ossim/kbool/graph.h +++ b/Utilities/otbossim/include/ossim/kbool/graph.h @@ -8,7 +8,7 @@ RCS-ID: $Id: graph.h 9094 2006-06-13 19:12:40Z dburken $ */ -/* @@(#) $Source$ $Revision: 9094 $ $Date: 2006-06-13 21:12:40 +0200 (mar., 13 juin 2006) $ */ +/* @@(#) $Source$ $Revision: 9094 $ $Date: 2006-06-14 03:12:40 +0800 (Wed, 14 Jun 2006) $ */ /* Program GRAPH.H diff --git a/Utilities/otbossim/include/ossim/kbool/graphlst.h b/Utilities/otbossim/include/ossim/kbool/graphlst.h index 16a718ed3ff4e29642c4208075fbc872bd605335..51976ebe6bc0362576a9bcbff5b986ab871d5093 100644 --- a/Utilities/otbossim/include/ossim/kbool/graphlst.h +++ b/Utilities/otbossim/include/ossim/kbool/graphlst.h @@ -8,7 +8,7 @@ RCS-ID: $Id: graphlst.h 9094 2006-06-13 19:12:40Z dburken $ */ -/* @@(#) $Source$ $Revision: 9094 $ $Date: 2006-06-13 21:12:40 +0200 (mar., 13 juin 2006) $ */ +/* @@(#) $Source$ $Revision: 9094 $ $Date: 2006-06-14 03:12:40 +0800 (Wed, 14 Jun 2006) $ */ /* Program GRAPHLST.H diff --git a/Utilities/otbossim/include/ossim/kbool/lpoint.h b/Utilities/otbossim/include/ossim/kbool/lpoint.h index b14ed831477f45ea5eb6a507bb9239fbef9786a4..441fcd916431a083c2a638b18dcb65929b041513 100644 --- a/Utilities/otbossim/include/ossim/kbool/lpoint.h +++ b/Utilities/otbossim/include/ossim/kbool/lpoint.h @@ -8,7 +8,7 @@ RCS-ID: $Id: lpoint.h 9094 2006-06-13 19:12:40Z dburken $ */ -/* @@(#) $Source$ $Revision: 9094 $ $Date: 2006-06-13 21:12:40 +0200 (mar., 13 juin 2006) $ */ +/* @@(#) $Source$ $Revision: 9094 $ $Date: 2006-06-14 03:12:40 +0800 (Wed, 14 Jun 2006) $ */ /* Program LPOINT.H diff --git a/Utilities/otbossim/src/ossim/CMakeLists.txt b/Utilities/otbossim/src/ossim/CMakeLists.txt index abc0a965984bf9c61ae06a280e93768de5999130..40b79c176e1b5b03b7dad5bf5fd0032eb151f541 100644 --- a/Utilities/otbossim/src/ossim/CMakeLists.txt +++ b/Utilities/otbossim/src/ossim/CMakeLists.txt @@ -44,7 +44,6 @@ FILE(GLOB ossim_vec_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT FILE(GLOB ossim_video_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../../include/ossim/video/*.h") FILE(GLOB ossim_vpfutil_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../../include/ossim/vpfutil/*.h") -MESSAGE( "${ossim_HDRS}" ) SET(OSSIM_HEADER_FILES ${ossim_HDRS} ${ossim_base_HDRS} ${ossim_elevation_HDRS} ${ossim_font_HDRS} ${ossim_imaging_HDRS} ${ossim_init_HDRS} ${ossim_kbool_HDRS} @@ -110,8 +109,8 @@ OSSIM_LINK_LIBRARY(${LIB_NAME} COMPONENT_NAME ossim TYPE ${OSSIM_USER_DEFINED_DYNAMIC_OR_STATIC} LIBRARIES ${ossimDependentLibs} - HEADERS "${OSSIM_HEADER_FILES}" - PUBLIC_HEADERS "${ossim_HDRS}" +# HEADERS "${OSSIM_HEADER_FILES}" +# PUBLIC_HEADERS "${ossim_HDRS}" SOURCE_FILES "${ossim_SRCS}" INSTALL_LIB VERSION_SYMLINKS INSTALL_HEADERS) diff --git a/Utilities/otbossim/src/ossim/base/ossimDatumFactory.inc b/Utilities/otbossim/src/ossim/base/ossimDatumFactory.inc index 60babb19e30a4ca01a1fe607d425d80460a848c2..0c2a304aa677eb5edc0a33b1f043a942705d58f9 100644 --- a/Utilities/otbossim/src/ossim/base/ossimDatumFactory.inc +++ b/Utilities/otbossim/src/ossim/base/ossimDatumFactory.inc @@ -46,7 +46,7 @@ public: }; #define NUMBER_OF_SEVEN_PARAM_DATUMS 2 -#define NUMBER_OF_THREE_PARAM_DATUMS 226 +#define NUMBER_OF_THREE_PARAM_DATUMS 229 static ossimThreeParamDatumType threeParamDatum[] = { {"ADI-A", "ADINDAN, Ethiopia", "CD", 3, 3, 3, 26, 50, -3, 25, -165, -11, 206}, @@ -276,6 +276,7 @@ static ossimThreeParamDatumType threeParamDatum[] = { {"WGE", "World Geodetic System 1984", "WE", 0, 0, 0, -180.0, 180.0, -90, 90, 0, 0, 0}, {"YAC", "YACARE, Uruguay", "IN", -1, -1, -1, -65, -47, -40, -25, -155, 171, 37}, {"ZAN", "ZANDERIJ, Suriname", "IN", 5, 5, 8, -76, -47, -10, 20, -265, 120, -358}, +{"WE-EPSG-3857", "Ploppy", "PV", 0, 0, 0, -180.0, 180.0, -85, 85, 0, 0, 0}, {"6055", "Popular Visualisation", "7059", 0, 0, 0, -180.0, 180.0, -85, 85, 0, 0, 0}, {"", "", "", 0, 0, 0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0} }; diff --git a/Utilities/otbossim/src/ossim/base/ossimGzStream.cpp b/Utilities/otbossim/src/ossim/base/ossimGzStream.cpp index b98da3d5373a72da7f9a16543446b4fb4450b211..fccd52b6a076bb97945f4b31231797dd45612292 100644 --- a/Utilities/otbossim/src/ossim/base/ossimGzStream.cpp +++ b/Utilities/otbossim/src/ossim/base/ossimGzStream.cpp @@ -19,7 +19,7 @@ // // File : gzstream.C // Revision : $Revision: 17195 $ -// Revision_date : $Date: 2010-04-23 19:32:18 +0200 (ven., 23 avril 2010) $ +// Revision_date : $Date: 2010-04-24 01:32:18 +0800 (Sat, 24 Apr 2010) $ // Author(s) : Deepak Bandyopadhyay, Lutz Kettner // // Standard streambuf implementation following Nicolai Josuttis, "The diff --git a/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp index cddc0968bf5c196e20ae0ac526fa76b02459988b..ffbdbfb0d5d4b66ad9259997495a8afcde28356f 100644 --- a/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp +++ b/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp @@ -39,6 +39,11 @@ #include <ossim/support_data/ossimNitfStdidcTag.h> #include <ossim/support_data/ossimNitfVqCompressionHeader.h> + +#if defined(JPEG_DUAL_MODE_8_12) +#undef JPEG_DUAL_MODE_8_12 +#endif + #if defined(JPEG_DUAL_MODE_8_12) #include <ossim/imaging/ossimNitfTileSource_12.h> #endif diff --git a/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource_12.cpp b/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource_12.cpp index 55be3030c6bbb450d7035e91fc4a1a7acdf8db6f..b6b882deac91249505e66ed5c610598b708e6371 100644 --- a/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource_12.cpp +++ b/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource_12.cpp @@ -16,6 +16,10 @@ //#if defined(JPEG_DUAL_MODE_8_12) #include <fstream> +#if defined(JPEG_DUAL_MODE_8_12) +#undef JPEG_DUAL_MODE_8_12 +#endif + #if defined(JPEG_DUAL_MODE_8_12) #include <jpeg12/jpeglib.h> diff --git a/Utilities/otbossim/src/ossim/version-config.cpp b/Utilities/otbossim/src/ossim/version-config.cpp index 5f6c3e3169d6ef33c1e55fd5bcb77927190f3f1d..9c5e5b6cf31d2fb6e6004f7e779f5fad0264ab3a 100644 --- a/Utilities/otbossim/src/ossim/version-config.cpp +++ b/Utilities/otbossim/src/ossim/version-config.cpp @@ -55,7 +55,6 @@ int main(int argc, char* argv[]) std::string releaseVersion = "0"; std::string::size_type pos1 = std::string::npos; std::string::size_type pos2 = std::string::npos; - std::string::size_type pos3 = std::string::npos; pos1 = versionNumber.find(".", 0); if(pos1 != std::string::npos)