Revert of Revert of make gm background colors 565 compatible

gm/emptypath.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 74 matching lines @@
                     canvas->translate(0, rect.height() + 40 * SK_Scalar1);
                     canvas->save();
                 } else {
                     canvas->translate(rect.width() + 40 * SK_Scalar1, 0);
                 }
                 ++i;
 
 
                 SkColor color = rand.nextU();
                 color = 0xff000000 | color; // force solid
-                sk_tool_utils::color_to_565(&color);
+                color = sk_tool_utils::color_to_565(color);
                 this->drawEmpty(canvas, color, rect,
                                 gStyles[style].fStyle, gFills[fill].fFill);
 
                 SkPaint rectPaint;
                 rectPaint.setColor(SK_ColorBLACK);
                 rectPaint.setStyle(SkPaint::kStroke_Style);
                 rectPaint.setStrokeWidth(-1);
                 rectPaint.setAntiAlias(true);
                 canvas->drawRect(rect, rectPaint);
 
@@ skipping 19 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new EmptyPathGM; }
 static GMRegistry reg(MyFactory);
 
 }