commit 911ac31759cb7b77a856af8806b4e064d50d7422
author Ed Tanous <ed.tanous@intel.com> Tue Aug 15 09:37:42 2017 -0700
committer Ed Tanous <ed.tanous@intel.com> Wed Oct 11 13:34:56 2017 -0700
tree c4b714fabb2b956936ab6dffc18d9ff418756cf4
parent 8f0c0481d2280919b38a31656ba21a4347d12620

Large updates to webserver

Do not merge yet

Change-Id: I38c56844c1b0e3e8e5493c2705e62e6db7ee2102

src/ast_jpeg_decoder_test.cpp

diff --git a/src/ast_jpeg_decoder_test.cpp b/src/ast_jpeg_decoder_test.cpp
index 22c9ecf..b8faa29 100644
--- a/src/ast_jpeg_decoder_test.cpp
+++ b/src/ast_jpeg_decoder_test.cpp
@@ -8,9 +8,9 @@
 #endif
 
 using namespace testing;
-MATCHER_P2(IsBetween, a, b, std::string(negation ? "isn't" : "is") +
-                                " between " + PrintToString(a) + " and " +
-                                PrintToString(b)) {
+MATCHER_P2(IsBetween, a, b,
+           std::string(negation ? "isn't" : "is") + " between " +
+               PrintToString(a) + " and " + PrintToString(b)) {
   return a <= arg && arg <= b;
 };
 
@@ -21,8 +21,9 @@
   // consisting of the color 0x8EFFFA in a web browser window
   FILE *fp = fopen("test_resources/aspeedbluescreen.bin", "rb");
   EXPECT_NE(fp, nullptr);
-  size_t bufferlen = fread(out.buffer.data(), sizeof(char),
-                           out.buffer.size() * sizeof(long), fp);
+  size_t bufferlen =
+      fread(out.buffer.data(), sizeof(decltype(out.buffer)::value_type),
+            out.buffer.size(), fp);
   fclose(fp);
 
   ASSERT_GT(bufferlen, 0);