fixed build for CARMA platform

2012-12-13 13:49:32 +04:00
parent 889674ef43
commit da93a1dab9
27 changed files with 543 additions and 594 deletions
--- a/modules/gpu/include/opencv2/gpu/device/common.hpp
+++ b/modules/gpu/include/opencv2/gpu/device/common.hpp
@@ -100,7 +100,6 @@ namespace cv { namespace gpu
        typedef unsigned char uchar;
        typedef unsigned short ushort;
        typedef signed char schar;
-        typedef unsigned int uint;

        template<class T> inline void bindTexture(const textureReference* tex, const PtrStepSz<T>& img)
        {