commit 2f4289991a99de1a9da5c6d64afab6915f5ed74b
author Jean-Michel Trivi <jmtrivi@google.com> Mon Aug 09 19:53:20 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 09 19:53:20 2010 -0700
tree 509b165a9c92abd77498666313483d9216648e5b
parent 3b362bebfc0e322085a49ab732b4865b92240dd1
parent c2fab76f691ddc1928f81c79aad26f047c02b5c4

am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread

Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp

* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
  Fix bug 2684341 Don't steal the media button event from the phone

opengl/libagl/egl.cpp

diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 5bbe441..8b476c0 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -485,13 +485,13 @@
     copybit_device_t* const copybit = blitengine;
     if (copybit)  {
         copybit_image_t simg;
-        simg.w = src->width;
+        simg.w = src->stride;
         simg.h = src->height;
         simg.format = src->format;
         simg.handle = const_cast<native_handle_t*>(src->handle);
 
         copybit_image_t dimg;
-        dimg.w = dst->width;
+        dimg.w = dst->stride;
         dimg.h = dst->height;
         dimg.format = dst->format;
         dimg.handle = const_cast<native_handle_t*>(dst->handle);

opengl/tests/gl_jni/jni/gl_code.cpp

diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp
index f031c79..ef66841 100644
--- a/opengl/tests/gl_jni/jni/gl_code.cpp
+++ b/opengl/tests/gl_jni/jni/gl_code.cpp
@@ -181,4 +181,3 @@
 {
     background = 1.0f - background;
 }
-