Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00
parent 73c152abc4
commit bd0e0b5800
438 changed files with 20374 additions and 19674 deletions
--- a/modules/videostab/src/optical_flow.cpp
+++ b/modules/videostab/src/optical_flow.cpp
@@ -59,7 +59,7 @@ void SparsePyrLkOptFlowEstimator::run(
 }


-#if HAVE_OPENCV_GPU
+#ifdef HAVE_OPENCV_GPU
 DensePyrLkOptFlowEstimatorGpu::DensePyrLkOptFlowEstimatorGpu()
 {
    CV_Assert(gpu::getCudaEnabledDeviceCount() > 0);