diff options
author | Mathias Agopian <mathias@google.com> | 2010-10-26 12:19:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-26 12:19:48 -0700 |
commit | 1b98a9e6a9bd22c4dca731491b701f7ece6a6eb7 (patch) | |
tree | 5a2caac63fc46eadd8532660a682b51f35804963 /native | |
parent | d9588e9c3cd5ffd6bcab28d41b6eda83a1d3d65a (diff) | |
parent | 5219dd8e29d9248e89ef997c11f20d6a3dc0b3ee (diff) | |
download | frameworks_base-1b98a9e6a9bd22c4dca731491b701f7ece6a6eb7.zip frameworks_base-1b98a9e6a9bd22c4dca731491b701f7ece6a6eb7.tar.gz frameworks_base-1b98a9e6a9bd22c4dca731491b701f7ece6a6eb7.tar.bz2 |
am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
Diffstat (limited to 'native')
-rw-r--r-- | native/android/native_window.cpp | 4 | ||||
-rw-r--r-- | native/include/android/native_window.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/native/android/native_window.cpp b/native/android/native_window.cpp index bada078..7f92eec 100644 --- a/native/android/native_window.cpp +++ b/native/android/native_window.cpp @@ -58,8 +58,8 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window) { } int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, - int32_t height) { - native_window_set_buffers_geometry(window, width, height, 0); + int32_t height, int32_t format) { + native_window_set_buffers_geometry(window, width, height, format); return 0; } diff --git a/native/include/android/native_window.h b/native/include/android/native_window.h index ad03d0e..f3d7550 100644 --- a/native/include/android/native_window.h +++ b/native/include/android/native_window.h @@ -96,7 +96,7 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window); * For all of these parameters, if 0 is supplied then the window's base * value will come back in force. */ -int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height); +int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height, int32_t format); /** * Lock the window's next drawing surface for writing. |