src/core/SkBitmapProcState_procs.h - Issue 303543009: replace config() with colorType()

Unified Diff: src/core/SkBitmapProcState_procs.h

Issue 303543009: replace config() with colorType() (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: fix arm files Created 6 years, 7 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 side-by-side diff with in-line comments

Index: src/core/SkBitmapProcState_procs.h

diff --git a/src/core/SkBitmapProcState_procs.h b/src/core/SkBitmapProcState_procs.h

index 68c79835a9d1df2865bd70df2680565825822f69..0d3b723e6766fc6e7921d03e6a7bd3ccc355e279 100644

--- a/src/core/SkBitmapProcState_procs.h

+++ b/src/core/SkBitmapProcState_procs.h

@@ -90,7 +90,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(S32_opaque_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE SkPMColor

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kARGB_8888_Config); \

+#define CHECKSTATE(state) SkASSERT(4 == state.fBitmap->bytesPerPixel()); \

SkASSERT(state.fAlphaScale == 256)

#define RETURNDST(src) src

#define SRC_TO_FILTER(src) src

@@ -102,7 +102,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(S32_alpha_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE SkPMColor

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kARGB_8888_Config); \

+#define CHECKSTATE(state) SkASSERT(4 == state.fBitmap->bytesPerPixel()); \

SkASSERT(state.fAlphaScale < 256)

#define PREAMBLE(state) unsigned alphaScale = state.fAlphaScale

#define RETURNDST(src) SkAlphaMulQ(src, alphaScale)

@@ -121,7 +121,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(S16_opaque_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE uint16_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kRGB_565_Config); \

+#define CHECKSTATE(state) SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType()); \

SkASSERT(state.fAlphaScale == 256)

#define RETURNDST(src) SkPixel16ToPixel32(src)

#define SRC_TO_FILTER(src) src

@@ -137,7 +137,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(S16_alpha_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE uint16_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kRGB_565_Config); \

+#define CHECKSTATE(state) SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType()); \

SkASSERT(state.fAlphaScale < 256)

#define PREAMBLE(state) unsigned alphaScale = state.fAlphaScale

#define RETURNDST(src) SkAlphaMulQ(SkPixel16ToPixel32(src), alphaScale)

@@ -152,7 +152,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(SI8_opaque_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE uint8_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kIndex8_Config); \

+#define CHECKSTATE(state) SkASSERT(kIndex_8_SkColorType == state.fBitmap->colorType()); \

SkASSERT(state.fAlphaScale == 256)

#define PREAMBLE(state) const SkPMColor* SK_RESTRICT table = state.fBitmap->getColorTable()->lockColors()

#define RETURNDST(src) table[src]

@@ -166,7 +166,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(SI8_alpha_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE uint8_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kIndex8_Config); \

+#define CHECKSTATE(state) SkASSERT(kIndex_8_SkColorType == state.fBitmap->colorType()); \

SkASSERT(state.fAlphaScale < 256)

#define PREAMBLE(state) unsigned alphaScale = state.fAlphaScale; \

const SkPMColor* SK_RESTRICT table = state.fBitmap->getColorTable()->lockColors()

@@ -183,7 +183,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(S4444_opaque_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE SkPMColor16

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kARGB_4444_Config); \

+#define CHECKSTATE(state) SkASSERT(kARGB_4444_SkColorType == state.fBitmap->colorType()); \

SkASSERT(state.fAlphaScale == 256)

#define RETURNDST(src) SkPixel4444ToPixel32(src)

#define SRC_TO_FILTER(src) src

@@ -199,7 +199,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(S4444_alpha_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE SkPMColor16

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kARGB_4444_Config); \

+#define CHECKSTATE(state) SkASSERT(kARGB_4444_SkColorType == state.fBitmap->colorType()); \

SkASSERT(state.fAlphaScale < 256)

#define PREAMBLE(state) unsigned alphaScale = state.fAlphaScale

#define RETURNDST(src) SkAlphaMulQ(SkPixel4444ToPixel32(src), alphaScale)

@@ -218,7 +218,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(SA8_alpha_D32 ## suffix)

#define DSTSIZE 32

#define SRCTYPE uint8_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kA8_Config);

+#define CHECKSTATE(state) SkASSERT(kAlpha_8_SkColorType == state.fBitmap->colorType());

#define PREAMBLE(state) const SkPMColor pmColor = state.fPaintPMColor;

#define RETURNDST(src) SkAlphaMulQ(pmColor, SkAlpha255To256(src))

#define SRC_TO_FILTER(src) src

@@ -243,7 +243,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(S32_D16 ## suffix)

#define DSTSIZE 16

#define SRCTYPE SkPMColor

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kARGB_8888_Config); \

+#define CHECKSTATE(state) SkASSERT(4 == state.fBitmap->bytesPerPixel()); \

SkASSERT(state.fBitmap->isOpaque())

#define RETURNDST(src) SkPixel32ToPixel16(src)

#define SRC_TO_FILTER(src) src

@@ -261,7 +261,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(S16_D16 ## suffix)

#define DSTSIZE 16

#define SRCTYPE uint16_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kRGB_565_Config)

+#define CHECKSTATE(state) SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType())

#define RETURNDST(src) src

#define SRC_TO_FILTER(src) src

#include "SkBitmapProcState_sample.h"

@@ -278,7 +278,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(SI8_D16 ## suffix)

#define DSTSIZE 16

#define SRCTYPE uint8_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kIndex8_Config); \

+#define CHECKSTATE(state) SkASSERT(kIndex_8_SkColorType == state.fBitmap->colorType()); \

SkASSERT(state.fBitmap->isOpaque())

#define PREAMBLE(state) const uint16_t* SK_RESTRICT table = state.fBitmap->getColorTable()->lock16BitCache()

#define RETURNDST(src) table[src]

@@ -306,7 +306,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(Clamp_S16_D16 ## suffix)

#define SRCTYPE uint16_t

#define DSTTYPE uint16_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kRGB_565_Config)

+#define CHECKSTATE(state) SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType())

#define SRC_TO_FILTER(src) src

#include "SkBitmapProcState_shaderproc.h"

@@ -319,7 +319,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(Repeat_S16_D16 ## suffix)

#define SRCTYPE uint16_t

#define DSTTYPE uint16_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kRGB_565_Config)

+#define CHECKSTATE(state) SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType())

#define SRC_TO_FILTER(src) src

#include "SkBitmapProcState_shaderproc.h"

@@ -334,7 +334,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,

#define MAKENAME(suffix) NAME_WRAP(Clamp_SI8_opaque_D32 ## suffix)

#define SRCTYPE uint8_t

#define DSTTYPE uint32_t

-#define CHECKSTATE(state) SkASSERT(state.fBitmap->config() == SkBitmap::kIndex8_Config)

+#define CHECKSTATE(state) SkASSERT(kIndex_8_SkColorType == state.fBitmap->colorType())

#define PREAMBLE(state) const SkPMColor* SK_RESTRICT table = state.fBitmap->getColorTable()->lockColors()

#define SRC_TO_FILTER(src) table[src]

#define POSTAMBLE(state) state.fBitmap->getColorTable()->unlockColors()

« no previous file with comments | « src/core/SkBitmapProcState.cpp ('k') | src/core/SkBlitMask.h » ('j') | no next file with comments »