generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing a problem with conflict of ROS and opencv flann

Browse Source
This commit is contained in:
Victor Erukhimov
2010-10-20 15:08:26 +00:00
parent f0c136c9ab
commit 0c3803a61c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/flann/include/opencv2/flann/general.h
View File

@@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/
#ifndef CONSTANTS_H
#define CONSTANTS_H
#ifndef OPENCV_CONSTANTS_H
#define OPENCV_CONSTANTS_H
#ifdef __cplusplus
@@ -146,4 +146,4 @@ struct CV_EXPORTS SearchParams {
#endif
#endif /* CONSTANTS_H */
#endif /* OPENCV_CONSTANTS_H */

4
modules/flann/include/opencv2/flann/object_factory.h
View File

@@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/
#ifndef OBJECT_FACTORY_H_
#define OBJECT_FACTORY_H_
#ifndef OPENCV_OBJECT_FACTORY_H_
#define OPENCV_OBJECT_FACTORY_H_
#include "opencv2/core/types_c.h"
#include <map>