Merge branch master into cuda-dev

2012-12-11 01:12:14 +04:00
parent 50946b59c1 67ce03d7dd
commit a6c3ed5b36
227 changed files with 2510 additions and 149006 deletions
--- a/modules/gpu/include/opencv2/gpu/device/utility.hpp
+++ b/modules/gpu/include/opencv2/gpu/device/utility.hpp
@@ -149,7 +149,7 @@ namespace cv { namespace gpu { namespace device
            return true;
        }

-        static __device__ __forceinline__ bool check(int, int, int, uint offset = 0)
+        static __device__ __forceinline__ bool check(int, int, int)
        {
            return true;
        }