diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:09:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:15 +0100 |
| commit | 8697284d248f47dd4798f7ef49791fc7686f646d (patch) | |
| tree | 3cc7278e7160aa96242b03dcc683f0ff5f235aa7 /avmedia/source/opengl | |
| parent | loplugin:nullptr (automatic rewrite) (diff) | |
| download | core-8697284d248f47dd4798f7ef49791fc7686f646d.tar.gz core-8697284d248f47dd4798f7ef49791fc7686f646d.zip | |
loplugin:nullptr (automatic rewrite)
Change-Id: Ib3f24439ffda42d217300dcc0ca979964ade360a
Diffstat (limited to 'avmedia/source/opengl')
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 10 | ||||
| -rw-r--r-- | avmedia/source/opengl/ogluno.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index a8854d2e3a7c..df1a78d933b6 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -27,9 +27,9 @@ namespace avmedia { namespace ogl { OGLPlayer::OGLPlayer() : Player_BASE(m_aMutex) - , m_pHandle(NULL) + , m_pHandle(nullptr) , m_xContext(OpenGLContext::Create()) - , m_pOGLWindow(NULL) + , m_pOGLWindow(nullptr) , m_bIsRendering(false) { } @@ -97,7 +97,7 @@ bool OGLPlayer::create( const OUString& rURL ) Graphic aGraphic; if( aFilter.ImportGraphic(aGraphic, INetURLObject(sFilesURL)) != GRFILTER_OK ) { - rFile.buffer = 0; + rFile.buffer = nullptr; rFile.imagewidth = 0; rFile.imageheight = 0; SAL_WARN("avmedia.opengl", "Can't load texture file: " + sFilesURL); @@ -113,7 +113,7 @@ bool OGLPlayer::create( const OUString& rURL ) { if( !lcl_LoadFile(&rFile, sFilesURL) ) { - rFile.buffer = 0; + rFile.buffer = nullptr; rFile.size = 0; SAL_WARN("avmedia.opengl", "Can't load glTF file: " + sFilesURL); return false; @@ -135,7 +135,7 @@ void OGLPlayer::releaseInputFiles() for (size_t i = 0; i < m_vInputFiles.size() && m_vInputFiles[i].buffer; ++i) { delete [] m_vInputFiles[i].buffer; - m_vInputFiles[i].buffer = 0; + m_vInputFiles[i].buffer = nullptr; } m_vInputFiles.clear(); } diff --git a/avmedia/source/opengl/ogluno.cxx b/avmedia/source/opengl/ogluno.cxx index ca2b7127d21e..17b8ea966010 100644 --- a/avmedia/source/opengl/ogluno.cxx +++ b/avmedia/source/opengl/ogluno.cxx @@ -23,7 +23,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaogl_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* ) { uno::Reference< lang::XSingleServiceFactory > xFactory; - void* pRet = 0; + void* pRet = nullptr; if( rtl_str_compare( pImplName, "com.sun.star.comp.avmedia.Manager_OpenGL" ) == 0 ) { |