merge from froyo-plus-aosp

Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
This commit is contained in:
The Android Open Source Project 2010-06-21 11:23:45 -07:00
commit ecfae4c86a

View File

@ -485,13 +485,13 @@ void egl_window_surface_v2_t::copyBlt(
copybit_device_t* const copybit = blitengine; copybit_device_t* const copybit = blitengine;
if (copybit) { if (copybit) {
copybit_image_t simg; copybit_image_t simg;
simg.w = src->width; simg.w = src->stride;
simg.h = src->height; simg.h = src->height;
simg.format = src->format; simg.format = src->format;
simg.handle = const_cast<native_handle_t*>(src->handle); simg.handle = const_cast<native_handle_t*>(src->handle);
copybit_image_t dimg; copybit_image_t dimg;
dimg.w = dst->width; dimg.w = dst->stride;
dimg.h = dst->height; dimg.h = dst->height;
dimg.format = dst->format; dimg.format = dst->format;
dimg.handle = const_cast<native_handle_t*>(dst->handle); dimg.handle = const_cast<native_handle_t*>(dst->handle);