code reorg

Author: Grok Compression

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "codeQL.githubDatabase.download": "never"
+}

.vscode/tasks.json

@@ -0,0 +1,28 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "label": "build",
+        "type": "shell",
+        "command": "make",
+        "options": {
+            "cwd": "${workspaceFolder}/build"
+        },
+        "args": [
+          "-j$(nproc)"
+        ],
+        "group": {
+          "kind": "build",
+          "isDefault": true
+        },
+        "presentation": {
+            "reveal": "always",
+            "panel": "shared",
+            "clear": false,
+            "focus": true
+         },
+        "problemMatcher": [],
+        "detail": "Run the custom Makefile to build the project."
+      }
+    ]
+  }

CMakeLists.txt

@@ -6,19 +6,19 @@ project(GROK)
 # GROK version
 set(GROK_VERSION_MAJOR 14)
 set(GROK_VERSION_MINOR 2)
-set(GROK_VERSION_BUILD 0)
+set(GROK_VERSION_PATCH 0)
 set(GROK_VERSION
-  "${GROK_VERSION_MAJOR}.${GROK_VERSION_MINOR}.${GROK_VERSION_BUILD}")
+  "${GROK_VERSION_MAJOR}.${GROK_VERSION_MINOR}.${GROK_VERSION_PATCH}")
 set(PACKAGE_VERSION
-  "${GROK_VERSION_MAJOR}.${GROK_VERSION_MINOR}.${GROK_VERSION_BUILD}")
+  "${GROK_VERSION_MAJOR}.${GROK_VERSION_MINOR}.${GROK_VERSION_PATCH}")
 
 # As autotools does not support X.Y notation for SOVERSION, we have to use
 # two different versions, one for Grok itself and one for its .so
 if(NOT GROK_SOVERSION)
   set(GROK_SOVERSION 1)
 endif(NOT GROK_SOVERSION)
 set(GROK_LIBRARY_PROPERTIES
-  VERSION   "${GROK_VERSION_MAJOR}.${GROK_VERSION_MINOR}.${GROK_VERSION_BUILD}"
+  VERSION   "${GROK_VERSION_MAJOR}.${GROK_VERSION_MINOR}.${GROK_VERSION_PATCH}"
   SOVERSION "${GROK_SOVERSION}"
 )
 #######################################
@@ -213,9 +213,25 @@ endif()
 
 # install all targets referenced as GrokTargets
 if (BUILD_SHARED_LIBS AND NOT CMAKE_SYSTEM_NAME STREQUAL Emscripten)
-install(EXPORT GrokTargets DESTINATION ${GROK_INSTALL_PACKAGE_DIR})
+  # Install the GrokTargets file
+  install(EXPORT GrokTargets
+          DESTINATION ${GROK_INSTALL_PACKAGE_DIR}
+          NAMESPACE GROK::)
+
+  # Generate the GrokConfig.cmake file
+  include(CMakePackageConfigHelpers)
+  configure_package_config_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GrokConfig.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/GrokConfig.cmake
+    INSTALL_DESTINATION ${GROK_INSTALL_PACKAGE_DIR}
+    PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
+
+  # Install the GrokConfig.cmake file
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GrokConfig.cmake
+          DESTINATION ${GROK_INSTALL_PACKAGE_DIR})
 endif()
 
+
 if(GRK_BUILD_DOC)
    install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif()

README.md

@@ -13,7 +13,6 @@
 ### Features
 
 * support for High Throughput JPEG 2000 (HTJ2K) encode/decode
-* fast random-access sub-image decoding using `TLM` markers
 * full encode/decode support for `ICC` colour profiles
 * full encode/decode support for `XML`,`IPTC`, `XMP` and `EXIF` meta-data
 * full encode/decode support for `monochrome`, `sRGB`, `palette`, `YCC`, `extended YCC`, `CIELab` and `CMYK` colour spaces

cmake/GrokCPack.cmake

@@ -8,7 +8,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   endif()
 
   set(GROK_PACKAGEDESCRIPTION_SUMMARY "Grok JPEG 2000 Toolkit")
-  set(GROK_PACKAGECONTACT "boxerab@protonmail.com")
+  set(GROK_PACKAGECONTACT "support@grokcompression.com")
 
   set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${GROK_PACKAGEDESCRIPTION_SUMMARY})
   set(CPACK_PACKAGE_VENDOR           "Grok Image Compression Inc.")
@@ -19,7 +19,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   set(CPACK_RESOURCE_FILE_LICENSE    "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
   set(CPACK_PACKAGE_VERSION_MAJOR    "${GROK_VERSION_MAJOR}")
   set(CPACK_PACKAGE_VERSION_MINOR    "${GROK_VERSION_MINOR}")
-  set(CPACK_PACKAGE_VERSION_PATCH    "${GROK_VERSION_BUILD}")
+  set(CPACK_PACKAGE_VERSION_PATCH    "${GROK_VERSION_PATCH}")
   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Grok ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
   set(CPACK_SOURCE_PACKAGE_FILE_NAME  "Grok-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 

cmake/GrokConfig.cmake.in

@@ -0,0 +1,51 @@
+#-----------------------------------------------------------------------------
+#
+# GrokConfig.cmake - CMake configuration file for external projects.
+#
+# This file is configured by Grok and used to load Grok's settings for external projects.
+@PACKAGE_INIT@
+
+# The Grok version number
+set(Grok_VERSION_MAJOR "@GROK_VERSION_MAJOR@")
+set(Grok_VERSION_MINOR "@GROK_VERSION_MINOR@")
+set(Grok_VERSION_PATCH "@GROK_VERSION_PATCH@")
+set(Grok_VERSION "@GROK_VERSION_MAJOR@.@GROK_VERSION_MINOR@.@GROK_VERSION_PATCH@")
+
+# The libraries
+set(Grok_LIBRARIES "GROK::@GROK_CORE_NAME@" "GROK::@GROK_CODEC_NAME@")
+
+# CMake macros directory
+set(Grok_CMAKE_DIR "@GROK_INSTALL_PACKAGE_DIR@")
+
+# Configuration options
+set(Grok_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
+
+# Determine the prefix directory
+set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@")
+
+# Detect install or build tree
+get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+if(EXISTS "${SELF_DIR}/GrokTargets.cmake")
+    # Install tree
+    include("${SELF_DIR}/GrokTargets.cmake")
+
+    # Include directories
+    set(Grok_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@GROK_INSTALL_SUBDIR@")
+
+elseif(EXISTS "${SELF_DIR}/GrokExports.cmake")
+    # Build tree
+    include("${SELF_DIR}/GrokExports.cmake")
+
+    # Include directories for build tree
+    set(Grok_INCLUDE_DIRS "@GROK_INCLUDE_PATH@")
+
+else()
+    # Error if neither install nor build tree targets are found
+    message(FATAL_ERROR
+        "Could not find GrokTargets.cmake (install tree) or GrokExports.cmake (build tree). "
+        "Ensure Grok is built and installed correctly.")
+endif()
+
+# Backward compatibility variables
+set(Grok_FOUND TRUE)
+