fixed cv constants and pcl dependency on cpp14

This commit is contained in:
Daniel Gehrig 2020-08-26 19:30:43 +02:00
parent 91243c39f3
commit ada6795e6b
7 changed files with 8 additions and 6 deletions

View File

@ -3,6 +3,8 @@ project(esim_visualization)
find_package(catkin_simple REQUIRED) find_package(catkin_simple REQUIRED)
catkin_simple() catkin_simple()
set(CMAKE_CXX_STANDARD 14)
# This macro ensures modules and global scripts declared therein get installed # 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 # See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html

View File

@ -82,7 +82,7 @@ void AdaptiveSamplingBenchmarkPublisher::imageCallback(const ImagePtrVector& ima
if(image_index_ == 0) 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; std::stringstream ss;
ss << ze::joinPath(FLAGS_adaptive_sampling_benchmark_folder, "image_"); ss << ze::joinPath(FLAGS_adaptive_sampling_benchmark_folder, "image_");

View File

@ -80,7 +80,7 @@ SyntheticOpticFlowPublisher::~SyntheticOpticFlowPublisher()
std::string path_timestamps_neg = ze::joinPath(output_folder_, "event_time_stamps_neg.png"); std::string path_timestamps_neg = ze::joinPath(output_folder_, "event_time_stamps_neg.png");
std::vector<int> compression_params; 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); compression_params.push_back(0);
cv::imwrite(path_event_count_image, event_count_image, compression_params); cv::imwrite(path_event_count_image, event_count_image, compression_params);

View File

@ -90,7 +90,7 @@ void Object::draw(Time t, bool is_first_layer)
canvas_, canvas_,
M_10, M_10,
canvas_.size(), canvas_.size(),
CV_INTER_LINEAR, cv::INTER_LINEAR,
border_mode); border_mode);
cv::Matx<FloatType, 3, 3> SS = dM10_dt * M_10.inv(); cv::Matx<FloatType, 3, 3> SS = dM10_dt * M_10.inv();

View File

@ -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) if(out_depthmap)
{ {

View File

@ -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; int border = (extend_border_) ? cv::BORDER_REFLECT : cv::BORDER_CONSTANT;
{ {
auto t = timers_planar_renderer[TimerPlanarRenderer::remap].timeScope(); 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 // Compute depth map in dst

View File

@ -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_; 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"); std::string path_frame = ze::joinPath(FLAGS_unrealcv_output_directory, "frame_" + ss_nr.str() + ".png");
VLOG(1) << "Saving raw RGB image to: " << path_frame; 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; cv::Mat img_gray;