Skip to content

O
opencv
Commit 0c3803a6 authored by Victor Erukhimov's avatar Victor Erukhimov
Browse files
Options

Fixing a problem with conflict of ROS and opencv flann

parent f0c136c9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/flann/include/opencv2/flann/general.h
View file @ 0c3803a6
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/ *************************************************************************/
#ifndef CONSTANTS_H #ifndef OPENCV_CONSTANTS_H
#define CONSTANTS_H #define OPENCV_CONSTANTS_H
#ifdef __cplusplus #ifdef __cplusplus
...@@ -146,4 +146,4 @@ struct CV_EXPORTS SearchParams { ...@@ -146,4 +146,4 @@ struct CV_EXPORTS SearchParams {
#endif #endif
#endif /* CONSTANTS_H */ #endif /* OPENCV_CONSTANTS_H */
modules/flann/include/opencv2/flann/object_factory.h
View file @ 0c3803a6
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/ *************************************************************************/
#ifndef OBJECT_FACTORY_H_ #ifndef OPENCV_OBJECT_FACTORY_H_
#define OBJECT_FACTORY_H_ #define OPENCV_OBJECT_FACTORY_H_
#include "opencv2/core/types_c.h" #include "opencv2/core/types_c.h"
#include <map> #include <map>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment