diff options
| author |  halcanary <halcanary@google.com> | 2014-12-03 11:03:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-03 11:03:52 -0800 |
| commit | 85a5750ffa71bf595d5e70e14b233d708be24ee9 (patch) | |
| tree | f804dddc65768bff785a12e796770ad3060a4406 /experimental | |
| parent | ee64d6ef49fbb63e0fc7934334c5ae5e900f5336 (diff) | |
Fix PdfViewer BGR byte order
BUG=skia:3184
Review URL: https://codereview.chromium.org/775763003
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/PdfViewer/src/SkPdfRenderer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/experimental/PdfViewer/src/SkPdfRenderer.cpp b/experimental/PdfViewer/src/SkPdfRenderer.cpp index 0995344093..35e6e060ad 100644 --- a/experimental/PdfViewer/src/SkPdfRenderer.cpp +++ b/experimental/PdfViewer/src/SkPdfRenderer.cpp @@ -9,6 +9,7 @@ #include "SkBitmapDevice.h" #include "SkCanvas.h" +#include "SkColorPriv.h" #include "SkDevice.h" #include "SkForceLinking.h" #include "SkGraphics.h" @@ -383,14 +384,15 @@ static SkBitmap* transferImageStreamToBitmap(const unsigned char* uncompressedSt // 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; |