Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(458)

Side by Side Diff: include/core/SkColorPriv.h

Issue 382633004: fix typo, had two RGBA instead of RGBA and BGRA (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkColorPriv_DEFINED 8 #ifndef SkColorPriv_DEFINED
9 #define SkColorPriv_DEFINED 9 #define SkColorPriv_DEFINED
10 10
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 73
74 #if defined(SK_PMCOLOR_IS_RGBA) && !LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA 74 #if defined(SK_PMCOLOR_IS_RGBA) && !LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA
75 #error "SK_PMCOLOR_IS_RGBA does not match SK_*32_SHIFT values" 75 #error "SK_PMCOLOR_IS_RGBA does not match SK_*32_SHIFT values"
76 #endif 76 #endif
77 77
78 #if defined(SK_PMCOLOR_IS_BGRA) && !LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_BGRA 78 #if defined(SK_PMCOLOR_IS_BGRA) && !LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_BGRA
79 #error "SK_PMCOLOR_IS_BGRA does not match SK_*32_SHIFT values" 79 #error "SK_PMCOLOR_IS_BGRA does not match SK_*32_SHIFT values"
80 #endif 80 #endif
81 81
82 #if !defined(SK_PMCOLOR_IS_RGBA) && !defined(SK_PMCOLOR_IS_RGBA) 82 #if !defined(SK_PMCOLOR_IS_RGBA) && !defined(SK_PMCOLOR_IS_BGRA)
83 // deduce which to define from the _SHIFT defines 83 // deduce which to define from the _SHIFT defines
84 84
85 #if LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA 85 #if LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA
86 #define SK_PMCOLOR_IS_RGBA 86 #define SK_PMCOLOR_IS_RGBA
87 #elif LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_BGRA 87 #elif LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_BGRA
88 #define SK_PMCOLOR_IS_BGRA 88 #define SK_PMCOLOR_IS_BGRA
89 #else 89 #else
90 #error "need 32bit packing to be either RGBA or BGRA" 90 #error "need 32bit packing to be either RGBA or BGRA"
91 #endif 91 #endif
92 #endif 92 #endif
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 int srcG = SkColorGetG(src); 1050 int srcG = SkColorGetG(src);
1051 int srcB = SkColorGetB(src); 1051 int srcB = SkColorGetB(src);
1052 1052
1053 for (int i = 0; i < width; i++) { 1053 for (int i = 0; i < width; i++) {
1054 dst[i] = SkBlendLCD16Opaque(srcR, srcG, srcB, dst[i], mask[i], 1054 dst[i] = SkBlendLCD16Opaque(srcR, srcG, srcB, dst[i], mask[i],
1055 opaqueDst); 1055 opaqueDst);
1056 } 1056 }
1057 } 1057 }
1058 1058
1059 #endif 1059 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698