Skip to content
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

Jump to bottom

fixed opencv include names #90

Merged
merged 17 commits into from Jan 24, 2018
Merged

fixed opencv include names #90

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
74792cd
working on Softkinetic DS 325 integration
ipa-rmb Oct 19, 2016
2712cc0
added a service for computing grasp points for vacuum grippers
ipa-rmb Oct 27, 2016
e87af56
Merge branch 'indigo_dev' of github.com:ipa-rmb/cob_perception_common…
ipa-rmb Oct 27, 2016
1d8d983
added srv to CMakeLists
ipa-rmb Oct 28, 2016
e35382b
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
ipa-rmb Apr 25, 2017
0e0f20d
added property to a service
ipa-rmb May 3, 2017
1a1b24d
Merge branch 'indigo_dev' of github.com:ipa-rmb/cob_perception_common…
ipa-rmb May 3, 2017
4706fee
remove grasping service
ipa-rmb Jul 18, 2017
58f04a0
Merge branch 'indigo_dev' of github.com:ipa320/cob_perception_common …
ipa-rmb Jul 18, 2017
6b0a9f4
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
ipa-rmb Jul 19, 2017
8d1d941
Merge branch 'indigo_dev' of https://github.com/ipa-rmb/cob_perceptio…
ipa-rmb Jul 19, 2017
903b9eb
removed unnecessary cmake_modules in CMakeLists
ipa-rmb Jul 19, 2017
553c242
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
ipa-rmb Jul 20, 2017
ca3b917
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
ipa-rmb Oct 2, 2017
d0da4a4
Merge branch 'indigo_dev' of github.com:ipa-rmb/cob_perception_common…
ipa-rmb Jan 21, 2018
cf7edaa
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
ipa-rmb Jan 21, 2018
39739d0
fixed opencv include names
ipa-rmb Jan 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions cob_image_flip/ros/include/cob_image_flip/image_flip.h
View file
Open in desktop
Expand Up @@ -33,8 +33,7 @@
#include <image_transport/subscriber_filter.h>

// opencv
#include <opencv/cv.h>
#include <opencv/highgui.h>
#include <opencv2/opencv.hpp>
#include <cv_bridge/cv_bridge.h>
#include <sensor_msgs/image_encodings.h>

Expand Down