The Tor Browser / file comparison
comparison: gfx/skia/patches/0031-Bug-945588-Add-include-guard.patch
gfx/skia/patches/0031-Bug-945588-Add-include-guard.patch
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
equal
deleted
inserted
replaced
| -1:000000000000 | 0:0c28d7b44933 |
|---|---|
| 1 # HG changeset patch | |
| 2 # User Ehsan Akhgari <ehsan@mozilla.com> | |
| 3 | |
| 4 Bug 945588 - Add include guards to SkConfig8888.h | |
| 5 | |
| 6 diff --git a/gfx/skia/src/core/SkConfig8888.h b/gfx/skia/src/core/SkConfig8888.h | |
| 7 index 96eaef2..36bc9b4 100644 | |
| 8 --- a/gfx/skia/src/core/SkConfig8888.h | |
| 9 +++ b/gfx/skia/src/core/SkConfig8888.h | |
| 10 @@ -1,16 +1,18 @@ | |
| 11 | |
| 12 /* | |
| 13 * Copyright 2011 Google Inc. | |
| 14 * | |
| 15 * Use of this source code is governed by a BSD-style license that can be | |
| 16 * found in the LICENSE file. | |
| 17 */ | |
| 18 | |
| 19 +#ifndef SkConfig8888_DEFINED | |
| 20 +#define SkConfig8888_DEFINED | |
| 21 | |
| 22 #include "SkCanvas.h" | |
| 23 #include "SkColorPriv.h" | |
| 24 | |
| 25 /** | |
| 26 * Converts pixels from one Config8888 to another Config8888 | |
| 27 */ | |
| 28 void SkConvertConfig8888Pixels(uint32_t* dstPixels, | |
| 29 @@ -69,8 +71,10 @@ static inline void SkCopyConfig8888ToBitmap(const SkBitmap& dstBmp, | |
| 30 int h = dstBmp.height(); | |
| 31 size_t dstRowBytes = dstBmp.rowBytes(); | |
| 32 uint32_t* dstPixels = reinterpret_cast<uint32_t*>(dstBmp.getPixels()); | |
| 33 | |
| 34 SkConvertConfig8888Pixels(dstPixels, dstRowBytes, SkCanvas::kNative_Premul_Config8888, srcPixels, srcRowBytes, srcConfig8888, w, h); | |
| 35 } | |
| 36 | |
| 37 } | |
| 38 + | |
| 39 +#endif |
