| Index: src/core/SkBitmapProcState_sample.h
|
| diff --git a/src/core/SkBitmapProcState_sample.h b/src/core/SkBitmapProcState_sample.h
|
| index 5c5f199f25cfe56b1cb25fe36c3d800628c93287..70305163cbe5d08bfec2dd5462d0c3ca0efda3bb 100644
|
| --- a/src/core/SkBitmapProcState_sample.h
|
| +++ b/src/core/SkBitmapProcState_sample.h
|
| @@ -1,10 +1,10 @@
|
| -
|
| /*
|
| * 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 "SkUtils.h"
|
|
|
| #if DSTSIZE==32
|
| @@ -42,7 +42,7 @@ void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,
|
| const uint32_t* SK_RESTRICT xy,
|
| int count, DSTTYPE* SK_RESTRICT colors) {
|
| SkASSERT(count > 0 && colors != NULL);
|
| - SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
|
| + SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
|
| SkDEBUGCODE(CHECKSTATE(s);)
|
|
|
| #ifdef PREAMBLE
|
| @@ -85,7 +85,7 @@ void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,
|
| int count, DSTTYPE* SK_RESTRICT colors) {
|
| SkASSERT(count > 0 && colors != NULL);
|
| SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
|
| - SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
|
| + SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
|
| SkDEBUGCODE(CHECKSTATE(s);)
|
|
|
| #ifdef PREAMBLE
|
| @@ -139,7 +139,7 @@ void MAKENAME(_filter_DX)(const SkBitmapProcState& s,
|
| const uint32_t* SK_RESTRICT xy,
|
| int count, DSTTYPE* SK_RESTRICT colors) {
|
| SkASSERT(count > 0 && colors != NULL);
|
| - SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
|
| + SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
|
| SkDEBUGCODE(CHECKSTATE(s);)
|
|
|
| #ifdef PREAMBLE
|
| @@ -185,7 +185,7 @@ void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,
|
| const uint32_t* SK_RESTRICT xy,
|
| int count, DSTTYPE* SK_RESTRICT colors) {
|
| SkASSERT(count > 0 && colors != NULL);
|
| - SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
|
| + SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
|
| SkDEBUGCODE(CHECKSTATE(s);)
|
|
|
| #ifdef PREAMBLE
|
|
|