Merge remote-tracking branch 'origin/master' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 26 Nov 2013 11:32:44 +0000 (15:32 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 26 Nov 2013 11:32:44 +0000 (15:32 +0400)
Conflicts:
modules/ocl/src/arithm.cpp

1  2 
modules/ocl/src/arithm.cpp
modules/ocl/src/imgproc.cpp

@@@ -658,8 -634,7 +658,8 @@@ static void arithm_absdiff_nonsaturate_
          args.push_back( std::make_pair( sizeof(cl_int), (void *)&src2step1 ));
          args.push_back( std::make_pair( sizeof(cl_int), (void *)&src2offset1 ));
  
-         kernelName = kernelName + "_binary";
-         buildOptions = buildOptions + " -D BINARY";
+         kernelName += "_binary";
++        buildOptions += " -D BINARY";
      }
  
      args.push_back( std::make_pair( sizeof(cl_mem), (void *)&diff.data ));
Simple merge