[Gridflow-cvs] [svn] commit: r4322 - /trunk/gridflow.h

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Sat Oct 24 09:19:52 EDT 2009


Author: matju
Date: Sat Oct 24 09:19:50 2009
New Revision: 4322

Log:
fix for int64 conflict with <opencv/cv.h>

Modified:
    trunk/gridflow.h

Modified: trunk/gridflow.h
==============================================================================
--- trunk/gridflow.h (original)
+++ trunk/gridflow.h Sat Oct 24 09:19:50 2009
@@ -77,7 +77,9 @@
 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;
 



More information about the Gridflow-cvs mailing list