Fix PdfViewer BGR byte order

experimental/PdfViewer/src/SkPdfRenderer.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPdfRenderer.h"
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
+#include "SkColorPriv.h"
 #include "SkDevice.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkPdfFont.h"
 #include "SkPdfGraphicsState.h"
 #include "SkPdfHeaders_autogen.h"
@@ skipping 354 matching lines @@
     SkBitmap* bitmap = new SkBitmap();
 
     //int components = GetColorSpaceComponents(colorSpace);
 //#define MAX_COMPONENTS 10
 
     // TODO(edisonn): assume start of lines are aligned at 32 bits?
     // Is there a faster way to load the uncompressed stream into a bitmap?
 
     // minimal support for now
     if ((colorSpace.equals("DeviceRGB") || colorSpace.equals("RGB")) && bpc == 8) {
-        SkColor* uncompressedStreamArgb = (SkColor*)malloc(width * height * sizeof(SkColor));
+        uint32_t* uncompressedStreamArgb = (SkColor*)malloc(width * height * sizeof(uint32_t));
 
         for (int h = 0 ; h < height; h++) {
             long i = width * (h);
             for (int w = 0 ; w < width; w++) {
-                uncompressedStreamArgb[i] = SkColorSetRGB(uncompressedStream[3 * w],
-                                                          uncompressedStream[3 * w + 1],
-                                                          uncompressedStream[3 * w + 2]);
+                uncompressedStreamArgb[i] = SkPackARGB32(0xFF,
+                                                         uncompressedStream[3 * w],
+                                                         uncompressedStream[3 * w + 1],
+                                                         uncompressedStream[3 * w + 2]);
                 i++;
             }
             uncompressedStream += bytesPerLine;
         }
 
         const SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
         bitmap->installPixels(info, uncompressedStreamArgb, info.minRowBytes());
     }
     else if ((colorSpace.equals("DeviceGray") || colorSpace.equals("Gray")) && bpc == 8) {
         unsigned char* uncompressedStreamA8 = (unsigned char*)malloc(width * height);
@@ skipping 2502 matching lines @@
 
     rect = SkRect::MakeWH(width, height);
 
     setup_bitmap(output, SkScalarCeilToInt(width), SkScalarCeilToInt(height));
 
     SkAutoTUnref<SkBaseDevice> device(SkNEW_ARGS(SkBitmapDevice, (*output)));
     SkCanvas canvas(device);
 
     return renderer->renderPage(page, &canvas, rect);
 }