summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-09-18 15:36:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-18 15:36:00 -0700
commit0f0e845113b02d1a3a00271d3b5449bee7053dd2 (patch)
treed92e65342c77c40dbb87524ee634b546f0230fc0 /include
parent2285c008fa53f086c8ccae3ac6eaf3f8a3992218 (diff)
parenta7e1660b257326f99261e7c9b2d58c9d2e68d0b0 (diff)
downloadframeworks_native-0f0e845113b02d1a3a00271d3b5449bee7053dd2.zip
frameworks_native-0f0e845113b02d1a3a00271d3b5449bee7053dd2.tar.gz
frameworks_native-0f0e845113b02d1a3a00271d3b5449bee7053dd2.tar.bz2
am a7e1660b: am c1c05de4: fix camera API 2.0 orientation
* commit 'a7e1660b257326f99261e7c9b2d58c9d2e68d0b0': fix camera API 2.0 orientation
Diffstat (limited to 'include')
-rw-r--r--include/gui/IGraphicBufferConsumer.h4
-rw-r--r--include/ui/TMatHelpers.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/include/gui/IGraphicBufferConsumer.h b/include/gui/IGraphicBufferConsumer.h
index 3327b37..0e35f13 100644
--- a/include/gui/IGraphicBufferConsumer.h
+++ b/include/gui/IGraphicBufferConsumer.h
@@ -91,6 +91,10 @@ public:
// Indicates whether this buffer has been seen by a consumer yet
bool mAcquireCalled;
+
+ // Indicates this buffer must be transformed by the inverse transform of the screen
+ // it is displayed onto. This is applied after mTransform.
+ bool mTransformToDisplayInverse;
};
diff --git a/include/ui/TMatHelpers.h b/include/ui/TMatHelpers.h
index cead10a..a6aadca 100644
--- a/include/ui/TMatHelpers.h
+++ b/include/ui/TMatHelpers.h
@@ -245,7 +245,7 @@ template <template<typename T> class BASE, typename T>
class TMatDebug {
public:
String8 asString() const {
- return matrix::asString(*this);
+ return matrix::asString( static_cast< const BASE<T>& >(*this) );
}
};