Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Improve logging for errors in masking during feature extraction #3034

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
ahojnnes merged 13 commits into from
Dec 18, 2024
Merged

Improve logging for errors in masking during feature extraction #3034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
86fc44f
Improve Masking Logging
Ambrosiussen Dec 12, 2024
2ff40e9
Update src/colmap/controllers/feature_extraction.cc
Ambrosiussen Dec 12, 2024
9a1107d
Update src/colmap/controllers/image_reader.cc
Ambrosiussen Dec 12, 2024
28e2f69
Also add logging for camera mask
Ambrosiussen Dec 12, 2024
5d68ee7
Merge branch 'main' into main
ahojnnes Dec 12, 2024
ed32a67
Fix formatting
Ambrosiussen Dec 12, 2024
6fe1854
Add check for mask path trailing slashes
Ambrosiussen Dec 12, 2024
37328ec
formatting
Ambrosiussen Dec 12, 2024
f202c4e
Merge branch 'main' into main
ahojnnes Dec 12, 2024
de12b89
fix naming issue
Ambrosiussen Dec 12, 2024
47e8dea
Fix bool check on string
Ambrosiussen Dec 12, 2024
c03c58f
Merge branch 'main' into main
ahojnnes Dec 13, 2024
423ad25
Merge branch 'main' into main
sarlinpe Dec 18, 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
22 changes: 15 additions & 7 deletions src/colmap/controllers/feature_extraction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,9 @@ class FeatureWriterThread : public Thread {
image_data.camera.has_prior_focal_length ? " (Prior)" : "");
LOG(INFO) << StringPrintf(" Features: %d",
image_data.keypoints.size());
if (image_data.mask.Data()) {
LOG(INFO) << " Mask: Yes";
}

DatabaseTransaction database_transaction(database_);

Expand Down Expand Up @@ -329,13 +332,18 @@ class FeatureExtractorController : public Thread {

std::shared_ptr<Bitmap> camera_mask;
if (!reader_options_.camera_mask_path.empty()) {
camera_mask = std::make_shared<Bitmap>();
if (!camera_mask->Read(reader_options_.camera_mask_path,
/*as_rgb*/ false)) {
LOG(ERROR) << "Cannot read camera mask file: "
<< reader_options_.camera_mask_path
<< ". No mask is going to be used.";
camera_mask.reset();
if (ExistsFile(reader_options_.camera_mask_path)) {
camera_mask = std::make_shared<Bitmap>();
if (!camera_mask->Read(reader_options_.camera_mask_path,
/*as_rgb*/ false)) {
LOG(ERROR) << "Failed to read invalid mask file at: "
<< reader_options_.camera_mask_path
<< ". No mask is going to be used.";
camera_mask.reset();
}
} else {
LOG(ERROR) << "Mask at " << reader_options_.camera_mask_path
<< " does not exist.";
}
}

Expand Down
13 changes: 10 additions & 3 deletions src/colmap/controllers/image_reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ ImageReader::ImageReader(const ImageReaderOptions& options, Database* database)
// Ensure trailing slash, so that we can build the correct image name.
options_.image_path =
EnsureTrailingSlash(StringReplace(options_.image_path, "\\", "/"));
options_.mask_path =
EnsureTrailingSlash(StringReplace(options_.mask_path, "\\", "/"));
if (!options_.mask_path.empty()) {
options_.mask_path =
EnsureTrailingSlash(StringReplace(options_.mask_path, "\\", "/"));
}

// Get a list of all files in the image path, sorted by image name.
if (options_.image_list.empty()) {
Expand Down Expand Up @@ -146,7 +148,12 @@ ImageReader::Status ImageReader::Next(Camera* camera,
if (mask && !options_.mask_path.empty()) {
const std::string mask_path =
JoinPaths(options_.mask_path, image->Name() + ".png");
if (ExistsFile(mask_path) && !mask->Read(mask_path, false)) {
if (!ExistsFile(mask_path)) {
LOG(ERROR) << "Mask at " << mask_path << " does not exist.";
return Status::MASK_ERROR;
}
if (!mask->Read(mask_path, false)) {
LOG(ERROR) << "Failed to read invalid mask file at: " << mask_path;
return Status::MASK_ERROR;
}
}
Expand Down
Loading