From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- .../0031-Bug-945588-Add-include-guard.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 gfx/skia/patches/archive/0031-Bug-945588-Add-include-guard.patch (limited to 'gfx/skia/patches/archive/0031-Bug-945588-Add-include-guard.patch') diff --git a/gfx/skia/patches/archive/0031-Bug-945588-Add-include-guard.patch b/gfx/skia/patches/archive/0031-Bug-945588-Add-include-guard.patch new file mode 100644 index 000000000..f58e7e165 --- /dev/null +++ b/gfx/skia/patches/archive/0031-Bug-945588-Add-include-guard.patch @@ -0,0 +1,39 @@ +# HG changeset patch +# User Ehsan Akhgari + +Bug 945588 - Add include guards to SkConfig8888.h + +diff --git a/gfx/skia/src/core/SkConfig8888.h b/gfx/skia/src/core/SkConfig8888.h +index 96eaef2..36bc9b4 100644 +--- a/gfx/skia/src/core/SkConfig8888.h ++++ b/gfx/skia/src/core/SkConfig8888.h +@@ -1,16 +1,18 @@ + + /* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + ++#ifndef SkConfig8888_DEFINED ++#define SkConfig8888_DEFINED + + #include "SkCanvas.h" + #include "SkColorPriv.h" + + /** + * Converts pixels from one Config8888 to another Config8888 + */ + void SkConvertConfig8888Pixels(uint32_t* dstPixels, +@@ -69,8 +71,10 @@ static inline void SkCopyConfig8888ToBitmap(const SkBitmap& dstBmp, + int h = dstBmp.height(); + size_t dstRowBytes = dstBmp.rowBytes(); + uint32_t* dstPixels = reinterpret_cast(dstBmp.getPixels()); + + SkConvertConfig8888Pixels(dstPixels, dstRowBytes, SkCanvas::kNative_Premul_Config8888, srcPixels, srcRowBytes, srcConfig8888, w, h); + } + + } ++ ++#endif -- cgit v1.2.3