Skip to content
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

Output color space in ACES or ACEScg #1169

Merged
merged 9 commits into from
Apr 27, 2022
Merged

Output color space in ACES or ACEScg #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bbebbf1
* Temporary bugfix regarding boost through vcpkg (src/CMakeLists.txt)
demoulinv Apr 21, 2022
f2613cb
Set sRGB-Linear as the reference linear space in config.ocio
demoulinv Apr 25, 2022
aa6960f
Add reference to an environment variable ALICEVISION_ROOT to access c…
demoulinv Apr 25, 2022
87a9627
Update installation doc.
demoulinv Apr 25, 2022
b266300
Update src/software/pipeline/main_cameraInit.cpp
demoulinv Apr 26, 2022
27deb50
Update src/software/pipeline/main_cameraInit.cpp
demoulinv Apr 26, 2022
f0fd559
Complete throwing replacement with warning if cameraSensors filepath …
demoulinv Apr 26, 2022
907889a
[Docker] Updates
demoulinv Apr 26, 2022
77bcf7b
[Write image]
demoulinv Apr 27, 2022
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: 6 additions & 0 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,3 +427,9 @@ To retrieve the generated files:
# Create an instance of the image, copy the files and remove the temporary docker instance.
CID=$(docker create alicevision:centos7-cuda9.2) && docker cp ${CID}:/opt/AliceVision_install . && docker cp ${CID}:/opt/AliceVision_bundle . && docker rm ${CID}
```

Environment variable
--------------------

Whatever the way AliceVision has been installed, before using it, an environment variable named ALICEVISION_ROOT must be created and set with the local installation directory.

5 changes: 2 additions & 3 deletions docker/Dockerfile_centos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,5 @@ RUN make -j"$(nproc)" && \
make install && \
make bundle && \
rm -rf "${AV_DEV}" "${AV_BUILD}" && \
echo "export ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh


echo "export ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh && \
echo "export ALICEVISION_ROOT=${AV_BUNDLE}" >> /etc/profile.d/alicevision.sh
10 changes: 6 additions & 4 deletions docker/Dockerfile_ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com"
ENV AV_DEV=/opt/AliceVision_git \
AV_BUILD=/tmp/AliceVision_build \
AV_INSTALL=/opt/AliceVision_install \
AV_BUNDLE=/opt/AliceVision_bundle \
PATH="${PATH}:${AV_BUNDLE}" \
VERBOSE=1

Expand All @@ -52,7 +53,8 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release \
-DALICEVISION_BUILD_DOC:BOOL=OFF \
-DALICEVISION_BUILD_EXAMPLES:BOOL=OFF \
"${AV_DEV}" && \
make install -j"$(nproc)" && \
rm -rf "${AV_BUILD}" "${AV_DEV}" && \
echo "export ALICEVISION_SENSOR_DB=${AV_INSTALL}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh

make install -j"$(nproc)" && \
make bundle && \
rm -rf "${AV_BUILD}" "${AV_DEV}" && \
echo "export ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh && \
echo "export ALICEVISION_ROOT=${AV_BUNDLE}" >> /etc/profile.d/alicevision.sh
11 changes: 9 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,15 @@ else()
message(SEND_ERROR "${Boost_ERROR_REASON}")
endif()

# Disable BOOST autolink
add_definitions(-DBOOST_ALL_NO_LIB)

if(WIN32)
# Disable BOOST autolink
add_definitions(-DBOOST_ALL_NO_LIB)

#To be removed later, a bug to make things work with current vcpkg
#https://github.com/microsoft/vcpkg/issues/22495
add_definitions(-DBOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN7)
endif()

if(BUILD_SHARED_LIBS)
# Force BOOST to use dynamic libraries (avoid link error with boost program_options)
Expand Down
3 changes: 3 additions & 0 deletions src/aliceVision/image/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ alicevision_add_library(aliceVision_image
${OPENEXR_INCLUDE_DIR}
)

# Install config.ocio
install(FILES config.ocio DESTINATION ${CMAKE_INSTALL_DATADIR}/aliceVision)

# Unit tests
alicevision_add_test(image_test.cpp NAME "image" LINKS aliceVision_image)
alicevision_add_test(io_test.cpp NAME "image_io" LINKS aliceVision_image)
Expand Down
Loading