diff options
| author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2014-11-10 15:05:25 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-12 11:04:11 +0000 |
| commit | da40cac540e7d735edbe9069b3c8ec6af4530208 (patch) | |
| tree | f2abda7281129e13f588c77b18780a7090c8405f /avmedia/source/opengl | |
| parent | java: convert fields to local variables where possible (diff) | |
| download | core-da40cac540e7d735edbe9069b3c8ec6af4530208.tar.gz core-da40cac540e7d735edbe9069b3c8ec6af4530208.zip | |
Fix common typos. No automatic tools. Handmade…
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959
Reviewed-on: https://gerrit.libreoffice.org/12164
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia/source/opengl')
| -rw-r--r-- | avmedia/source/opengl/oglframegrabber.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglwindow.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx index 23e97f100444..f98b4e188cb7 100644 --- a/avmedia/source/opengl/oglframegrabber.cxx +++ b/avmedia/source/opengl/oglframegrabber.cxx @@ -42,7 +42,7 @@ uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( do int nRet = gltf_renderer_get_bitmap(&pHandle, 1, (char*)pBuffer.get(), GL_BGRA); if( nRet != 0 ) { - SAL_WARN("avmedia.opengl", "Error occured while rendering to bitmap! Error code: " << nRet); + SAL_WARN("avmedia.opengl", "Error occurred while rendering to bitmap! Error code: " << nRet); return uno::Reference< css::graphic::XGraphic >(); } BitmapEx aBitmap = OpenGLHelper::ConvertBGRABufferToBitmapEx(pBuffer.get(), m_rHandle.viewport.width, m_rHandle.viewport.height); diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 36f5e6874fa0..f8105133658c 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -286,7 +286,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c releaseInputFiles(); if( nRet != 0 ) { - SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet); + SAL_WARN("avmedia.opengl", "Error occurred while setting up the scene! Error code: " << nRet); return uno::Reference< media::XPlayerWindow >(); } // The background color is white by default, but we need to separate the @@ -329,7 +329,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() releaseInputFiles(); if( nRet != 0 ) { - SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet); + SAL_WARN("avmedia.opengl", "Error occurred while setting up the scene! Error code: " << nRet); return uno::Reference< media::XFrameGrabber >(); } glClearColor(0.5f, 0.5f, 0.5f, 0.5f); diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index 767844ddb5b4..2c9d40ad142e 100644 --- a/avmedia/source/opengl/oglwindow.cxx +++ b/avmedia/source/opengl/oglwindow.cxx @@ -36,7 +36,7 @@ void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::except int nRet = gltf_prepare_renderer(&m_rHandle); if( nRet != 0 ) { - SAL_WARN("avmedia.opengl", "Error occured while preparing for rendering! Error code: " << nRet); + SAL_WARN("avmedia.opengl", "Error occurred while preparing for rendering! Error code: " << nRet); return; } gltf_renderer(&m_rHandle); |