gfx/skia/patches/0031-Bug-945588-Add-include-guard.patch

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

     1 # HG changeset patch
     2 # User Ehsan Akhgari <ehsan@mozilla.com>
     4 Bug 945588 - Add include guards to SkConfig8888.h
     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 @@
    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   */
    19 +#ifndef SkConfig8888_DEFINED
    20 +#define SkConfig8888_DEFINED
    22  #include "SkCanvas.h"
    23  #include "SkColorPriv.h"
    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());
    34      SkConvertConfig8888Pixels(dstPixels, dstRowBytes, SkCanvas::kNative_Premul_Config8888, srcPixels, srcRowBytes, srcConfig8888, w, h);
    35  }
    37  }
    38 +
    39 +#endif

mercurial