Merge branch '2.4'

2013-01-31 14:35:27 +04:00
parent 7572b4d400 53b0df87f1
commit 57d3152cd0
23 changed files with 418 additions and 55 deletions
--- a/modules/gpu/include/opencv2/gpu/device/common.hpp
+++ b/modules/gpu/include/opencv2/gpu/device/common.hpp
@@ -100,7 +100,7 @@ namespace cv { namespace gpu
        typedef unsigned char uchar;
        typedef unsigned short ushort;
        typedef signed char schar;
-        #ifdef WIN32
+        #if defined (_WIN32) || defined (__APPLE__)
            typedef unsigned int uint;
        #endif