Enabled building and testing on Windows

Fixed J2K frame detection from fragment data
Fixed lossy compressiom method string

Author: PantelisGeorgiadis

.github/workflows/ci.yml

@@ -15,6 +15,24 @@ env:
   BUILD_TYPE: Release
 
 jobs:
+  build-windows:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+      - name: Build on Windows
+        shell: bash
+        run: ./build.sh ${{env.BUILD_TYPE}}
+      - name: Run tests on Windows
+        shell: pwsh
+        run: ./build/tests/${{env.BUILD_TYPE}}/dcmtkhtj2k_tests.exe
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dcmtk-htj2k-build-windows
+          path: |
+            build/${{env.BUILD_TYPE}}
+          compression-level: 9
   build-linux:
     runs-on: ubuntu-latest
     steps:
@@ -43,7 +61,7 @@ jobs:
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: dcmtk-htj2k-build-osx
+          name: dcmtk-htj2k-build-macos
           path: |
             build/${{env.BUILD_TYPE}}
           compression-level: 9

CMakeLists.txt

@@ -1,134 +1,123 @@
 cmake_minimum_required(VERSION 3.12.0)
 
-project(DCMTKHTJ2K)
-
-set (DCMTKHTJ2K_VERSION_MAJOR 1)
-set (DCMTKHTJ2K_VERSION_MINOR 0)
-set (DCMTKHTJ2K_VERSION_BUILD 0)
-set(DCMTKHTJ2K_VERSION "${DCMTKHTJ2K_VERSION_MAJOR}.${DCMTKHTJ2K_VERSION_MINOR}.${DCMTKHTJ2K_VERSION_BUILD}")
+project(
+  DCMTKHTJ2K
+  DESCRIPTION
+    "High-throughput JPEG2000 (HTJ2K) codec for DCMTK using OpenJPH"
+  LANGUAGES CXX)
+
+set(DCMTKHTJ2K_VERSION_MAJOR 1)
+set(DCMTKHTJ2K_VERSION_MINOR 0)
+set(DCMTKHTJ2K_VERSION_BUILD 1)
+set(DCMTKHTJ2K_VERSION
+    "${DCMTKHTJ2K_VERSION_MAJOR}.${DCMTKHTJ2K_VERSION_MINOR}.${DCMTKHTJ2K_VERSION_BUILD}"
+)
 
 option(BUILD_SHARED_LIBS "Build DCMTKHTJ2K shared library" ON)
 
-set (CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11)
 
 find_package(DCMTK REQUIRED)
 find_package(OPENJPH REQUIRED)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${DCMTK_INCLUDE_DIRS} ${OPENJPH_INCLUDE_DIRS})
-LINK_DIRECTORIES(${DCMTKHTJ2K}/lib)
+include_directories(${CMAKE_SOURCE_DIR}/include ${DCMTK_INCLUDE_DIRS}
+                    ${OPENJPH_INCLUDE_DIRS})
+link_directories(${DCMTKHTJ2K}/lib)
 
 add_definitions(-DDCMTKHTJ2K_EXPORTS)
 
 set(DCMTKHTJ2K_HEADERS
-	include/dcmtkhtj2k/djcodecd.h
-	include/dcmtkhtj2k/djcodece.h
-	include/dcmtkhtj2k/djcparam.h
-	include/dcmtkhtj2k/djdecode.h
-	include/dcmtkhtj2k/djencode.h
-	include/dcmtkhtj2k/djutils.h
-	include/dcmtkhtj2k/djrparam.h
-	include/dcmtkhtj2k/dldefine.h
-)
+    include/dcmtkhtj2k/djcodecd.h
+    include/dcmtkhtj2k/djcodece.h
+    include/dcmtkhtj2k/djcparam.h
+    include/dcmtkhtj2k/djdecode.h
+    include/dcmtkhtj2k/djencode.h
+    include/dcmtkhtj2k/djutils.h
+    include/dcmtkhtj2k/djrparam.h
+    include/dcmtkhtj2k/dldefine.h)
 
 set(DCMTKHTJ2K_SRCS
     ${DCMTKHTJ2K_HEADERS}
-	libsrc/djcodecd.cc
-	libsrc/djcodece.cc
-	libsrc/djcparam.cc
-	libsrc/djdecode.cc
-	libsrc/djencode.cc
-	libsrc/djrparam.cc
-	libsrc/djutils.cc
-)
-
-if (MSVC)
-	add_compile_options(/Zc:__cplusplus)
+    libsrc/djcodecd.cc
+    libsrc/djcodece.cc
+    libsrc/djcparam.cc
+    libsrc/djdecode.cc
+    libsrc/djencode.cc
+    libsrc/djrparam.cc
+    libsrc/djutils.cc)
+
+if(MSVC)
+  add_compile_options(/Zc:__cplusplus)
 endif()
 if(WIN32)
-	add_definitions(-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
+  add_definitions(-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
 endif()
 
 add_library(DCMTKHTJ2K ${DCMTKHTJ2K_SRCS})
 set(DCMTKHTJ2K_LIBRARY_NAME DCMTKHTJ2K)
-TARGET_LINK_LIBRARIES(DCMTKHTJ2K
-  DCMTK::DCMTK
-  openjph
-  )
+target_link_libraries(DCMTKHTJ2K DCMTK::DCMTK openjph)
 
 include(GenerateExportHeader)
 generate_export_header(DCMTKHTJ2K)
 set_property(TARGET DCMTKHTJ2K PROPERTY VERSION ${DCMTKHTJ2K_VERSION})
 set_property(TARGET DCMTKHTJ2K PROPERTY SOVERSION 1)
-set_property(TARGET DCMTKHTJ2K PROPERTY
-  INTERFACE_DCMTKHTJ2K_MAJOR_VERSION 1)
-set_property(TARGET DCMTKHTJ2K APPEND PROPERTY
-  COMPATIBLE_INTERFACE_STRING DCMTKHTJ2K_MAJOR_VERSION
-)
+set_property(TARGET DCMTKHTJ2K PROPERTY INTERFACE_DCMTKHTJ2K_MAJOR_VERSION 1)
+set_property(
+  TARGET DCMTKHTJ2K
+  APPEND
+  PROPERTY COMPATIBLE_INTERFACE_STRING DCMTKHTJ2K_MAJOR_VERSION)
 
-install(TARGETS DCMTKHTJ2K EXPORT DCMTKHTJ2KTargets
+install(
+  TARGETS DCMTKHTJ2K
+  EXPORT DCMTKHTJ2KTargets
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin
-)
+  RUNTIME DESTINATION bin)
 
 install(
-  FILES
-    ${DCMTKHTJ2K_HEADERS}
-  DESTINATION
-    include/DCMTKHTJ2K
-  COMPONENT
-    Devel
-)
+  FILES ${DCMTKHTJ2K_HEADERS}
+  DESTINATION include/DCMTKHTJ2K
+  COMPONENT Devel)
 
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KConfigVersion.cmake"
   VERSION ${DCMTKHTJ2K_VERSION}
-  COMPATIBILITY AnyNewerVersion
-)
+  COMPATIBILITY AnyNewerVersion)
 
 export(TARGETS DCMTKHTJ2K
-  FILE "${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KExports.cmake"
-)
-configure_file( ${CMAKE_SOURCE_DIR}/cmake/DCMTKHTJ2KConfig.cmake.in
-  ${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KConfig.cmake
-  @ONLY
-)
+       FILE "${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KExports.cmake")
+configure_file(${CMAKE_SOURCE_DIR}/cmake/DCMTKHTJ2KConfig.cmake.in
+               ${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KConfig.cmake @ONLY)
 
 set(ConfigPackageLocation lib/cmake/DCMTKHTJ2K)
-install(EXPORT DCMTKHTJ2KTargets
-  FILE
-    DCMTKHTJ2KTargets.cmake
-  DESTINATION
-    ${ConfigPackageLocation}
-)
+install(
+  EXPORT DCMTKHTJ2KTargets
+  FILE DCMTKHTJ2KTargets.cmake
+  DESTINATION ${ConfigPackageLocation})
 
 install(
-  FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KConfig.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KConfigVersion.cmake"
-  DESTINATION
-    ${ConfigPackageLocation}
-  COMPONENT
-    Devel
-)
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KConfig.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/DCMTKHTJ2KConfigVersion.cmake"
+  DESTINATION ${ConfigPackageLocation}
+  COMPONENT Devel)
 
 option(BUILD_TESTING "Build the testing tree" ON)
 if(BUILD_TESTING)
   enable_testing()
-  
-  # Fetch Google Test
+
   include(FetchContent)
+
   FetchContent_Declare(
     googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG        v1.14.0
-  )
-  
-  # For Windows: Prevent overriding the parent project's compiler/linker settings
-  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-  
+    GIT_TAG v1.14.0)
+
+  set(gtest_force_shared_crt
+      OFF
+      CACHE BOOL "" FORCE)
+
   FetchContent_MakeAvailable(googletest)
-  
+
   add_subdirectory(tests)
 endif()

README.md

@@ -18,6 +18,7 @@ DCMTK-HTJ2K provides HTJ2K codec support for [DCMTK](https://github.com/DCMTK/dc
 - **HTJ2K Decoding**: Decompress HTJ2K-encoded DICOM images.
 - **DCMTK Integration**: Seamless integration with DCMTK codec framework.
 - **Configurable Parameters**: Support for codeblock dimensions, progression order, number of decompositions, fragment sizes, and encoding options.
+- **Cross Platform**: Supports Linux, macOS, and Windows builds.
 
 ## Dependencies
 

build.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 set -xe
 
-if [ "$1" == "Debug" ]
-then
-  BUILD_TYPE=Debug
+if [ "$1" == "Debug" ]; then
+	BUILD_TYPE=Debug
 else
-  BUILD_TYPE=Release
+	BUILD_TYPE=Release
 fi
 
 BUILD_DIR="$(pwd)/build"
@@ -14,28 +13,30 @@ OTS_DEV_SPACE="$(pwd)/ots"
 
 mkdir -p $OTS_DEV_SPACE
 cd $OTS_DEV_SPACE
-[[ -d dcmtk ]] || git clone https://github.com/DCMTK/dcmtk.git 
+[[ -d dcmtk ]] || git clone https://github.com/DCMTK/dcmtk.git
 cd dcmtk
 git fetch
 git checkout -f DCMTK-3.6.9
 mkdir -p $BUILD_TYPE
 cd $BUILD_TYPE
 cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-         -DCMAKE_CXX_STANDARD=11 \
-         -DDCMTK_MODULES='ofstd;oficonv;oflog;dcmdata;dcmimgle;dcmimage;dcmjpeg;dcmjpls' \
-         -DDCMTK_ENABLE_STL=OFF \
-         -DDCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS=OFF \
-         -DDCMTK_DEFAULT_DICT='builtin' \
-         -DDCMTK_WITH_TIFF=OFF \
-         -DDCMTK_WITH_PNG=OFF \
-         -DDCMTK_WITH_OPENSSL=OFF \
-         -DDCMTK_WITH_XML=OFF \
-         -DDCMTK_WITH_ZLIB=OFF \
-         -DDCMTK_WITH_SNDFILE=OFF \
-         -DDCMTK_WITH_ICONV=ON \
-         -DDCMTK_WITH_WRAP=OFF \
-         -DBUILD_APPS=OFF \
-         -DCMAKE_INSTALL_PREFIX=$OTS_DEV_SPACE/dcmtk/$BUILD_TYPE
+	-DCMAKE_CXX_STANDARD=11 \
+	-DDCMTK_MODULES='ofstd;oficonv;oflog;dcmdata;dcmimgle;dcmimage;dcmjpeg;dcmjpls' \
+	-DDCMTK_ENABLE_STL=OFF \
+	-DDCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS=OFF \
+	-DDCMTK_DEFAULT_DICT='builtin' \
+	-DDCMTK_WITH_TIFF=OFF \
+	-DDCMTK_WITH_PNG=OFF \
+	-DDCMTK_WITH_OPENSSL=OFF \
+	-DDCMTK_WITH_XML=OFF \
+	-DDCMTK_WITH_ZLIB=OFF \
+	-DDCMTK_WITH_SNDFILE=OFF \
+	-DDCMTK_WITH_ICONV=ON \
+	-DDCMTK_WITH_WRAP=OFF \
+	-DBUILD_APPS=OFF \
+	-DCMAKE_INSTALL_PREFIX=$OTS_DEV_SPACE/dcmtk/$BUILD_TYPE \
+	-DCMAKE_POLICY_DEFAULT_CMP0091=NEW \
+	-DCMAKE_MSVC_RUNTIME_LIBRARY='MultiThreaded$<$<CONFIG:Debug>:Debug>'
 cmake --build . --parallel $(nproc) --config $BUILD_TYPE
 cmake --install . --config $BUILD_TYPE
 
@@ -47,22 +48,27 @@ git checkout -f 0.26.0
 mkdir -p $BUILD_TYPE
 cd $BUILD_TYPE
 cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-         -DCMAKE_CXX_STANDARD=11 \
-         -DBUILD_SHARED_LIBS=OFF \
-         -DOJPH_BUILD_EXECUTABLES=OFF \
-         -DCMAKE_INSTALL_PREFIX=$OTS_DEV_SPACE/openjph/$BUILD_TYPE
+	-DCMAKE_CXX_STANDARD=11 \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DOJPH_BUILD_EXECUTABLES=OFF \
+	-DCMAKE_INSTALL_PREFIX=$OTS_DEV_SPACE/openjph/$BUILD_TYPE \
+	-DCMAKE_POLICY_DEFAULT_CMP0091=NEW \
+	-DCMAKE_MSVC_RUNTIME_LIBRARY='MultiThreaded$<$<CONFIG:Debug>:Debug>'
 cmake --build . --parallel $(nproc) --config $BUILD_TYPE
 cmake --install . --config $BUILD_TYPE
 
 mkdir -p $BUILD_DIR
 mkdir -p $BUILD_DIR_LIB
 cd $BUILD_DIR
 cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-         -DCMAKE_CXX_STANDARD=11 \
-         -DBUILD_SHARED_LIBS=OFF \
-         -DDCMTK_ROOT=$OTS_DEV_SPACE/dcmtk/$BUILD_TYPE \
-         -DOPENJPH_DIR=$OTS_DEV_SPACE/openjph/$BUILD_TYPE/lib/cmake/openjph \
-         -DDCMTKHTJ2K_ROOT=$OTS_DEV_SPACE/dcmtkhtj2k/$BUILD_TYPE \
-         -DCMAKE_INSTALL_PREFIX=$BUILD_DIR_LIB
+	-DCMAKE_CXX_STANDARD=11 \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DBUILD_TESTING=ON \
+	-DDCMTK_ROOT=$OTS_DEV_SPACE/dcmtk/$BUILD_TYPE \
+	-DOPENJPH_DIR=$OTS_DEV_SPACE/openjph/$BUILD_TYPE/lib/cmake/openjph \
+	-DDCMTKHTJ2K_ROOT=$OTS_DEV_SPACE/dcmtkhtj2k/$BUILD_TYPE \
+	-DCMAKE_INSTALL_PREFIX=$BUILD_DIR_LIB \
+	-DCMAKE_POLICY_DEFAULT_CMP0091=NEW \
+	-DCMAKE_MSVC_RUNTIME_LIBRARY='MultiThreaded$<$<CONFIG:Debug>:Debug>'
 cmake --build . --parallel $(nproc) --config $BUILD_TYPE
 cmake --install . --config $BUILD_TYPE

include/dcmtkhtj2k/djcodecd.h

@@ -288,7 +288,7 @@ class DCMTKHTJ2K_EXPORT HtJ2kDecoderBase : public DcmCodec {
    *     this fragment is the start of a new HT-J2K image, i.e. starts with
    *     an SOI marker followed by SOF, COM or APPn.
    */
-  static OFBool isJPEGLSStartOfImage(Uint8 *fragmentData);
+  static OFBool isJ2KStartOfImage(Uint8 *fragmentData);
 
   /** converts an RGB or YBR frame with 8 bits/sample from
    *  color-by-pixel to color-by-plane planar configuration.

include/dcmtkhtj2k/djcparam.h

@@ -63,7 +63,7 @@ class DCMTKHTJ2K_EXPORT HtJ2kCodecParameter : public DcmCodecParameter {
   virtual ~HtJ2kCodecParameter();
 
   /** this methods creates a copy of type DcmCodecParameter *
-   *  it must be overweritten in every subclass.
+   *  it must be overwritten in every subclass.
    *  @return copy of this object
    */
   virtual DcmCodecParameter *clone() const;

include/dcmtkhtj2k/djdecode.h

@@ -3,7 +3,7 @@
 
 #include "dcmtk/config/osconfig.h"
 #include "dcmtk/ofstd/oftypes.h" /* for OFBool */
-#include "djutils.h"            /* for enums */
+#include "djutils.h"             /* for enums */
 
 class HtJ2kCodecParameter;
 class HtJ2kDecoder;