diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-07 09:28:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-07 11:20:44 +0200 |
| commit | 7f8f277b94704a289fbbd1b836e4e5d66311580d (patch) | |
| tree | 2400b7306a0a2a3ea63aee2e5bfc336b52102635 /avmedia | |
| parent | 8db77209e0755d21d9efc34f70a2978d1df5d2c6 (diff) | |
fdo#84938: convert STREAM_ #defines to 'enum class'
Change-Id: Ibbf14c7e9a5c1883c1311d4c86f948f74f8e473e
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/macavf/framegrabber.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/framegrabber.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/win/framegrabber.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index 6c2609dd2962..4662720ff44b 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -99,7 +99,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe void* pBitmapBytes = (void*)CFDataGetBytePtr( pCFData ); // convert the image into the return-value type which is a graphic::XGraphic - SvMemoryStream aMemStm( pBitmapBytes, nBitmapLen, STREAM_READ | STREAM_WRITE ); + SvMemoryStream aMemStm( pBitmapBytes, nBitmapLen, StreamMode::READ | StreamMode::WRITE ); Graphic aGraphic; if( GraphicConverter::Import( aMemStm, aGraphic, CVT_TIF ) == ERRCODE_NONE ) xRet = aGraphic.GetXGraphic(); diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 910974e5adea..8bc513bb9592 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -46,7 +46,7 @@ OGLPlayer::~OGLPlayer() static bool lcl_LoadFile( glTFFile* io_pFile, const OUString& rURL) { - SvFileStream aStream( rURL, STREAM_READ ); + SvFileStream aStream( rURL, StreamMode::READ ); if( !aStream.IsOpen() ) return false; diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index 7f7ee5986df5..5a92e79bcc88 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -97,7 +97,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe NSData *pBitmap = [pImage TIFFRepresentation]; long nSize = [pBitmap length]; const void* pBitmapData = [pBitmap bytes]; - SvMemoryStream aMemStm( (char *)pBitmapData, nSize, STREAM_READ | STREAM_WRITE ); + SvMemoryStream aMemStm( (char *)pBitmapData, nSize, StreamMode::READ | StreamMode::WRITE ); Graphic aGraphic; if ( GraphicConverter::Import( aMemStm, aGraphic, CVT_TIF ) == ERRCODE_NONE ) { diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 1418276c1626..63303827d76b 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -173,7 +173,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe { if( SUCCEEDED( pDet->GetBitmapBits( fMediaTime, NULL, pBuffer, nWidth, nHeight ) ) ) { - SvMemoryStream aMemStm( pBuffer, nSize, STREAM_READ | STREAM_WRITE ); + SvMemoryStream aMemStm( pBuffer, nSize, StreamMode::READ | StreamMode::WRITE ); Bitmap aBmp; if( ReadDIB(aBmp, aMemStm, false ) && !aBmp.IsEmpty() ) |