From 61064b56bf926aea5a9a7e2dfdead34277217090 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 1 Feb 2018 17:36:56 +0200 Subject: avmedia: move BitmapWriteAccess inside Bitmap part of a larger project to hide BitmapWriteAccess inside Bitmap Change-Id: Ia46c12b3297107892a6236633c11ca9ada6edbd4 Reviewed-on: https://gerrit.libreoffice.org/49106 Reviewed-by: Michael Meeks Tested-by: Noel Grandin --- avmedia/source/gstreamer/gstframegrabber.cxx | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'avmedia') diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 550510979329..60aed4206ac1 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -174,24 +174,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe int nStride = GST_ROUND_UP_4( nWidth * 3 ); Bitmap aBmp( Size( nWidth, nHeight ), 24 ); - - BitmapWriteAccess *pWrite = aBmp.AcquireWriteAccess(); - if( pWrite ) - { - // yet another cheesy pixel copying loop - for( int y = 0; y < nHeight; ++y ) - { - sal_uInt8 *p = pData + y * nStride; - Scanline pScanline = pWrite->GetScanline(y); - for (int x = 0; x < nWidth; ++x) - { - BitmapColor col(p[0], p[1], p[2]); - pWrite->SetPixelOnData(pScanline, x, col); - p += 3; - } - } - } - Bitmap::ReleaseAccess( pWrite ); + aBmp.SetToData( pData, nStride ); #ifndef AVMEDIA_GST_0_10 gst_buffer_unmap( pBuf, &aMapInfo ); -- cgit