Skip to content

Commit

Permalink
fixed cv constants and pcl dependency on cpp14
Browse files Browse the repository at this point in the history
  • Loading branch information
danielgehrig18 committed Aug 26, 2020
1 parent 91243c3 commit ada6795
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions event_camera_simulator/esim_visualization/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ project(esim_visualization)

find_package(catkin_simple REQUIRED)
catkin_simple()
set(CMAKE_CXX_STANDARD 14)


# This macro ensures modules and global scripts declared therein get installed
# See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void AdaptiveSamplingBenchmarkPublisher::imageCallback(const ImagePtrVector& ima

if(image_index_ == 0)
{
static const std::vector<int> compression_params = {CV_IMWRITE_PNG_COMPRESSION, 0};
static const std::vector<int> compression_params = {cv::IMWRITE_PNG_COMPRESSION, 0};

std::stringstream ss;
ss << ze::joinPath(FLAGS_adaptive_sampling_benchmark_folder, "image_");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ SyntheticOpticFlowPublisher::~SyntheticOpticFlowPublisher()
std::string path_timestamps_neg = ze::joinPath(output_folder_, "event_time_stamps_neg.png");

std::vector<int> compression_params;
compression_params.push_back(CV_IMWRITE_PNG_COMPRESSION);
compression_params.push_back(cv::IMWRITE_PNG_COMPRESSION);
compression_params.push_back(0);

cv::imwrite(path_event_count_image, event_count_image, compression_params);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void Object::draw(Time t, bool is_first_layer)
canvas_,
M_10,
canvas_.size(),
CV_INTER_LINEAR,
cv::INTER_LINEAR,
border_mode);

cv::Matx<FloatType, 3, 3> SS = dM10_dt * M_10.inv();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void PanoramaRenderer::render(const Transformation& T_W_C, const ImagePtr& out_i
}
}

cv::remap(texture_, *out_image, map_x_, map_y_, CV_INTER_LINEAR, cv::BORDER_REFLECT_101);
cv::remap(texture_, *out_image, map_x_, map_y_, cv::INTER_LINEAR, cv::BORDER_REFLECT_101);

if(out_depthmap)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void PlanarRenderer::render(const Transformation& T_W_C, const ImagePtr& out_ima
int border = (extend_border_) ? cv::BORDER_REFLECT : cv::BORDER_CONSTANT;
{
auto t = timers_planar_renderer[TimerPlanarRenderer::remap].timeScope();
cv::remap(texture_, *out_image, map_x_, map_y_, CV_INTER_LINEAR, border, 0.8);
cv::remap(texture_, *out_image, map_x_, map_y_, cv::INTER_LINEAR, border, 0.8);
}

// Compute depth map in dst
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void UnrealCvRenderer::render(const Transformation& T_W_C, const ImagePtr& out_i
ss_nr << std::setw(10) << std::setfill('0') << frame_idx_;
std::string path_frame = ze::joinPath(FLAGS_unrealcv_output_directory, "frame_" + ss_nr.str() + ".png");
VLOG(1) << "Saving raw RGB image to: " << path_frame;
cv::imwrite(path_frame, img, {CV_IMWRITE_PNG_COMPRESSION, 9});
cv::imwrite(path_frame, img, {cv::IMWRITE_PNG_COMPRESSION, 9});
}

cv::Mat img_gray;
Expand Down

0 comments on commit ada6795

Please sign in to comment.