diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-10 08:57:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-10 08:57:02 +0100 |
| commit | 9e38d549b9099879ba98b9ad096347d5f9b6475a (patch) | |
| tree | 384e039941b170481824531992540e83d76afb5b /slideshow | |
| parent | tdf#53472 Integral Symbols too small for some integrands (diff) | |
| download | core-9e38d549b9099879ba98b9ad096347d5f9b6475a.tar.gz core-9e38d549b9099879ba98b9ad096347d5f9b6475a.zip | |
loplugin:nullptr
Change-Id: If248c921cd5c64c74f36193f3928835f0059834d
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 5a420314f7c7..43184c537018 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -2103,7 +2103,7 @@ void HoneycombTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_In glGenTextures(2, mnDepthTextures.data()); glActiveTexture(GL_TEXTURE2); glBindTexture(GL_TEXTURE_2D, mnDepthTextures[0]); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2048, 2048, 0, GL_RGBA, GL_FLOAT, 0); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2048, 2048, 0, GL_RGBA, GL_FLOAT, nullptr); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); @@ -2111,7 +2111,7 @@ void HoneycombTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_In glActiveTexture(GL_TEXTURE3); glBindTexture(GL_TEXTURE_2D, mnDepthTextures[1]); - glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16, 2048, 2048, 0, GL_DEPTH_COMPONENT, GL_FLOAT, 0); + glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16, 2048, 2048, 0, GL_DEPTH_COMPONENT, GL_FLOAT, nullptr); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); |