Skip to content

v2 - rename rawtoaces_idt to rawtoaces_core #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antond-weta merged 1 commit into from
Aug 19, 2025
Merged

v2 - rename rawtoaces_idt to rawtoaces_core #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)
project( RAWTOACES )

if( NOT DEFINED CMAKE_CXX_STANDARD )
Expand All @@ -11,7 +11,7 @@ set( RAWTOACES_MINOR_VERSION 1 )
set( RAWTOACES_PATCH_VERSION 0 )
set( RAWTOACES_VERSION ${RAWTOACES_MAJOR_VERSION}.${RAWTOACES_MINOR_VERSION}.${RAWTOACES_PATCH_VERSION} )

set(RAWTOACESIDTLIB "rawtoaces_idt")
set(RAWTOACES_CORE_LIB "rawtoaces_core")
set(RAWTOACESLIB "rawtoaces_util")

set( CMAKE_MACOSX_RPATH 1 )
Expand Down Expand Up @@ -77,7 +77,7 @@ include ( configure.cmake )
## Build

add_definitions( -DPACKAGE="RAWTOACES" -DVERSION="${RAWTOACES_VERSION}" )
add_subdirectory("src/${RAWTOACESIDTLIB}")
add_subdirectory("src/${RAWTOACES_CORE_LIB}")
add_subdirectory("src/${RAWTOACESLIB}")
add_subdirectory("src/rawtoaces")

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ To build `rawtoaces` you would need to satisfy these dependencies:

| Library | Min Version| Purpose | Link to installation instruction |
| ------- | -----------| -------- | -------------------------------- |
| `cmake` | `3.11` | | [CMake download](https://cmake.org/download/)|
| `cmake` | `3.12` | | [CMake download](https://cmake.org/download/)|
| `ceres` | `1.12.0` | Ceres Solver is an open source library for solving Non-linear Least Squares problems with bounds constraints and unconstrained optimization problems. It processes non-linear regression for rawtoaces. | [Ceres Solver installation](http://ceres-solver.org/installation.html)|
| `imath` | `3.1.8` | Provides the half data type used for representing 16-bit floating-point values. It's used by rawtoaces for storing high dynamic range (HDR) data in a compact format. | [Imath installation](https://imath.readthedocs.io/en/latest/install.html#install)|
| `libraw` | `0.19.4` | LibRaw is a library that processes RAW files from digital cameras. It handles image pre-processing for rawtoaces. | [LibRaw download](http://www.libraw.org/download) |
Expand Down Expand Up @@ -112,7 +112,7 @@ $ cmake --build build
$ sudo cmake --install build # Optional if you want it to be accessible system wide
```

The default process will install `librawtoaces_idt_${rawtoaces_version}.dylib` and `librawtoaces_util_${rawtoaces_version}.dylib` to `/usr/local/lib`, a few header files to `/usr/local/include/rawtoaces` and a number of data files into `/usr/local/include/rawtoaces/data`.
The default process will install `librawtoaces_core_${rawtoaces_version}.dylib` and `librawtoaces_util_${rawtoaces_version}.dylib` to `/usr/local/lib`, a few header files to `/usr/local/include/rawtoaces` and a number of data files into `/usr/local/include/rawtoaces/data`.

#### Docker

Expand Down
2 changes: 1 addition & 1 deletion include/rawtoaces/acesrender.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _ACESRENDER_h__
#define _ACESRENDER_h__

#include <rawtoaces/rta.h>
#include <rawtoaces/rawtoaces_core.h>

#include <unordered_map>
#include <libraw/libraw.h>
Expand Down
0 include/rawtoaces/rta.h → include/rawtoaces/rawtoaces_core.h
View file
Open in desktop
Copy link
Contributor

@soswow soswow Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is that a breaking change? I don't fully understand how it all works, but it is possible someone has rawtoaces/rta.h import in their project?

Do we want make it breaking (because we will bump the version?) Or we want capability to stay for now?

In which case I understand this file has to stay as

// Compatibility header for legacy includes. Will be removed in a future release.

#pragma once

#if defined(_MSC_VER)
#pragma message("rawtoaces: <rawtoaces/rta.h> is deprecated; use <rawtoaces/rawtoaces_core.h>")
#else
#warning "rawtoaces: <rawtoaces/rta.h> is deprecated; use <rawtoaces/rawtoaces_core.h>"
#endif

#include <rawtoaces/rawtoaces_core.h>

File renamed without changes.
4 changes: 2 additions & 2 deletions src/rawtoaces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.12)

add_executable( rawtoaces
main.cpp
Expand All @@ -19,4 +19,4 @@ else ()
endif ()


install( TARGETS rawtoaces DESTINATION ${INSTALL_BIN_DIR} )
install( TARGETS rawtoaces DESTINATION ${INSTALL_BIN_DIR} )
32 changes: 16 additions & 16 deletions src/rawtoaces_idt/CMakeLists.txt → src/rawtoaces_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.12)
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )

set( IDT_PUBLIC_HEADER
set( CORE_PUBLIC_HEADER
../../include/rawtoaces/define.h
../../include/rawtoaces/mathOps.h
../../include/rawtoaces/rta.h
../../include/rawtoaces/rawtoaces_core.h
)

add_library( ${RAWTOACESIDTLIB} ${DO_SHARED}
rta.cpp
add_library( ${RAWTOACES_CORE_LIB} ${DO_SHARED}
rawtoaces_core.cpp

# Make the headers visible in IDEs. This should not affect the builds.
${IDT_PUBLIC_HEADER}
${CORE_PUBLIC_HEADER}
)

target_link_libraries(
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
PUBLIC
Boost::boost
Boost::system
Expand All @@ -25,26 +25,26 @@ target_link_libraries(
)

if ( ${Ceres_VERSION_MAJOR} GREATER 1 )
target_link_libraries( ${RAWTOACESIDTLIB} PUBLIC Ceres::ceres )
target_link_libraries( ${RAWTOACES_CORE_LIB} PUBLIC Ceres::ceres )
else ()
target_include_directories(${RAWTOACESIDTLIB} PUBLIC ${CERES_INCLUDE_DIRS})
target_link_libraries(${RAWTOACESIDTLIB} PUBLIC ${CERES_LIBRARIES})
target_include_directories(${RAWTOACES_CORE_LIB} PUBLIC ${CERES_INCLUDE_DIRS})
target_link_libraries(${RAWTOACES_CORE_LIB} PUBLIC ${CERES_LIBRARIES})
endif ()

target_include_directories( ${RAWTOACESIDTLIB} PUBLIC
target_include_directories( ${RAWTOACES_CORE_LIB} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
$<INSTALL_INTERFACE:./include>
)

set_target_properties( ${RAWTOACESIDTLIB} PROPERTIES
OUTPUT_NAME "rawtoaces_idt"
EXPORT_NAME "rawtoaces_idt"
PUBLIC_HEADER "${IDT_PUBLIC_HEADER}"
set_target_properties( ${RAWTOACES_CORE_LIB} PROPERTIES
OUTPUT_NAME "rawtoaces_core"
EXPORT_NAME "rawtoaces_core"
PUBLIC_HEADER "${CORE_PUBLIC_HEADER}"
SOVERSION ${RAWTOACES_MAJOR_VERSION}.${RAWTOACES_MINOR_VERSION}.${RAWTOACES_PATCH_VERSION}
VERSION ${RAWTOACES_VERSION}
)

install( TARGETS ${RAWTOACESIDTLIB}
install( TARGETS ${RAWTOACES_CORE_LIB}
EXPORT RAWTOACESTargets
LIBRARY DESTINATION ${INSTALL_LIB_DIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
Expand Down
2 changes: 1 addition & 1 deletion src/rawtoaces_idt/rta.cpp → src/rawtoaces_core/rawtoaces_core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright Contributors to the rawtoaces Project.

#include <rawtoaces/rta.h>
#include <rawtoaces/rawtoaces_core.h>
#include <rawtoaces/mathOps.h>

#include <boost/property_tree/ptree.hpp>
Expand Down
4 changes: 2 additions & 2 deletions src/rawtoaces_util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.12)
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )

set( UTIL_PUBLIC_HEADER
Expand All @@ -24,7 +24,7 @@ endif()

target_link_libraries ( ${RAWTOACESLIB}
PUBLIC
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
INTERFACE
Eigen3::Eigen
Imath::Imath
Expand Down
16 changes: 8 additions & 8 deletions unittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.12)

add_definitions (-DBOOST_TEST_DYN_LINK)

Expand All @@ -12,7 +12,7 @@ add_executable (
target_link_libraries(
Test_Spst
PUBLIC
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
Boost::unit_test_framework
)

Expand All @@ -28,7 +28,7 @@ add_executable (
target_link_libraries(
Test_IDT
PUBLIC
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
Boost::unit_test_framework
)

Expand All @@ -44,7 +44,7 @@ add_executable (
target_link_libraries(
Test_Illum
PUBLIC
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
Boost::unit_test_framework
)

Expand All @@ -60,7 +60,7 @@ add_executable (
target_link_libraries(
Test_DNGIdt
PUBLIC
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
Boost::unit_test_framework
)

Expand All @@ -84,7 +84,7 @@ add_executable (
target_link_libraries(
Test_Math
PUBLIC
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
Boost::unit_test_framework
)

Expand All @@ -100,7 +100,7 @@ add_executable (
target_link_libraries(
Test_Logic
PUBLIC
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
Boost::unit_test_framework
)

Expand All @@ -116,7 +116,7 @@ add_executable (
target_link_libraries(
Test_Misc
PUBLIC
${RAWTOACESIDTLIB}
${RAWTOACES_CORE_LIB}
Boost::unit_test_framework
)

Expand Down
2 changes: 1 addition & 1 deletion unittest/config_tests/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ add_executable( test_core
target_link_libraries(
test_core
PUBLIC
rawtoaces_idt
rawtoaces_core
Boost::boost
Boost::unit_test_framework
)
Expand Down
2 changes: 1 addition & 1 deletion unittest/config_tests/core/core_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <rawtoaces/define.h>
#include <rawtoaces/mathOps.h>
#include <rawtoaces/rta.h>
#include <rawtoaces/rawtoaces_core.h>

BOOST_AUTO_TEST_CASE( Test_InvertD )
{
Expand Down
3 changes: 2 additions & 1 deletion unittest/testDNGIdt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
#include <filesystem>
#include <boost/test/tools/floating_point_comparison.hpp>

#include <rawtoaces/rta.h>
#include <libraw/libraw.h>

#include <rawtoaces/rawtoaces_core.h>

using namespace std;
using namespace rta;
using namespace rta::core;
Expand Down
2 changes: 1 addition & 1 deletion unittest/testIDT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <boost/test/tools/floating_point_comparison.hpp>

#include <rawtoaces/mathOps.h>
#include <rawtoaces/rta.h>
#include <rawtoaces/rawtoaces_core.h>

using namespace std;
using namespace rta;
Expand Down
2 changes: 1 addition & 1 deletion unittest/testIllum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <boost/test/tools/floating_point_comparison.hpp>

#include <rawtoaces/mathOps.h>
#include <rawtoaces/rta.h>
#include <rawtoaces/rawtoaces_core.h>

#define DATA_PATH "../_deps/rawtoaces_data-src/data/"

Expand Down
2 changes: 1 addition & 1 deletion unittest/testSpst.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <boost/test/tools/floating_point_comparison.hpp>

#include <rawtoaces/mathOps.h>
#include <rawtoaces/rta.h>
#include <rawtoaces/rawtoaces_core.h>

#define DATA_PATH "../_deps/rawtoaces_data-src/data/"

Expand Down
Loading