diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-26 12:18:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-26 12:18:19 -0700 |
| commit | 5219dd8e29d9248e89ef997c11f20d6a3dc0b3ee (patch) | |
| tree | 197c39a27ed7d5429b6f76301a686cf39cc88113 | |
| parent | a7b745ca75136112f369f249fd06c2edafe0a6f6 (diff) | |
| parent | 3026a1c4e88412b7fe997f93fedba871d79a03cd (diff) | |
| download | frameworks_base-5219dd8e29d9248e89ef997c11f20d6a3dc0b3ee.zip frameworks_base-5219dd8e29d9248e89ef997c11f20d6a3dc0b3ee.tar.gz frameworks_base-5219dd8e29d9248e89ef997c11f20d6a3dc0b3ee.tar.bz2 | |
Merge "add format parameter to setBufferGeometry" into gingerbread
| -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. |