From f933cb0a646ecebff27e93ddfb0fc2a3e417ce4e Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Mon, 12 May 2014 21:56:26 +0200 Subject: libgltf: Update to the new version. Change-Id: Iffc91425d4395699a1c5f18ac10f5ed065231fdf --- avmedia/source/opengl/oglframegrabber.cxx | 2 +- avmedia/source/opengl/oglwindow.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'avmedia') diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx index c4d2408fc8f2..9db1f1b028d0 100644 --- a/avmedia/source/opengl/oglframegrabber.cxx +++ b/avmedia/source/opengl/oglframegrabber.cxx @@ -37,7 +37,7 @@ uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( do throw ( uno::RuntimeException, std::exception ) { boost::scoped_array pBuffer(new sal_uInt8[m_pHandle->viewport.width * m_pHandle->viewport.height * 4]); - gltf_renderer_get_bitmap(m_pHandle, fMediaTime, (char*)pBuffer.get(), GL_BGRA); + gltf_renderer_get_bitmap(&m_pHandle, 1, fMediaTime, (char*)pBuffer.get(), GL_BGRA); BitmapEx aBitmap = OpenGLHelper::ConvertBGRABufferToBitmapEx(pBuffer.get(), m_pHandle->viewport.width, m_pHandle->viewport.height); return Graphic( aBitmap ).GetXGraphic(); } diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index ec21651e2d50..a3e5623b3b5f 100644 --- a/avmedia/source/opengl/oglwindow.cxx +++ b/avmedia/source/opengl/oglwindow.cxx @@ -32,7 +32,7 @@ OGLWindow::~OGLWindow() void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::exception) { m_pContext->makeCurrent(); - gltf_prepare_renderer(m_pHandle); + gltf_prepare_renderer(&m_pHandle->viewport); gltf_renderer(m_pHandle); gltf_complete_renderer(); m_pContext->swapBuffers(); -- cgit