8000 Fully encapsulate freeimage in bitmap library (#2332) by ahojnnes · Pull Request #2334 · colmap/colmap · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
< 8000 diff-file-filter>

Fully encapsulate freeimage in bitmap library (#2332) #2334

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
merged 1 commit into from
Jan 8, 2024
Merged

Fully encapsulate freeimage in bitmap library (#2332) #2334

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
4 changes: 3 additions & 1 deletion src/colmap/mvs/fusion.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,9 @@ void StereoFusion::InitFusedPixelMask(int image_idx,
if (!options_.mask_path.empty() && ExistsFile(mask_path) &&
mask.Read(mask_path, false)) {
BitmapColor<uint8_t> color;
mask.Rescale(static_cast<int>(width), static_cast<int>(height), FILTER_BOX);
mask.Rescale(static_cast<int>(width),
static_cast<int>(height),
Bitmap::RescaleFilter::kBox);
for (size_t row = 0; row < height; ++row) {
for (size_t col = 0; col < width; ++col) {
mask.GetPixel(col, row, &color);
Expand Down
6 changes: 4 additions & 2 deletions src/colmap/sensor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,18 @@ COLMAP_ADD_LIBRARY(
PUBLIC_LINK_LIBS
Ceres::ceres
Eigen3::Eigen
freeimage::FreeImage
PRIVATE_LINK_LIBS
colmap_util
colmap_vlfeat
freeimage::FreeImage
)

COLMAP_ADD_TEST(
NAME bitmap_test
SRCS bitmap_test.cc
LINK_LIBS colmap_sensor
LINK_LIBS
colmap_sensor
freeimage::FreeImage
)
COLMAP_ADD_TEST(
NAME database_test
Expand Down
Loading
0