commit f4598bd0cd518565e55dd9939d814f10b36798ef
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 19 18:26:37 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 19 18:26:37 2013 -0700
tree 81a3c8fe169fa90fa5686168f273dd9d426149e9
parent 8fbe1c78617cb4d44af674467db41307f5f019b7
parent bb887bd31297cb4a6ab34e2f21e6357d21baf57e

Merge "copybit: Fix type conversion error for GCC 4.7"

libcopybit/copybit_c2d.cpp

diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp
index d3ae827..9e2820d 100644
--- a/libcopybit/copybit_c2d.cpp
+++ b/libcopybit/copybit_c2d.cpp
@@ -1391,8 +1391,8 @@
 {
     int status = COPYBIT_SUCCESS;
     struct copybit_context_t* ctx = (struct copybit_context_t*)dev;
-    struct copybit_rect_t dr = { 0, 0, dst->w, dst->h };
-    struct copybit_rect_t sr = { 0, 0, src->w, src->h };
+    struct copybit_rect_t dr = { 0, 0, (int)dst->w, (int)dst->h };
+    struct copybit_rect_t sr = { 0, 0, (int)src->w, (int)src->h };
     pthread_mutex_lock(&ctx->wait_cleanup_lock);
     status = stretch_copybit_internal(dev, dst, src, &dr, &sr, region, false);
     pthread_mutex_unlock(&ctx->wait_cleanup_lock);