# HG changeset patch

Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834

   return surfaceBounds.Intersect(bounds);

 }

-static const int kARGBAlphaOffset =

-    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;

+static const int kARGBAlphaOffset = 0;  // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;

 static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,

                              const int32_t aStride, SurfaceFormat aFormat) {

 // The following values are endian-independent synonyms. The _UINT32 suffix

 // indicates that the name reflects the layout when viewed as a uint32_t

 // value.

-#if MOZ_LITTLE_ENDIAN

   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB

-#elif MOZ_BIG_ENDIAN

-  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB

-#else

-#  error "bad endianness"

-#endif

+#else

+    #define SKCMS_PORTABLE

 #endif

 // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.

 static uint16_t read_big_u16(const uint8_t* ptr) {

     uint16_t be;

     memcpy(&be, ptr, sizeof(be));

-#if defined(_MSC_VER)

+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

+    return be;

+#else

+    #if defined(_MSC_VER)

     return _byteswap_ushort(be);

-#else

+    #else

     return __builtin_bswap16(be);

+    #endif

 #endif

 }

 static uint32_t read_big_u32(const uint8_t* ptr) {

     uint32_t be;

     memcpy(&be, ptr, sizeof(be));

-#if defined(_MSC_VER)

+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__

+    return be;

+#else

+    #if defined(_MSC_VER)

     return _byteswap_ulong(be);

-#else

+    #else

     return __builtin_bswap32(be);

+    #endif

 #endif

 }