commit 3cf12f4112167cb3372cbdba2b66d48a5d56dc4b
author Matthew Xie <mattx@google.com> Tue Apr 23 22:47:36 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 23 22:47:36 2013 +0000
tree 8e7192e1904911f57b08191145461c4fa6b73dc7
parent e692ab9a6be63193c5b52a6562d85d06c40463b8
parent 3dacc3f1a3d94f7e45ca873991f868eeae84f1c1

Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev

include/gui/GLConsumer.h

diff --git a/include/gui/GLConsumer.h b/include/gui/GLConsumer.h
index 3b8dd77..f0a75dc 100644
--- a/include/gui/GLConsumer.h
+++ b/include/gui/GLConsumer.h
@@ -323,7 +323,7 @@
     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.

libs/gui/GLConsumer.cpp

diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index f8f1241..637a403 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -82,8 +82,11 @@
         GLenum texTarget, bool useFenceSync, const sp<BufferQueue> &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),