commit 7b48b5f6c85af10938ee8f90d29d7376de6d20f1
author Dianne Hackborn <hackbod@google.com> Fri Jul 09 18:27:51 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 09 18:27:51 2010 -0700
tree 184d74e978d79f732d6fb57e72834f503bf09614
parent c9ab2f8f9007605bb565f4e29c17f9b12faf93ca
parent 9147d11a5f1d50496908bb1f49996e3ad23e19cc

am faccac76: Make a stupid thing about the glue less stupid.

Merge commit 'faccac7616795859af257777900db514d425a106' into gingerbread-plus-aosp

* commit 'faccac7616795859af257777900db514d425a106':
  Make a stupid thing about the glue less stupid.

opengl/libagl/egl.cpp

diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 54d7307..32e6c9f 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;
 }
-