From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Wed, 13 Aug 2014 18:28:51 +0000 (+0000)
Subject: Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~186
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f590ebed084a5002c9013e11c519dcb139d47e9;p=profile%2Fivi%2Fopencv.git

Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data
---

5f590ebed084a5002c9013e11c519dcb139d47e9
diff --cc modules/core/src/copy.cpp
index 3003c81,8096ea9..82b2000
--- a/modules/core/src/copy.cpp
+++ b/modules/core/src/copy.cpp
@@@ -754,15 -754,15 +754,15 @@@ void flip( InputArray _src, OutputArra
  #endif
  
      if( flip_mode <= 0 )
-         flipVert( src.data, src.step, dst.data, dst.step, src.size(), esz );
+         flipVert( src.ptr(), src.step, dst.ptr(), dst.step, src.size(), esz );
      else
-         flipHoriz( src.data, src.step, dst.data, dst.step, src.size(), esz );
+         flipHoriz( src.ptr(), src.step, dst.ptr(), dst.step, src.size(), esz );
  
      if( flip_mode < 0 )
-         flipHoriz( dst.data, dst.step, dst.data, dst.step, dst.size(), esz );
+         flipHoriz( dst.ptr(), dst.step, dst.ptr(), dst.step, dst.size(), esz );
  }
  
 -/*#ifdef HAVE_OPENCL
 +#if defined HAVE_OPENCL && !defined __APPLE__
  
  static bool ocl_repeat(InputArray _src, int ny, int nx, OutputArray _dst)
  {