ARM Skia NEON patches - 08 - Cleaning / possible fix

src/utils/mac/SkCreateCGImageRef.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkCGUtils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 
 static void SkBitmap_ReleaseInfo(void* info, const void* pixelData, size_t size) {
     SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(info);
     delete bitmap;
 }
 
-#define HAS_ARGB_SHIFTS(a, r, g, b) \
-    (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \
-    && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b))
-
 static bool getBitmapInfo(const SkBitmap& bm,
                           size_t* bitsPerComponent,
                           CGBitmapInfo* info,
                           bool* upscaleTo32) {
     if (upscaleTo32) {
         *upscaleTo32 = false;
     }
 
     switch (bm.config()) {
         case SkBitmap::kRGB_565_Config:
             if (upscaleTo32) {
                 *upscaleTo32 = true;
             }
             // fall through
         case SkBitmap::kARGB_8888_Config:
             *bitsPerComponent = 8;
-#if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 0, 8, 16) \
-|| defined(SK_CPU_BENDIAN) && HAS_ARGB_SHIFTS(0, 24, 16, 8)
+#if SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
             *info = kCGBitmapByteOrder32Big;
             if (bm.isOpaque()) {
                 *info |= kCGImageAlphaNoneSkipLast;
             } else {
                 *info |= kCGImageAlphaPremultipliedLast;
             }
-#elif defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0) \
-|| defined(SK_CPU_BENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0)
+#elif SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
             // Matches the CGBitmapInfo that Apple recommends for best
             // performance, used by google chrome.
             *info = kCGBitmapByteOrder32Little;
             if (bm.isOpaque()) {
                 *info |= kCGImageAlphaNoneSkipFirst;
             } else {
                 *info |= kCGImageAlphaPremultipliedFirst;
             }
 #else
             // ...add more formats as required...
@@ skipping 44 matching lines @@
         copy = new SkBitmap;
         // here we make a ceep copy of the pixels, since CG won't take our
         // 565 directly
         bm.copyTo(copy, SkBitmap::kARGB_8888_Config);
     } else {
         copy = new SkBitmap(bm);
     }
     return copy;
 }
 
-#undef HAS_ARGB_SHIFTS
-
 CGImageRef SkCreateCGImageRefWithColorspace(const SkBitmap& bm,
                                             CGColorSpaceRef colorSpace) {
     size_t bitsPerComponent SK_INIT_TO_AVOID_WARNING;
     CGBitmapInfo info       SK_INIT_TO_AVOID_WARNING;
 
     SkBitmap* bitmap = prepareForImageRef(bm, &bitsPerComponent, &info);
     if (NULL == bitmap) {
         return NULL;
     }
 
@@ skipping 108 matching lines @@
     CGColorSpaceRelease(cs);
 
     if (ctx) {
         CGContextDrawPDFPage(ctx, page);
         CGContextRelease(ctx);
     }
 
     output->swap(bitmap);
     return true;
 }