OLD | NEW |
---|---|
1 #include "SkBlitMask.h" | 1 #include "SkBlitMask.h" |
2 #include "SkColor.h" | 2 #include "SkColor.h" |
3 #include "SkColorPriv.h" | 3 #include "SkColorPriv.h" |
4 | 4 |
5 static void D32_A8_Color(void* SK_RESTRICT dst, size_t dstRB, | 5 static void D32_A8_Color(void* SK_RESTRICT dst, size_t dstRB, |
6 const void* SK_RESTRICT maskPtr, size_t maskRB, | 6 const void* SK_RESTRICT maskPtr, size_t maskRB, |
7 SkColor color, int width, int height) { | 7 SkColor color, int width, int height) { |
8 SkPMColor pmc = SkPreMultiplyColor(color); | 8 SkPMColor pmc = SkPreMultiplyColor(color); |
9 size_t dstOffset = dstRB - (width << 2); | 9 size_t dstOffset = dstRB - (width << 2); |
10 size_t maskOffset = maskRB - width; | 10 size_t maskOffset = maskRB - width; |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
209 | 209 |
210 do { | 210 do { |
211 blit_lcd32_opaque_row(dstRow, srcRow, color, width); | 211 blit_lcd32_opaque_row(dstRow, srcRow, color, width); |
212 dstRow = (SkPMColor*)((char*)dstRow + dstRB); | 212 dstRow = (SkPMColor*)((char*)dstRow + dstRB); |
213 srcRow = (const SkPMColor*)((const char*)srcRow + maskRB); | 213 srcRow = (const SkPMColor*)((const char*)srcRow + maskRB); |
214 } while (--height != 0); | 214 } while (--height != 0); |
215 } | 215 } |
216 | 216 |
217 /////////////////////////////////////////////////////////////////////////////// | 217 /////////////////////////////////////////////////////////////////////////////// |
218 | 218 |
219 static SkBlitMask::ColorProc D32_A8_Factory(SkColor color) { | 219 SkBlitMask::ColorProc D32_A8_Factory(SkColor color) { |
mtklein
2013/11/11 17:17:04
Having to make this change makes me concerned that
kevin.petit.not.used.account
2013/11/11 18:10:34
Fixed. This wasn't necessary.
| |
220 if (SK_ColorBLACK == color) { | 220 if (SK_ColorBLACK == color) { |
221 return D32_A8_Black; | 221 return D32_A8_Black; |
222 } else if (0xFF == SkColorGetA(color)) { | 222 } else if (0xFF == SkColorGetA(color)) { |
223 return D32_A8_Opaque; | 223 return D32_A8_Opaque; |
224 } else { | 224 } else { |
225 return D32_A8_Color; | 225 return D32_A8_Color; |
226 } | 226 } |
227 } | 227 } |
228 | 228 |
229 static SkBlitMask::ColorProc D32_LCD32_Factory(SkColor color) { | 229 static SkBlitMask::ColorProc D32_LCD32_Factory(SkColor color) { |
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
583 if (flags & kSrcIsOpaque_RowFlag) { | 583 if (flags & kSrcIsOpaque_RowFlag) { |
584 index |= 1; | 584 index |= 1; |
585 } | 585 } |
586 SkASSERT((size_t)index < SK_ARRAY_COUNT(gProcs)); | 586 SkASSERT((size_t)index < SK_ARRAY_COUNT(gProcs)); |
587 return gProcs[index]; | 587 return gProcs[index]; |
588 default: | 588 default: |
589 break; | 589 break; |
590 } | 590 } |
591 return NULL; | 591 return NULL; |
592 } | 592 } |
OLD | NEW |