Merge branch 'aous72:master' into feature/add-32bit-tif-support

Author: michaeldsmith

.github/workflows/codeql.yml

@@ -50,7 +50,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -77,6 +77,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

src/apps/others/ojph_sockets.cpp

@@ -165,16 +165,16 @@ namespace ojph
                                   MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
                                   buf, max_buf_size, NULL);
       buf[max_buf_size - 1] = 0;
-    #elif (defined OJPH_OS_APPLE) || \
-      ((_POSIX_C_SOURCE >= 200112L) && !_GNU_SOURCE)
+    #elif (defined __GLIBC__) && \
+      ((defined _GNU_SOURCE) || (_POSIX_C_SOURCE < 200112L))
+      v = strerror_r(errnum, (char*)buf, max_buf_size);
+    #else
       // it is not clear if the returned value is in buf or in v
       int t = strerror_r(errnum, (char*)buf, max_buf_size);
       if (t != 0)
         OJPH_ERROR(0x00080002, "Error retrieving a text message for "
           "socket error number %d\n", errnum);
       buf[max_buf_size - 1] = 0;
-    #else
-      v = strerror_r(errnum, (char*)buf, max_buf_size);
     #endif
       std::string str;
       str = v;    

src/core/CMakeLists.txt

@@ -139,6 +139,23 @@ set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_compile_definitions(openjph PUBLIC _FILE_OFFSET_BITS=64)
 target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include>)
 
+## This is to check if aligned_alloc or posix_memalign is available
+# We want the code to compile for C11 and C++11.
+# std::aligned_alloc is only availabe in C++17.
+# So here we try to see which API is available and adapt the code to use it
+if (NOT MSVC)
+  include(CheckSymbolExists)
+  check_symbol_exists(aligned_alloc "stdlib.h" OJPH_ALIGNED_ALLOC_EXISTS)
+  if (OJPH_ALIGNED_ALLOC_EXISTS)
+    target_compile_definitions(openjph PRIVATE OJPH_ALIGNED_ALLOC_EXISTS)
+  else()
+    check_symbol_exists(posix_memalign "stdlib.h" OJPH_POSIX_MEMALIGN_EXISTS)
+    if (OJPH_POSIX_MEMALIGN_EXISTS)
+      target_compile_definitions(openjph PRIVATE OJPH_POSIX_MEMALIGN_EXISTS)
+    endif()
+  endif()
+endif()
+
 if (MSVC)
   set(OJPH_LIB_NAME_STRING "openjph.${OPENJPH_VERSION_MAJOR}.${OPENJPH_VERSION_MINOR}")
   set_target_properties(openjph

src/core/common/ojph_version.h

@@ -35,4 +35,4 @@
 
 #define OPENJPH_VERSION_MAJOR 0
 #define OPENJPH_VERSION_MINOR 25
-#define OPENJPH_VERSION_PATCH 2
+#define OPENJPH_VERSION_PATCH 3

src/core/others/ojph_mem.c

@@ -35,7 +35,9 @@
 // Date: 17 October 2025
 //***************************************************************************/
 
+#include <assert.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // OS detection definitions for C only
@@ -59,25 +61,69 @@
 #define OJPH_EXPORT
 #endif
 
-////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 #ifdef OJPH_OS_WINDOWS
   OJPH_EXPORT void* ojph_aligned_malloc(size_t alignment, size_t size)
   {
+    assert(alignment != 0 && (alignment & (alignment - 1)) == 0);
     return _aligned_malloc(size, alignment);
   }
 
   OJPH_EXPORT void ojph_aligned_free(void* pointer)
   {
     _aligned_free(pointer);
   }
-#else
+#elif (defined OJPH_ALIGNED_ALLOC_EXISTS)
   void* ojph_aligned_malloc(size_t alignment, size_t size)
   {
+    assert(alignment != 0 && (alignment & (alignment - 1)) == 0);
     return aligned_alloc(alignment, size);
   }
 
   void ojph_aligned_free(void* pointer)
   {
     free(pointer);
   }
+#elif (defined OJPH_POSIX_MEMALIGN_EXISTS)
+  void* ojph_aligned_malloc(size_t alignment, size_t size)
+  {
+    assert(alignment != 0 && (alignment & (alignment - 1)) == 0);
+    void *p = NULL;
+    int e = posix_memalign(&p, alignment, size);
+    return (e ? NULL : p);
+  }
+
+  void ojph_aligned_free(void* pointer)
+  {
+    free(pointer);
+  }
+#else
+  void* ojph_aligned_malloc(size_t alignment, size_t size)
+  {
+    assert(alignment != 0 && (alignment & (alignment - 1)) == 0);
+
+    // emulate aligned_alloc
+    void* orig_ptr = malloc(size + alignment + sizeof(void*));
+    if (orig_ptr == NULL)
+      return NULL; // Allocation failed
+
+    uintptr_t start_of_mem = (uintptr_t)orig_ptr + sizeof(void*);
+    uintptr_t aligned_addr = (start_of_mem + alignment - 1) & ~(alignment - 1);
+
+    void** ptr_to_orig_ptr = (void**)aligned_addr;
+    ptr_to_orig_ptr[-1] = orig_ptr;
+
+    return (void*)aligned_addr;
+  }
+
+  void ojph_aligned_free(void* pointer)
+  {
+    if (pointer) {
+      // Retrieve the original pointer stored just before aligned pointer
+      void** ptr_to_orig_ptr = (void**)pointer;
+      void* orig_ptr = ptr_to_orig_ptr[-1];
+
+      free(orig_ptr);
+    }
+  }
 #endif