commit d4050d36ef669fd3cd68654cc3798d137ac35ea3
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 31 22:49:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 22:49:14 2017 +0000
tree 9b390c92e9c4e2ee1baf8d7c0cc879e425bd7521
parent e7de90222b5f41a64cb9a764748a2c4b141fca89
parent 1093cf302cdbeb8cbf8ebe8bcaf9ca9ac11600a1

Merge "Fix -Wdouble-promotion warnings"

libs/ui/GraphicBufferAllocator.cpp

diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp
index 5ae4faa..07ad4c1 100644
--- a/libs/ui/GraphicBufferAllocator.cpp
+++ b/libs/ui/GraphicBufferAllocator.cpp
@@ -64,7 +64,7 @@
         const alloc_rec_t& rec(list.valueAt(i));
         if (rec.size) {
             snprintf(buffer, SIZE, "%10p: %7.2f KiB | %4u (%4u) x %4u | %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.layerCount, rec.format,
                     rec.usage, rec.requestorName.c_str());
         } else {
@@ -76,7 +76,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;