commit 34e8b811741eca50a0a34f4fed0de3a1e217131d
author Linux Build Service Account <lnxbuild@localhost> Wed Jun 26 15:33:13 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 26 15:33:13 2013 -0700
tree 89673d854fb57e43da7f76187325707fb78c14af
parent a1c443c063b40091097e5571922627b2899aaf42
parent 7c4baa4b0cbc7f9184f0f1e9dcf6fdfbef3aaafb

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

libcopybit/copybit.cpp

diff --git a/libcopybit/copybit.cpp b/libcopybit/copybit.cpp
index a3c93ba..23b336c 100644
--- a/libcopybit/copybit.cpp
+++ b/libcopybit/copybit.cpp
@@ -481,7 +481,7 @@
             }
         }
         const uint32_t maxCount = sizeof(list->req)/sizeof(list->req[0]);
-        const struct copybit_rect_t bounds = { 0, 0, dst->w, dst->h };
+        const struct copybit_rect_t bounds = { 0, 0, (int)dst->w, (int)dst->h };
         struct copybit_rect_t clip;
         status = 0;
         while ((status == 0) && region->next(region, &clip)) {
@@ -532,8 +532,8 @@
     struct copybit_image_t const *src,
     struct copybit_region_t const *region)
 {
-    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 };
     return stretch_copybit(dev, dst, src, &dr, &sr, region);
 }