opencv: Use cv::AutoBuffer<>::data()

modules/imgcodecs/src/grfmt_bmp.cpp

@@ -223,7 +223,7 @@ bool  BmpDecoder::readData( Mat& img )
         }
         _bgr.allocate(m_width*3 + 32);
     }
-    uchar *src = _src, *bgr = _bgr;
+    uchar *src = _src.data(), *bgr = _bgr.data();
 
     CV_TRY
     {

modules/imgcodecs/src/grfmt_exr.cpp

@@ -199,7 +199,7 @@ bool  ExrDecoder::readData( Mat& img )
     if( !justcopy )
     {
         copy_buffer.allocate(sizeof(float) * m_width * 3);
-        buffer = copy_buffer;
+        buffer = copy_buffer.data();
         ystep = 0;
     }
     else

modules/imgcodecs/src/grfmt_jpeg.cpp

@@ -681,7 +681,7 @@ bool JpegEncoder::write( const Mat& img, const std::vector<int>& params )
 
         if( channels > 1 )
             _buffer.allocate(width*channels);
-        buffer = _buffer;
+        buffer = _buffer.data();
 
         for( int y = 0; y < height; y++ )
         {

modules/imgcodecs/src/grfmt_pam.cpp

@@ -496,9 +496,7 @@ bool  PAMDecoder::readData( Mat& img )
 
     /* setting buffer to max data size so scaling up is possible */
     AutoBuffer<uchar> _src(src_elems_per_row * 2);
-    uchar* src = _src;
-    AutoBuffer<uchar> _gray_palette;
-    uchar* gray_palette = _gray_palette;
+    uchar* src = _src.data();
 
     if( m_offset < 0 || !m_strm.isOpened())
         return false;
@@ -544,10 +542,7 @@ bool  PAMDecoder::readData( Mat& img )
             if (bit_mode) {
                 if( target_channels == 1 )
                 {
-                    _gray_palette.allocate(2);
-                    gray_palette = _gray_palette;
-                    gray_palette[0] = 0;
-                    gray_palette[1] = 255;
+                    uchar gray_palette[2] = {0, 255};
                     for( y = 0; y < m_height; y++, data += imp_stride )
                     {
                         m_strm.getBytes( src, src_stride );
@@ -683,7 +678,7 @@ bool PAMEncoder::write( const Mat& img, const std::vector<int>& params )
         bufsize = tmp;
 
     AutoBuffer<char> _buffer(bufsize);
-    char* buffer = _buffer;
+    char* buffer = _buffer.data();
 
     /* write header */
     tmp = 0;

modules/imgcodecs/src/grfmt_png.cpp

@@ -225,7 +225,7 @@ bool  PngDecoder::readData( Mat& img )
 {
     volatile bool result = false;
     AutoBuffer<uchar*> _buffer(m_height);
-    uchar** buffer = _buffer;
+    uchar** buffer = _buffer.data();
     int color = img.channels() > 1;
 
     png_structp png_ptr = (png_structp)m_png_ptr;
@@ -426,7 +426,7 @@ bool  PngEncoder::write( const Mat& img, const std::vector<int>& params )
                     for( y = 0; y < height; y++ )
                         buffer[y] = img.data + y*img.step;
 
-                    png_write_image( png_ptr, buffer );
+                    png_write_image( png_ptr, buffer.data() );
                     png_write_end( png_ptr, info_ptr );
 
                     result = true;

modules/imgcodecs/src/grfmt_pxm.cpp

@@ -245,7 +245,7 @@ bool PxMDecoder::readData( Mat& img )
             if( !m_binary )
             {
                 AutoBuffer<uchar> _src(m_width);
-                uchar* src = _src;
+                uchar* src = _src.data();
 
                 for (int y = 0; y < m_height; y++, data += img.step)
                 {
@@ -261,7 +261,7 @@ bool PxMDecoder::readData( Mat& img )
             else
             {
                 AutoBuffer<uchar> _src(src_pitch);
-                uchar* src = _src;
+                uchar* src = _src.data();
 
                 for (int y = 0; y < m_height; y++, data += img.step)
                 {
@@ -281,7 +281,7 @@ bool PxMDecoder::readData( Mat& img )
         case 24:
         {
             AutoBuffer<uchar> _src(std::max<size_t>(width3*2, src_pitch));
-            uchar* src = _src;
+            uchar* src = _src.data();
 
             for (int y = 0; y < m_height; y++, data += img.step)
             {
@@ -463,7 +463,7 @@ bool PxMEncoder::write(const Mat& img, const std::vector<int>& params)
         bufferSize = lineLength;
 
     AutoBuffer<char> _buffer(bufferSize);
-    char* buffer = _buffer;
+    char* buffer = _buffer.data();
 
     // write header;
     const int code = ((mode == PXM_TYPE_PBM) ? 1 : (mode == PXM_TYPE_PGM) ? 2 : 3)

modules/imgcodecs/src/grfmt_sunras.cpp

@@ -174,7 +174,7 @@ bool  SunRasterDecoder::readData( Mat& img )
         return false;
 
     AutoBuffer<uchar> _src(src_pitch + 32);
-    uchar* src = _src;
+    uchar* src = _src.data();
 
     if( !color && m_maptype == RMT_EQUAL_RGB )
         CvtPaletteToGray( m_palette, gray_palette, 1 << m_bpp );

modules/imgcodecs/src/grfmt_tiff.cpp

@@ -355,7 +355,7 @@ bool  TiffDecoder::readData( Mat& img )
             }
             const size_t buffer_size = (bpp/bitsPerByte) * ncn * tile_height0 * tile_width0;
             AutoBuffer<uchar> _buffer( buffer_size );
-            uchar* buffer = _buffer;
+            uchar* buffer = _buffer.data();
             ushort* buffer16 = (ushort*)buffer;
             float* buffer32 = (float*)buffer;
             double* buffer64 = (double*)buffer;
@@ -834,7 +834,7 @@ bool TiffEncoder::writeLibTiff( const std::vector<Mat>& img_vec, const std::vect
         // row buffer, because TIFFWriteScanline modifies the original data!
         size_t scanlineSize = TIFFScanlineSize(pTiffHandle);
         AutoBuffer<uchar> _buffer(scanlineSize + 32);
-        uchar* buffer = _buffer;
+        uchar* buffer = _buffer.data();
         if (!buffer)
         {
             TIFFClose(pTiffHandle);