commit 2a6e502ea23d6691af3305c0982bd8dd2733e08d
author Dan Egnor <egnor@google.com> Fri Aug 06 18:59:49 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 06 18:59:49 2010 -0700
tree 509b165a9c92abd77498666313483d9216648e5b
parent 545fc38ee01bf6b6ab9441441e4275a5c178bcb6
parent 6f678531b937750a9fe5cf0676363ad427239246

am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp

* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
  COMMENT ONLY change to fix some formatting glitches and

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;
 }
-