gfx/skia/patches/0031-Bug-945588-Add-include-guard.patch@6474c204b198 (annotated)
gfx/skia/patches/0031-Bug-945588-Add-include-guard.patch
Wed, 31 Dec 2014 06:09:35 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 31 Dec 2014 06:09:35 +0100
- changeset 0
- 6474c204b198
- permissions
- -rw-r--r--
Cloned upstream origin tor-browser at tor-browser-31.3.0esr-4.5-1-build1
revision ID fc1c9ff7c1b2defdbc039f12214767608f46423f for hacking purpose.
| michael@0 | 1 | # HG changeset patch |
| michael@0 | 2 | # User Ehsan Akhgari <ehsan@mozilla.com> |
| michael@0 | 3 | |
| michael@0 | 4 | Bug 945588 - Add include guards to SkConfig8888.h |
| michael@0 | 5 | |
| michael@0 | 6 | diff --git a/gfx/skia/src/core/SkConfig8888.h b/gfx/skia/src/core/SkConfig8888.h |
| michael@0 | 7 | index 96eaef2..36bc9b4 100644 |
| michael@0 | 8 | --- a/gfx/skia/src/core/SkConfig8888.h |
| michael@0 | 9 | +++ b/gfx/skia/src/core/SkConfig8888.h |
| michael@0 | 10 | @@ -1,16 +1,18 @@ |
| michael@0 | 11 | |
| michael@0 | 12 | /* |
| michael@0 | 13 | * Copyright 2011 Google Inc. |
| michael@0 | 14 | * |
| michael@0 | 15 | * Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 16 | * found in the LICENSE file. |
| michael@0 | 17 | */ |
| michael@0 | 18 | |
| michael@0 | 19 | +#ifndef SkConfig8888_DEFINED |
| michael@0 | 20 | +#define SkConfig8888_DEFINED |
| michael@0 | 21 | |
| michael@0 | 22 | #include "SkCanvas.h" |
| michael@0 | 23 | #include "SkColorPriv.h" |
| michael@0 | 24 | |
| michael@0 | 25 | /** |
| michael@0 | 26 | * Converts pixels from one Config8888 to another Config8888 |
| michael@0 | 27 | */ |
| michael@0 | 28 | void SkConvertConfig8888Pixels(uint32_t* dstPixels, |
| michael@0 | 29 | @@ -69,8 +71,10 @@ static inline void SkCopyConfig8888ToBitmap(const SkBitmap& dstBmp, |
| michael@0 | 30 | int h = dstBmp.height(); |
| michael@0 | 31 | size_t dstRowBytes = dstBmp.rowBytes(); |
| michael@0 | 32 | uint32_t* dstPixels = reinterpret_cast<uint32_t*>(dstBmp.getPixels()); |
| michael@0 | 33 | |
| michael@0 | 34 | SkConvertConfig8888Pixels(dstPixels, dstRowBytes, SkCanvas::kNative_Premul_Config8888, srcPixels, srcRowBytes, srcConfig8888, w, h); |
| michael@0 | 35 | } |
| michael@0 | 36 | |
| michael@0 | 37 | } |
| michael@0 | 38 | + |
| michael@0 | 39 | +#endif |
