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

Jump to bottom

[hdr] Upgrade on HDR brackets estimation #1751

Merged
merged 2 commits into from
Oct 11, 2024
Merged

[hdr] Upgrade on HDR brackets estimation #1751

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86631b0
Upgrade on HDR brackets estimation
servantftechnicolor Oct 1, 2024
8c67c38
[hdr] Brackets: Fix error C2679 on MSVC compilers
servantftechnicolor Oct 11, 2024
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
7 changes: 4 additions & 3 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ jobs:
meshroom_avBranch=$(git ls-remote --heads https://github.com/alicevision/Meshroom.git $GITHUB_HEAD_REF | cut -f 1)
if [ $meshroom_avBranch != "" ]; then git checkout $meshroom_avBranch; echo "Use Meshroom/$GITHUB_HEAD_REF"; fi
export MESHROOM_INSTALL_DIR=$PWD
export PYTHONPATH=$PWD:${PYTHONPATH}
export PYTHONPATH=$PWD:${ALICEVISION_ROOT}:${PYTHONPATH}
export PATH=$PATH:${ALICEVISION_ROOT}/bin
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
mkdir ./outputData
cd bin/
python3 --version
Expand All @@ -120,7 +120,8 @@ jobs:
cd SfM_quality_evaluation/
# checkout a specific commit to ensure repeatability
git checkout 36e3bf2d05c64d1726cb4a0e770923794f203f98
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
export PYTHONPATH=${ALICEVISION_ROOT}:${PYTHONPATH}
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
echo "ldd aliceVision_cameraInit"
ldd ${ALICEVISION_ROOT}/bin/aliceVision_cameraInit
python --version
Expand Down
13 changes: 12 additions & 1 deletion src/aliceVision/hdr/Brackets.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,19 @@
// v. 2.0. If a copy of the MPL was not distributed with this file,
// You can obtain one at https://mozilla.org/MPL/2.0/.


%include <aliceVision/hdr/brackets.hpp>

%{
#include <aliceVision/hdr/brackets.hpp>
%}

using namespace aliceVision;
using namespace aliceVision::hdr;
%}


%include "std_vector.i"

%template(vectorli) std::vector<aliceVision::hdr::LuminanceInfo>;
%template(vvectori) std::vector<std::vector<aliceVision::IndexT>>;

4 changes: 3 additions & 1 deletion src/aliceVision/hdr/Hdr.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@

%module (module="pyalicevision") hdr

%include <aliceVision/hdr/Brackets.i>
%include <aliceVision/global.i>
%include <aliceVision/hdr/Brackets.i>

Loading
Loading