[Gridflow-cvs] [svn] commit: r4392 - in /trunk: gridflow.h optional/opencv.c

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Sun Oct 25 14:36:18 EDT 2009


Author: matju
Date: Sun Oct 25 14:36:17 2009
New Revision: 4392

Log:
revert the last opencv fix and try something else instead

Modified:
    trunk/gridflow.h
    trunk/optional/opencv.c

Modified: trunk/gridflow.h
==============================================================================
--- trunk/gridflow.h (original)
+++ trunk/gridflow.h Sun Oct 25 14:36:17 2009
@@ -77,9 +77,7 @@
 typedef char       int8; typedef unsigned char      uint8;
 typedef short     int16; typedef unsigned short     uint16;
 typedef int       int32; typedef unsigned int       uint32;
-#ifndef _CV_H_
 typedef long long int64; typedef unsigned long long uint64;
-#endif
 typedef float   float32;
 typedef double  float64;
 

Modified: trunk/optional/opencv.c
==============================================================================
--- trunk/optional/opencv.c (original)
+++ trunk/optional/opencv.c Sun Oct 25 14:36:17 2009
@@ -21,8 +21,11 @@
 	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include "../gridflow.h.fcs"
+namespace opencv {
 #include <opencv/cv.h>
-#include "../gridflow.h.fcs"
+};
+using namespace opencv;
 #include <errno.h>
 
 #define cvRelease(euh) cvRelease((void **)(euh))



More information about the Gridflow-cvs mailing list