From e692ab9a6be63193c5b52a6562d85d06c40463b8 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 22 Apr 2013 11:24:02 +0200 Subject: [PATCH] fix uninitialized variables in GLConsumer mDefaultWidth, mDefaultHeight and mCurrentScallingMode are now initialized to the same default value that BufferQueue uses. Change-Id: I0d4da2022b06419d12745716d8ddbd48c8869953 --- include/gui/GLConsumer.h | 2 +- libs/gui/GLConsumer.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/gui/GLConsumer.h b/include/gui/GLConsumer.h index 3b8dd7726..f0a75dc51 100644 --- a/include/gui/GLConsumer.h +++ b/include/gui/GLConsumer.h @@ -323,7 +323,7 @@ private: uint32_t mCurrentTransform; // mCurrentScalingMode is the scaling mode for the current texture. It gets - // set to each time updateTexImage is called. + // set each time updateTexImage is called. uint32_t mCurrentScalingMode; // mCurrentFence is the fence received from BufferQueue in updateTexImage. diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp index f8f124136..637a403c7 100644 --- a/libs/gui/GLConsumer.cpp +++ b/libs/gui/GLConsumer.cpp @@ -82,8 +82,11 @@ GLConsumer::GLConsumer(GLuint tex, bool allowSynchronousMode, GLenum texTarget, bool useFenceSync, const sp &bufferQueue) : ConsumerBase(bufferQueue == 0 ? new BufferQueue(allowSynchronousMode) : bufferQueue), mCurrentTransform(0), + mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE), mCurrentFence(Fence::NO_FENCE), mCurrentTimestamp(0), + mDefaultWidth(1), + mDefaultHeight(1), mFilteringEnabled(true), mTexName(tex), mUseFenceSync(useFenceSync),