fix segfautl

main
Xiao Song 3 years ago
parent 546456df9e
commit 396931477f

@ -43,9 +43,8 @@ endif()
# library # library
include_directories( include ) include_directories( include )
# Build runtime load dynamic shared library # all source files
# https://cmake.org/cmake/help/latest/command/add_library.html set( src_files
add_library(${PROJECT_NAME} SHARED
src/align.cpp src/align.cpp
src/bayer_image.cpp src/bayer_image.cpp
src/burst.cpp src/burst.cpp
@ -53,6 +52,10 @@ add_library(${PROJECT_NAME} SHARED
src/hdrplus_pipeline.cpp src/hdrplus_pipeline.cpp
src/merge.cpp ) src/merge.cpp )
# Build runtime load dynamic shared library
# https://cmake.org/cmake/help/latest/command/add_library.html
add_library(${PROJECT_NAME} SHARED ${src_files} )
# and link it # and link it
# https://cmake.org/cmake/help/v3.0/command/target_link_libraries.html # https://cmake.org/cmake/help/v3.0/command/target_link_libraries.html
# use public interace because our .h / .hpp file include opencv .h / .hpp file # use public interace because our .h / .hpp file include opencv .h / .hpp file
@ -71,17 +74,14 @@ target_link_libraries( demo
# unit test # unit test
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/tests ) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/tests )
add_executable( test_bayer_image add_executable( test_bayer_image tests/test_bayer_image.cpp)
tests/test_bayer_image.cpp )
target_link_libraries( test_bayer_image target_link_libraries( test_bayer_image
${PROJECT_NAME} ) ${PROJECT_NAME} )
add_executable( test_utility add_executable( test_utility tests/test_utility.cpp )
tests/test_utility.cpp )
target_link_libraries( test_utility target_link_libraries( test_utility
${PROJECT_NAME} ) ${PROJECT_NAME} )
add_executable( test_burst add_executable( test_burst tests/test_burst.cpp )
tests/test_burst.cpp )
target_link_libraries( test_burst target_link_libraries( test_burst
${PROJECT_NAME} ) ${PROJECT_NAME} )

@ -35,6 +35,7 @@
```shell ```shell
mkdir build mkdir build
cd build cd build
# Default release build will be used
cmake .. cmake ..
make -j 10 make -j 10
``` ```

@ -1,3 +1,16 @@
# HDR+ # HDR+
> HDR+ Paper reimplementation > HDR+ Paper reimplementation
>
> UC Berkeley Spring 2022 CS184/284A Final Project > UC Berkeley Spring 2022 CS184/284A Final Project
## File Content Overview
```shell
tests/ # unit test file
src/ # implementation
include/ # header file
bin/demo.cpp # demo to run HDR+ pipeline
```

@ -32,10 +32,11 @@ bayer_image::bayer_image( const std::string& bayer_image_path )
width = int( libraw_processor->imgdata.rawdata.sizes.raw_width ); width = int( libraw_processor->imgdata.rawdata.sizes.raw_width );
height = int( libraw_processor->imgdata.rawdata.sizes.raw_height ); height = int( libraw_processor->imgdata.rawdata.sizes.raw_height );
white_level = int( libraw_processor->imgdata.rawdata.color.maximum ); white_level = int( libraw_processor->imgdata.rawdata.color.maximum );
black_level_per_channel[ 0 ] = int( libraw_processor->imgdata.rawdata.color.cblack[ 0 ] + libraw_processor->imgdata.rawdata.color.black ); black_level_per_channel.resize( 4 );
black_level_per_channel[ 1 ] = int( libraw_processor->imgdata.rawdata.color.cblack[ 1 ] + libraw_processor->imgdata.rawdata.color.black ); black_level_per_channel.at( 0 ) = int( libraw_processor->imgdata.rawdata.color.cblack[ 0 ] + libraw_processor->imgdata.rawdata.color.black );
black_level_per_channel[ 2 ] = int( libraw_processor->imgdata.rawdata.color.cblack[ 2 ] + libraw_processor->imgdata.rawdata.color.black ); black_level_per_channel.at( 1 ) = int( libraw_processor->imgdata.rawdata.color.cblack[ 1 ] + libraw_processor->imgdata.rawdata.color.black );
black_level_per_channel[ 3 ] = int( libraw_processor->imgdata.rawdata.color.cblack[ 3 ] + libraw_processor->imgdata.rawdata.color.black ); black_level_per_channel.at( 2 ) = int( libraw_processor->imgdata.rawdata.color.cblack[ 2 ] + libraw_processor->imgdata.rawdata.color.black );
black_level_per_channel.at( 3 ) = int( libraw_processor->imgdata.rawdata.color.cblack[ 3 ] + libraw_processor->imgdata.rawdata.color.black );
iso = float( libraw_processor->imgdata.other.iso_speed ); iso = float( libraw_processor->imgdata.other.iso_speed );
// Create CV mat // Create CV mat

@ -0,0 +1,7 @@
# Test
```shell
# ray image
./test_bayer_image ../dataset/33TJ_20150606_224837_294/payload_N000.dng
```
Loading…
Cancel
Save