commit f2528e2dadb3e051829c08fab3edbf9243876c72
author George Burgess IV <gbiv@google.com> Wed Feb 01 03:21:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 01 03:21:30 2017 +0000
tree d04370a78be66a858c0d3a457c965e1d1fdb14ce
parent 3e240c81be6073a13984d6153b17c19d1a628517
parent 7920557287dad336d1301153c9f4182807359e34

Merge "Fix -Wdouble-promotion warnings"
am: 7920557287

Change-Id: I2b7a8f6c24990220f90cb3d2f9221228ec330be5

libs/ui/GraphicBufferAllocator.cpp

diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp
index f885309..75dd8df 100644
--- a/libs/ui/GraphicBufferAllocator.cpp
+++ b/libs/ui/GraphicBufferAllocator.cpp
@@ -55,7 +55,7 @@
         const alloc_rec_t& rec(list.valueAt(i));
         if (rec.size) {
             snprintf(buffer, SIZE, "%10p: %7.2f KiB | %4u (%4u) x %4u | %8X | 0x%08x | %s\n",
-                    list.keyAt(i), rec.size/1024.0f,
+                    list.keyAt(i), rec.size/1024.0,
                     rec.width, rec.stride, rec.height, rec.format, rec.usage,
                     rec.requestorName.c_str());
         } else {
@@ -67,7 +67,7 @@
         result.append(buffer);
         total += rec.size;
     }
-    snprintf(buffer, SIZE, "Total allocated (estimate): %.2f KB\n", total/1024.0f);
+    snprintf(buffer, SIZE, "Total allocated (estimate): %.2f KB\n", total/1024.0);
     result.append(buffer);
     std::string deviceDump = mDevice->dump();
     result.append(deviceDump.c_str(), deviceDump.size());