diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-26 12:23:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-26 12:23:53 -0700 |
| commit | 49d1735482dbcb017775b1807847e943f0a5152c (patch) | |
| tree | 6dc2bff4637ec52f036d570d4feef985e38f2dd2 /native | |
| parent | 324be170219987d643c1d05701a00cd358bc03e2 (diff) | |
| parent | 1b98a9e6a9bd22c4dca731491b701f7ece6a6eb7 (diff) | |
| download | frameworks_base-49d1735482dbcb017775b1807847e943f0a5152c.zip frameworks_base-49d1735482dbcb017775b1807847e943f0a5152c.tar.gz frameworks_base-49d1735482dbcb017775b1807847e943f0a5152c.tar.bz2 | |
am 1b98a9e6: 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. |