Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ geometry:

# Enable field line pixel refinement.
# Disable in cluttered environments when the geometry calibration has failed multiple times in a row.
#refinement: true
#refinement: false

# Minimum brightness difference to surrounding pixels for the classification as field line pixel (0 - 255)
#field_line_threshold: 5
Expand Down
2 changes: 1 addition & 1 deletion proto
2 changes: 1 addition & 1 deletion src/Resources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Resources::Resources(const std::string& configPath) : fieldReference(), configPa
cameraAmount = geometry["camera_amount"].as<int>(1);
cameraHeight = geometry["camera_height"].as<double>(0.0);
lineCorners = geometry["line_corners"].as<std::vector<Eigen::Vector2f>>(std::vector<Eigen::Vector2f>());
geometryRefinement = geometry["refinement"].as<bool>(true);
geometryRefinement = geometry["refinement"].as<bool>(false);
fieldLineThreshold = geometry["field_line_threshold"].as<int>(5);
minLineSegmentLength = geometry["min_line_segment_length"].as<double>(10.0);
maxLineSegmentOffset = geometry["max_line_segment_offset"].as<double>(10.0);
Expand Down
2 changes: 1 addition & 1 deletion src/driver/spinnakerdriver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ void SpinnakerDriver::selectPixelFormat() {
try {
pCam->PixelFormat.FromString(entry.c_str());
} catch (Spinnaker::Exception &e) {
FATAL("Could not select pixel format " << entry << ": " << e.GetErrorMessage());
WARN("Could not select pixel format " << entry << ": " << e.GetErrorMessage());
}
// "BayerRG8" style entries name the Bayer pattern, Raw8 cameras report it separately
std::string pattern;
Expand Down
1 change: 1 addition & 0 deletions src/opencl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ static inline cl::Buffer clAlloc(cl_mem_flags type, cl::size_type size, void* da
#define MINIMUM_ALIGNMENT 4096

static std::shared_ptr<void> hostAlloc(int size) {
size = (size + MINIMUM_ALIGNMENT-1)/MINIMUM_ALIGNMENT * MINIMUM_ALIGNMENT;
return {aligned_alloc(MINIMUM_ALIGNMENT, size), [size](void* ptr) {
munlock(ptr, size);
free(ptr);
Expand Down
Loading