summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-05-24 17:49:38 +0200
committerJan Holesovsky <kendy@collabora.com>2014-05-24 17:52:41 +0200
commita0ef37c55febac05f19a2cece0552e68384e56aa (patch)
tree0e7af266d4ee63e846f0d4bc6f84438bb4a1d5f8 /avmedia
parentf2e0eafabc27228f25cbbe6f23b225420b7da470 (diff)
libgltf: Another new version.
Change-Id: I784579717674f1caf68ad489d1a931936f6f9651
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/opengl/oglplayer.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index e01a940217a8..86da386d4867 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -77,25 +77,25 @@ bool OGLPlayer::create( const OUString& rURL )
// Load external resources
for( size_t i = 0; i < m_pHandle->size; ++i )
{
- glTFFile* pFile = m_pHandle->files[i];
- if( pFile && pFile->filename )
+ glTFFile& rFile = m_pHandle->files[i];
+ if( rFile.filename )
{
const OUString sFilesURL =
- INetURLObject::GetAbsURL(m_sURL,OStringToOUString(OString(pFile->filename),RTL_TEXTENCODING_UTF8));
- if( pFile->type == GLTF_IMAGE )
+ INetURLObject::GetAbsURL(m_sURL,OStringToOUString(OString(rFile.filename),RTL_TEXTENCODING_UTF8));
+ if( rFile.type == GLTF_IMAGE )
{
// Load images as bitmaps
GraphicFilter aFilter;
Graphic aGraphic;
aFilter.ImportGraphic(aGraphic, INetURLObject(sFilesURL));
const BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
- pFile->buffer = (char*)OpenGLHelper::ConvertBitmapExToRGBABuffer(aBitmapEx);
- pFile->imagewidth = aBitmapEx.GetSizePixel().Width();
- pFile->imageheight = aBitmapEx.GetSizePixel().Height();
+ rFile.buffer = (char*)OpenGLHelper::ConvertBitmapExToRGBABuffer(aBitmapEx);
+ rFile.imagewidth = aBitmapEx.GetSizePixel().Width();
+ rFile.imageheight = aBitmapEx.GetSizePixel().Height();
}
- else if( pFile->type == GLTF_BINARY || pFile->type == GLTF_GLSL )
+ else if( rFile.type == GLTF_BINARY || rFile.type == GLTF_GLSL )
{
- if( !lcl_LoadFile(pFile, sFilesURL) )
+ if( !lcl_LoadFile(&rFile, sFilesURL) )
{
SAL_WARN("avmedia.opengl", "Can't load glTF file: " + sFilesURL);
return false;