display: Fix warnings

Treat warnings as errors again

Change-Id: Ibd7f484d31ad420b85e82fd5183d70bf7dce4bfa

2 files changed, 5 insertions, 5 deletions

diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp
index d2b00dd0..7841bb73 100644
--- a/libcopybit/copybit_c2d.cpp
+++ b/libcopybit/copybit_c2d.cpp
@@ -503,7 +503,7 @@ static int set_image(copybit_context_t* ctx, uint32 surfaceId,
     struct private_handle_t* handle = (struct private_handle_t*)rhs->handle;
     C2D_SURFACE_TYPE surfaceType;
     int status = COPYBIT_SUCCESS;
-    uintptr_t gpuaddr = 0;
+    uint64_t gpuaddr = 0;
     int c2d_format;
     mapped_idx = -1;
 
@@ -1179,7 +1179,7 @@ static int stretch_copybit_internal(
         return COPYBIT_FAILURE;
     }
     if (need_temp_dst) {
-        if (get_size(dst_info) != ctx->temp_dst_buffer.size) {
+        if (get_size(dst_info) != (int) ctx->temp_dst_buffer.size) {
             free_temp_buffer(ctx->temp_dst_buffer);
             // Create a temp buffer and set that as the destination.
             if (COPYBIT_FAILURE == get_temp_buffer(dst_info, ctx->temp_dst_buffer)) {
@@ -1261,7 +1261,7 @@ static int stretch_copybit_internal(
         return COPYBIT_FAILURE;
     }
     if (need_temp_src) {
-        if (get_size(src_info) != ctx->temp_src_buffer.size) {
+        if (get_size(src_info) != (int) ctx->temp_src_buffer.size) {
             free_temp_buffer(ctx->temp_src_buffer);
             // Create a temp buffer and set that as the destination.
             if (COPYBIT_SUCCESS != get_temp_buffer(src_info,
diff --git a/libcopybit/software_converter.cpp b/libcopybit/software_converter.cpp
index 9ea87670..e5c03b57 100644
--- a/libcopybit/software_converter.cpp
+++ b/libcopybit/software_converter.cpp
@@ -213,7 +213,7 @@ int convert_yuv_c2d_to_yuv_android(private_handle_t *hnd,
             return COPYBIT_FAILURE;
     }
 
-    ret = copy_source_to_destination(hnd->base, dst_hnd->base, info);
+    ret = copy_source_to_destination((uintptr_t) hnd->base, (uintptr_t) dst_hnd->base, info);
     return ret;
 }
 
@@ -258,6 +258,6 @@ int convert_yuv_android_to_yuv_c2d(private_handle_t *hnd,
             return -1;
     }
 
-    ret = copy_source_to_destination(hnd->base, dst_hnd->base, info);
+    ret = copy_source_to_destination((uintptr_t) hnd->base, (uintptr_t) dst_hnd->base, info);
     return ret;
 }