diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-26 18:12:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-26 18:13:08 +0100 |
| commit | 038683bf4cf3b6f9e4f90295ddbab2d6a3d86b25 (patch) | |
| tree | 0b3da6f93e513d5d6fce981261bcfaab50e0ae4f /slideshow/source | |
| parent | 210ef021f7f61d20bd1d9953916dce1f0e386970 (diff) | |
Silence Mac OS X 10.9/10.10 deprecations for now
Change-Id: Ie63ed8f6f66a7641ad872f93d76efb962333cec9
Diffstat (limited to 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 22fca9170247..754e7940b70f 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -970,6 +970,7 @@ void OGLTransitionerImpl::impl_createTexture( maSlideBitmapLayout.ColorSpace->convertToIntegerColorSpace( data, getOGLColorSpace())); + SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 gluBuild2DMipmaps gluBuild2DMipmaps(GL_TEXTURE_2D, 4, maSlideSize.Width, @@ -977,6 +978,7 @@ void OGLTransitionerImpl::impl_createTexture( GL_RGBA, GL_UNSIGNED_BYTE, &tempBytes[0]); + SAL_WNODEPRECATED_DECLARATIONS_POP glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); //TRILINEAR FILTERING @@ -990,7 +992,9 @@ void OGLTransitionerImpl::impl_createTexture( glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST); } else { + SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 gluBuild2DMipmaps gluBuild2DMipmaps( GL_TEXTURE_2D, pFormat->nInternalFormat, maSlideSize.Width, maSlideSize.Height, pFormat->eFormat, pFormat->eType, &data[0] ); + SAL_WNODEPRECATED_DECLARATIONS_POP glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); //TRILINEAR FILTERING |