BUG:Error in the MSAVI computation

Utilities/otbossim/CMakeLists.txt

@@ -58,30 +58,32 @@ CONFIGURE_FILE(${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h.
 	       ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h)
 
 # Run ossim/version-config.cpp taht will generate ossim/ossimVersion.h file nedeed to compile OSSIM
-SET(INCLUDES_OSSIM_TRY_RUN "-DINCLUDE_DIRECTORIES:STRING=${OTB_BINARY_DIR}/Utilities/otbossim/include" )
-TRY_RUN(RUN_RESULT_VAR COMPILE_RESULT_VAR
-        ${OTB_BINARY_DIR}
-        ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/version-config.cpp
-        CMAKE_FLAGS "${INCLUDES_OSSIM_TRY_RUN}"
-        OUTPUT_VARIABLE output
-        ARGS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h"
-)
-IF(NOT COMPILE_RESULT_VAR)
-    MESSAGE(FATAL_ERROR "OSSIM : cannot compile version-config.cpp")
-ENDIF(NOT COMPILE_RESULT_VAR)
+# SET(INCLUDES_OSSIM_TRY_RUN "-DINCLUDE_DIRECTORIES:STRING=${OTB_BINARY_DIR}/Utilities/otbossim/include" )
+# TRY_RUN(RUN_RESULT_VAR COMPILE_RESULT_VAR
+#         ${OTB_BINARY_DIR}
+#         ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/version-config.cpp
+#         CMAKE_FLAGS "${INCLUDES_OSSIM_TRY_RUN}"
+#         OUTPUT_VARIABLE output
+#         ARGS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h"
+# )
+# IF(NOT COMPILE_RESULT_VAR)
+#     MESSAGE(FATAL_ERROR "OSSIM : cannot compile version-config.cpp")
+# ENDIF(NOT COMPILE_RESULT_VAR)
+#
+# IF(RUN_RESULT_VAR)
+#     MESSAGE(FATAL_ERROR "OSSIM : cannot create ossimVersion.h file")
+# ENDIF(RUN_RESULT_VAR)
 
-IF(RUN_RESULT_VAR)
-    MESSAGE(FATAL_ERROR "OSSIM : cannot create ossimVersion.h file")
-ENDIF(RUN_RESULT_VAR)
+ADD_EXECUTABLE(version-config ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/version-config.cpp)
 
-# ADD_EXECUTABLE(version-config ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/version-config.cpp)
 # ADD_CUSTOM_COMMAND(
-#   OUTPUT "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h"
+#   OUTPUT ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h
 #   DEPENDS version-config
 #   COMMAND version-config
 #   ARGS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h"
+#   COMMENT "Generating ossimVersion.h"
 #   )
-# 
+
 # SET_SOURCE_FILES_PROPERTIES(
 #   ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/init/ossimInit.cpp PROPERTIES
 #   OBJECT_DEPENDS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h"

Utilities/otbossim/src/ossim/CMakeLists.txt

+FILE(GLOB_RECURSE ossim_init_SRCS "init/*.cpp" "init/*.c")
 FILE(GLOB_RECURSE ossim_base_SRCS "base/*.cpp" "base/*.c")
 FILE(GLOB_RECURSE ossim_elevation_SRCS "elevation/*.cpp" "elevation/*.c")
 FILE(GLOB_RECURSE ossim_font_SRCS "font/*.cpp" "font/*.c")
@@ -9,7 +10,6 @@ FILE(GLOB_RECURSE ossim_support_data_SRCS "support_data/*.cpp" "support_data/*.c
 FILE(GLOB_RECURSE ossim_vec_SRCS "vec/*.cpp" "vec/*.c")
 FILE(GLOB_RECURSE ossim_vpfutil_SRCS "vpfutil/*.cpp" "vpfutil/*.c")
 FILE(GLOB_RECURSE ossim_plugin_SRCS "plugin/*.cpp" "plugin/*.c")
-FILE(GLOB_RECURSE ossim_init_SRCS "init/*.cpp" "init/*.c")
 FILE(GLOB_RECURSE ossim_kbool_SRCS "kbool/*.cpp" "kbool/*.c")
 FILE(GLOB_RECURSE ossim_dll_main_SRCS "dll_main/*.cpp")
 
@@ -21,9 +21,9 @@ REMOVE(ossim_base_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/base/ossimFactoryBaseTemplat
 
 # 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} 
+  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_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)
@@ -31,9 +31,9 @@ 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} 
+        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_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)
@@ -54,22 +54,34 @@ ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(${OTB_BINARY_DIR}/Utilities/otbgeotiff/)
 
+ADD_CUSTOM_COMMAND(
+  OUTPUT ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h
+  DEPENDS version-config
+  COMMAND version-config
+  ARGS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h"
+  COMMENT "Generating ossimVersion.h"
+  )
+SET_SOURCE_FILES_PROPERTIES(
+  ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/init/ossimInit.cpp PROPERTIES
+  OBJECT_DEPENDS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h"
+  )
+
 #Specify that we are making DLL here
 ADD_DEFINITIONS(-DNOMINMAX -DOSSIMMAKINGDLL)
 
-ADD_LIBRARY(otbossim 
+ADD_LIBRARY(otbossim
+${ossim_init_SRCS}
 ${ossim_base_SRCS}
 ${ossim_kbool_SRCS}
 ${ossim_matrix_SRCS}
 ${ossim_vec_SRCS}
 ${ossim_vpfutil_SRCS}
 ${ossim_plugin_SRCS}
-${ossim_init_SRCS}
 ${ossim_font_SRCS}
 ${ossim_support_data_SRCS}
 ${ossim_projection_SRCS}
-${ossim_imaging_SRCS} 
-${ossim_parallel_SRCS} 
+${ossim_imaging_SRCS}
+${ossim_parallel_SRCS}
 ${ossim_elevation_SRCS}
 )
 TARGET_LINK_LIBRARIES(otbossim otbgeotiff otbxtiff itktiff itkjpeg8 itkjpeg12 itkjpeg16 OpenThreads)