Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 24 Mar 2014 06:37:14 +0000 (10:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Mar 2014 06:37:15 +0000 (10:37 +0400)
1  2 
modules/core/src/matrix.cpp
modules/core/src/ocl.cpp
modules/imgproc/test/ocl/test_filters.cpp
modules/imgproc/test/ocl/test_sepfilter2D.cpp

Simple merge
Simple merge
@@@ -100,11 -92,10 +92,10 @@@ PARAM_TEST_CASE(SepFilter2D, MatDepth, 
          Border dstBorder = randomBorder(0, useRoi ? MAX_VALUE : 0);
          randomSubMat(dst, dst_roi, roiSize, dstBorder, type, -MAX_VALUE, MAX_VALUE);
  
-         anchor.x = -1;
-         anchor.y = -1;
+         anchor.x = anchor.y = -1;
  
 -        UMAT_UPLOAD_INPUT_PARAMETER(src)
 -        UMAT_UPLOAD_OUTPUT_PARAMETER(dst)
 +        UMAT_UPLOAD_INPUT_PARAMETER(src);
 +        UMAT_UPLOAD_OUTPUT_PARAMETER(dst);
      }
  
      void Near(double threshold = 0.0)