[1.3.13] 2024-06-10

*Fixed compiler warning in pugixml (convert_number_to_mantissa_exponent).
*Disabled CMake deprecation warnings.
*Upgraded zlib to v1.3.1 to get rid of compiler warnings
*Changed standard project CMakeList.txt to require cmake v3.15 on all systems.

*Context*
- Added Context::incrementPrimitiveData() methods.
- Added overloaded version of Context::scalePrimitiveData() that does not take a UUID argument and scales data for all primitives.
- Added overloaded version of Context::queryTimeseriesData() that queries at the time currently set in the Context.

*Radiation*
- **** significant change **** - 'sensor_size' was removed from the CameraProperties struct and replaced with FOV_aspect_ratio. The actual sensor_size values did not matter, and it was only the ratio of the size that determined the vertical field of view.
- Added RadiationModel::getCameraPosition(), RadiationModel::getCameraLookat(), and RadiationModel::getCameraOrientation() methods.
- Geometry for the light source model visualizations was not being correctly rotated.
- Added check to RadiationModel::setCameraSpectralResponse() to make sure band actually exists.
- Added Basler 730nm and 850nm filtered mono camera spectra to camera_spectral_library.xml.
- Correction to fix camera calibration in CameraCalibration::updateCameraResponseSpectra().
- Added RadiationModel::integrateSourceSpectrum() to easily integrate a source spectrum over a given wavelength range.
- Added a filter to RadiationModel::writeImageBoundingBoxes() to not write bounding boxes with a width of 0 pixels.
- Added RadiationModel::writeCameraImageData() to write out raw camera pixel flux data to ASCII text file.
- 'flux_to_pixel_conversion' argument of RadiationModel::writeCameraImage() was not implemented.
- File was not closed at the end of writing in RadiationModel::writeDepthImageData().
- Added RadiationModel::deleteRadiationSource().
- Deleted some overloaded versions of RadiationModel::addSunSphereSource() that take a sourceID as input to change the source ID. Instead we can use RadiationModel::deleteRadiationSource() and re-add a new source.

core/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 1.3)
+cmake_minimum_required(VERSION 3.15)
 
 project(helios)
 

core/CMake_project.txt

@@ -28,6 +28,7 @@ if( CMAKE_BUILD_TYPE STREQUAL Debug )
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHELIOS_DEBUG")
 endif()
 cmake_policy(SET CMP0079 NEW)
+set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
 
 if(NOT DEFINED CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
     set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "No dev warnings")

core/lib/zlib/CMakeLists.txt

@@ -1,12 +1,11 @@
-cmake_minimum_required(VERSION 2.4.4)
+cmake_minimum_required(VERSION 2.4.4...3.15.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
-set(VERSION "1.2.8")
+set(VERSION "1.3.1")
 
-option(ASM686 "Enable building i686 assembly implementation")
-option(AMD64 "Enable building amd64 assembly implementation")
+option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
 
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
@@ -60,7 +59,7 @@ endif()
 check_include_file(unistd.h Z_HAVE_UNISTD_H)
 
 if(MSVC)
-    #set(CMAKE_DEBUG_POSTFIX "d") //BNB 10/16/2021
+    #set(CMAKE_DEBUG_POSTFIX "d") //BNB 6/9/2024
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
     include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@@ -129,39 +128,6 @@ if(NOT MINGW)
     )
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC)
-    if(ASM686)
-        set(ZLIB_ASMS contrib/asm686/match.S)
-    elseif (AMD64)
-        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
-    endif ()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV)
-		set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
-	endif()
-endif()
-
-if(MSVC)
-    if(ASM686)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx86/inffas32.asm
-			contrib/masmx86/match686.asm
-		)
-    elseif (AMD64)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx64/gvmat64.asm
-			contrib/masmx64/inffasx64.asm
-		)
-    endif()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV -DASMINF)
-	endif()
-endif()
-
 # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
 string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
@@ -183,8 +149,10 @@ if(MINGW)
     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
 endif(MINGW)
 
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 set_target_properties(zlib PROPERTIES SOVERSION 1)
 
@@ -202,7 +170,7 @@ endif()
 if(UNIX)
     # On unix-like platforms the library is almost always called libz
    set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-   if(NOT APPLE)
+   if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
    endif()
 elseif(BUILD_SHARED_LIBS AND WIN32)
@@ -229,21 +197,22 @@ endif()
 #============================================================================
 # Example binaries
 #============================================================================
-
-#add_executable(example test/example.c)
-#target_link_libraries(example zlib)
-#add_test(example example)
-
-#add_executable(minigzip test/minigzip.c)
-#target_link_libraries(minigzip zlib)
-
-#if(HAVE_OFF64_T)
-#    add_executable(example64 test/example.c)
-#    target_link_libraries(example64 zlib)
-#    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-#    add_test(example64 example64)
-#
-#    add_executable(minigzip64 test/minigzip.c)
-#    target_link_libraries(minigzip64 zlib)
-#    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-#endif()
+if(ZLIB_BUILD_EXAMPLES)
+    add_executable(example test/example.c)
+    target_link_libraries(example zlib)
+    add_test(example example)
+
+    add_executable(minigzip test/minigzip.c)
+    target_link_libraries(minigzip zlib)
+
+    if(HAVE_OFF64_T)
+        add_executable(example64 test/example.c)
+        target_link_libraries(example64 zlib)
+        set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+        add_test(example64 example64)
+
+        add_executable(minigzip64 test/minigzip.c)
+        target_link_libraries(minigzip64 zlib)
+        set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+    endif()
+endif()