[Libreoffice-commits] core.git: avmedia/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Sun Nov 15 16:19:11 UTC 2020


 avmedia/source/macavf/framegrabber.mm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f08333c2aab8da835bfbe00199e7334c4bc7153
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Nov 12 13:55:28 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Nov 15 17:18:28 2020 +0100

    CFDataGetLength returns CFIndex, not long
    
    Change-Id: I341ef5abfc001e47d86a03960022b018aac8e35f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105741
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index 31566bef3876..7803fa4f1063 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -71,7 +71,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
     CGImageDestinationAddImage( pCGImgDest, pCGImage, nullptr );
     CGImageDestinationFinalize( pCGImgDest );
     CFRelease( pCGImgDest );
-    const long nBitmapLen = CFDataGetLength( pCFData );
+    const CFIndex nBitmapLen = CFDataGetLength( pCFData );
     UInt8 * pBitmapBytes = const_cast<UInt8 *>(CFDataGetBytePtr( pCFData ));
 
     // convert the image into the return-value type which is a graphic::XGraphic


More information about the Libreoffice-commits mailing list