diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-04 15:16:50 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-06 00:34:54 +0100 |
| commit | c962bf8b8fa4d9a6400811296fb270f47db68cf4 (patch) | |
| tree | f5e651935cbbf54e6d1488bbe19a6e2a4599a070 /libcopybit/copybit_c2d.cpp | |
| parent | 7a8a513ac8a2b9a76b36cf1341d45b00d88ed45c (diff) | |
| parent | 6445344dbaf08ec4d8fbf6aeeffdf29faed64e78 (diff) | |
| download | hardware_qcom_display-cm-10.1.tar.gz hardware_qcom_display-cm-10.1.tar.bz2 hardware_qcom_display-cm-10.1.zip | |
Merge remote-tracking branch 'aosp/jb-mr1.1-release' into cm-10.1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1
Change-Id: I44a10eaa285d0521669781a4fafb7641df209186
Diffstat (limited to 'libcopybit/copybit_c2d.cpp')
| -rw-r--r-- | libcopybit/copybit_c2d.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp index d6c6c3bd4..365be5f3d 100644 --- a/libcopybit/copybit_c2d.cpp +++ b/libcopybit/copybit_c2d.cpp @@ -1170,14 +1170,7 @@ static int stretch_copybit_internal( src_image.handle = src_hnd; // Copy the source. - status = copy_image((private_handle_t *)src->handle, &src_image, - CONVERT_TO_C2D_FORMAT); - if (status == COPYBIT_FAILURE) { - ALOGE("%s:copy_image failed in temp source",__FUNCTION__); - delete_handle(dst_hnd); - delete_handle(src_hnd); - return status; - } + copy_image((private_handle_t *)src->handle, &src_image, CONVERT_TO_C2D_FORMAT); // Flush the cache IMemAlloc* memalloc = sAlloc->getAllocator(src_hnd->flags); @@ -1249,13 +1242,7 @@ static int stretch_copybit_internal( trg_mapped); if (needTempDestination) { // copy the temp. destination without the alignment to the actual destination. - status = copy_image(dst_hnd, dst, CONVERT_TO_ANDROID_FORMAT); - if (status == COPYBIT_FAILURE) { - ALOGE("%s:copy_image failed in temp Dest",__FUNCTION__); - delete_handle(dst_hnd); - delete_handle(src_hnd); - return status; - } + copy_image(dst_hnd, dst, CONVERT_TO_ANDROID_FORMAT); // Invalidate the cache. IMemAlloc* memalloc = sAlloc->getAllocator(dst_hnd->flags); memalloc->clean_buffer((void *)(dst_hnd->base), dst_hnd->size, |