diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-20 13:00:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-05-21 09:01:57 +0000 |
| commit | 431598b97b47b13c8b241f587b5eea21bf134893 (patch) | |
| tree | f94011f51ec2ab79679e7df6133e6ac8f52ba808 /avmedia | |
| parent | 0cd2895e70eb96083ea78b1350583fe791b4237a (diff) | |
convert CVT constants to scoped enum
Change-Id: I7703816b6a1df2bf24c06cdf9992f9982ae724e8
Reviewed-on: https://gerrit.libreoffice.org/15826
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/macavf/framegrabber.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/framegrabber.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index 4662720ff44b..cfdbbaee5a63 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -101,7 +101,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe // convert the image into the return-value type which is a graphic::XGraphic SvMemoryStream aMemStm( pBitmapBytes, nBitmapLen, StreamMode::READ | StreamMode::WRITE ); Graphic aGraphic; - if( GraphicConverter::Import( aMemStm, aGraphic, CVT_TIF ) == ERRCODE_NONE ) + if( GraphicConverter::Import( aMemStm, aGraphic, ConvertDataFormat::TIF ) == ERRCODE_NONE ) xRet = aGraphic.GetXGraphic(); // clean up resources diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index a13d98a50d00..401c17d0581d 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -99,7 +99,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe const void* pBitmapData = [pBitmap bytes]; SvMemoryStream aMemStm( const_cast<void *>(pBitmapData), nSize, StreamMode::READ | StreamMode::WRITE ); Graphic aGraphic; - if ( GraphicConverter::Import( aMemStm, aGraphic, CVT_TIF ) == ERRCODE_NONE ) + if ( GraphicConverter::Import( aMemStm, aGraphic, ConvertDataFormat::TIF ) == ERRCODE_NONE ) { xRet = aGraphic.GetXGraphic(); } |