Merge remote-tracking branch 'upstream/master' into random-fixes-2

Author: soswow

.github/workflows/ci.yml

@@ -41,7 +41,6 @@ jobs:
     env:
       CXX: ${{matrix.cxx_compiler}}
       CC: ${{matrix.cc_compiler}}
-      CMAKE_CXX_STANDARD: ${{matrix.cxx_std}}
       OPENEXR_VERSION: ${{matrix.openexr_ver}}
 
     steps:
@@ -74,6 +73,7 @@ jobs:
           -B build
           -S . 
           -D RTA_CENTOS7_CERES_HACK=ON
+          -D CMAKE_CXX_STANDARD=${{matrix.cxx_std}}
 
       - name: Build
         run: |
@@ -113,13 +113,13 @@ jobs:
           - desc: gcc11
             nametag: linux-vfx2024
             os: ubuntu-latest
-            container: aswf/ci-osl:2024-clang17
+            container: aswf/ci-osl:2024-clang17.2
             vfxyear: 2024
             cxx_std: 17
           - desc: clang17
             nametag: linux-vfx2024-clang17
             os: ubuntu-latest
-            container: aswf/ci-osl:2024-clang17
+            container: aswf/ci-osl:2024-clang17.2
             vfxyear: 2024
             cc_compiler: clang
             cxx_compiler: clang++
@@ -128,7 +128,6 @@ jobs:
     env:
       CXX: ${{matrix.cxx_compiler}}
       CC: ${{matrix.cc_compiler}}
-      CMAKE_CXX_STANDARD: ${{matrix.cxx_std}}
 
     steps:
       - uses: actions/checkout@v4
@@ -152,6 +151,7 @@ jobs:
         run: >
           cmake -B build -S .
           -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
+          -D CMAKE_CXX_STANDARD=${{matrix.cxx_std}}
 
       - name: Build
         run: |
@@ -168,6 +168,7 @@ jobs:
           -B build_config_test
           -S ./unittest/config_tests
           -D RAWTOACES_DIR=${{ github.workspace }}/install/lib/cmake/RAWTOACES
+          -D CMAKE_CXX_STANDARD=${{matrix.cxx_std}}
 
       - name: Build config_tests
         run: >
@@ -246,7 +247,7 @@ jobs:
           -B build
           -S ${{ github.workspace }}
           -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
-          -D CXX_STANDARD=C++17
+          -D CMAKE_CXX_STANDARD=17
           -D CMAKE_TOOLCHAIN_FILE="${{ matrix.toolchain_file }}"
           -D ENABLE_SHARED="${{ matrix.build_shared_libs }}"
           
@@ -268,6 +269,7 @@ jobs:
           -S ${{ github.workspace }}/unittest/config_tests
           -D RAWTOACES_DIR=${{ github.workspace }}/install/lib/cmake/RAWTOACES
           -D CMAKE_TOOLCHAIN_FILE="${{ matrix.toolchain_file }}"
+          -D CMAKE_CXX_STANDARD=17
 
       - name: Build config_tests
         run: >

CMakeLists.txt

@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.11)
 project( RAWTOACES )
 
+if( NOT DEFINED CMAKE_CXX_STANDARD )
+  set(CMAKE_CXX_STANDARD 17)
+endif()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 set( RAWTOACES_MAJOR_VERSION 1 )
 set( RAWTOACES_MINOR_VERSION 1 )
 set( RAWTOACES_PATCH_VERSION 0 )
@@ -18,8 +23,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 endif()
 
 if (NOT CONFIGURED_ONCE)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${warnings}")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${warnings}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${warnings}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${warnings}")
 endif()
 
 ## Make install directories overridable

README.md

@@ -65,7 +65,8 @@ $ sudo apt-get -f cmake
 $ build_scripts/install_aces_container.bash
 $ sudo apt-get -f install \
     libimath-dev \
-    libboost-dev libboost-filesystem-dev \
+    libboost-dev \
+    libboost-system-dev \
     libboost-test-dev \
     libraw-dev libceres-dev
 ```
@@ -94,7 +95,6 @@ $ vcpkg install \
     imath:x64-windows \
     boost-system:x64-windows \
     boost-foreach:x64-windows \
-    boost-filesystem:x64-windows \
     boost-test:x64-windows \
     boost-property-tree:x64-windows
 ```

build_scripts/install_deps_linux.bash

@@ -6,6 +6,7 @@ time sudo apt-get update
 
 time sudo apt-get -q -f install -y \
     libimath-dev \
-    libboost-dev libboost-filesystem-dev \
+    libboost-dev \
+    libboost-system-dev \
     libboost-test-dev \
     libraw-dev libceres-dev

build_scripts/install_deps_windows.bash

@@ -8,6 +8,5 @@ vcpkg install \
     imath:x64-windows \
     boost-system:x64-windows \
     boost-foreach:x64-windows \
-    boost-filesystem:x64-windows \
     boost-test:x64-windows \
     boost-property-tree:x64-windows

config/RAWTOACESConfig.cmake.in

@@ -13,6 +13,6 @@ find_dependency ( Eigen3 )
 find_dependency ( Ceres )
 find_dependency ( libraw )
 find_dependency ( Imath )
-find_dependency ( Boost COMPONENTS system filesystem )
+find_dependency ( Boost COMPONENTS system )
 
 check_required_components(rawtoaces)

configure.cmake

@@ -6,10 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake"
 find_package ( AcesContainer CONFIG REQUIRED )
 find_package ( Eigen3        CONFIG REQUIRED )
 find_package ( Imath         CONFIG REQUIRED )
-find_package ( Boost                REQUIRED
+find_package ( Boost         CONFIG REQUIRED
     COMPONENTS
         system
-        filesystem
         unit_test_framework
 )
 

docs/CHANGES.md

@@ -0,0 +1,20 @@
+Release 1.1.0 (August 11 2025) -- compared to 1.0.0
+--------------------------------------------------------
+- *feat*: Implement custom matrix mode [#109](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/109)
+- *fix*: Incorrect XYZ to ACES matrix [#108](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/108)
+- *fix*: Build issues with libraw 0.20.0 [#120](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/120), [#127](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/127) 
+- *fix*: Remove hardcoded path [#133](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/133)
+- *fix*: Fix math error in matrix multiplication [#135](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/135)
+- *admin*: The codebase has been re-licenced to the Apache licence v2.0 [#147](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/147)
+- *admin*: The data files have been split into a separate repository [#149](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/149), [#113](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/113)
+- *admin*: Switch from AMPAS_DATA_PATH to RAWTOACES_DATA_PATH environment variable [#156](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/156)
+- *docs*: various changes to README.md [#107](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/107), [#110](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/110), [#119](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/119), [#145](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/145), [#148](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/148), [#152](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/152)
+- *ci*: various changes and fixes to the CI runners [#129](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/129), [#130](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/130), [#132](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/132), [#140](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/140), [#146](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/146)
+- *build*: Add docker container [#118](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/118), [#131](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/131), [#142](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/142)
+- *build*: various changes and fixes to the cmake scripts [#96](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/96), [#128](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/128), [#151](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/151), [#153](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/153), [#154](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/154), [#158](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/158)
+- *build*: clang-format [#126](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/126)
+- *build*: headers cleanup [#134](https://github.com/AcademySoftwareFoundation/rawtoaces/pull/134)
+
+Release 1.0.0 (November 7 2017)
+--------------------------------------------------------
+- Initial release of rawtoaces

docs/CREDITS.md

@@ -0,0 +1,21 @@
+This is a list of all the contributors to rawtoaces, sorted alphabetically
+by first name.
+
+- Aleksandr Motsjonov (@soswow)
+- Alexander Forsythe (@aforsythe)
+- Anton Dukhovnikov (@antond-weta)
+- Jean-Francois Panisset (@jfpanisset)
+- Joel Brun (@joelBrun)
+- Jonathan Chang (@jonchang)
+- Johathon Irons (@agentirons)
+- Kimball Thurston (@kdt3rd)
+- Miaoqi Zhu (@miaoqi)
+- Mikael Sundell (@mikaelsundell)
+- Reto (@retokromer)
+- Scott Dyer (@scottdyer)
+- Sean Cooper (@scoopxyz)
+- Shiva Patre (@spatre)
+- Thomas Mansencal (@KelSolaar)
+- @andyp6
+- @kisakata
+- @splidje

include/rawtoaces/acesrender.h

@@ -7,6 +7,7 @@
 #include <rawtoaces/rta.h>
 
 #include <unordered_map>
+#include <libraw/libraw.h>
 
 using namespace rta;
 
@@ -72,7 +73,7 @@ class AcesRender
     const AcesRender &operator=( const AcesRender &acesrender );
 
     char                     *_pathToRaw;
-    Idt                      *_idt;
+    core::Idt                *_idt;
     libraw_processed_image_t *_image;
     LibRawAces               *_rawProcessor;