src/core/SkSpriteBlitter_RGB16.cpp - Issue 26572006: Revert "Revert "change SkColorTable to be immutable""

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/core/SkSpriteBlitter_RGB16.cpp

Issue 26572006: Revert "Revert "change SkColorTable to be immutable"" (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 2 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

Download patch

Index: src/core/SkSpriteBlitter_RGB16.cpp

diff --git a/src/core/SkSpriteBlitter_RGB16.cpp b/src/core/SkSpriteBlitter_RGB16.cpp

index 9936867f3658e2ad94565061f1f61401f9c8276e..8cef76719e825db501531fffba87482d4d133f24 100644

--- a/src/core/SkSpriteBlitter_RGB16.cpp

+++ b/src/core/SkSpriteBlitter_RGB16.cpp

@@ -145,7 +145,7 @@ public:

#define SkSPRITE_PREAMBLE(srcBM, x, y) const SkPMColor* ctable = srcBM.getColorTable()->lockColors()

#define SkSPRITE_BLIT_PIXEL(dst, src) D16_S32A_Opaque_Pixel(dst, ctable[src])

#define SkSPRITE_NEXT_ROW

-#define SkSPRITE_POSTAMBLE(srcBM) srcBM.getColorTable()->unlockColors(false)

+#define SkSPRITE_POSTAMBLE(srcBM) srcBM.getColorTable()->unlockColors()

#include "SkSpriteBlitterTemplate.h"

#define SkSPRITE_CLASSNAME Sprite_D16_SIndex8A_Blend

@@ -159,7 +159,7 @@ public:

#define SkSPRITE_PREAMBLE(srcBM, x, y) const SkPMColor* ctable = srcBM.getColorTable()->lockColors(); unsigned src_scale = SkAlpha255To256(fSrcAlpha);

#define SkSPRITE_BLIT_PIXEL(dst, src) D16_S32A_Blend_Pixel(dst, ctable[src], src_scale)

#define SkSPRITE_NEXT_ROW

-#define SkSPRITE_POSTAMBLE(srcBM) srcBM.getColorTable()->unlockColors(false);

+#define SkSPRITE_POSTAMBLE(srcBM) srcBM.getColorTable()->unlockColors();

#include "SkSpriteBlitterTemplate.h"

///////////////////////////////////////////////////////////////////////////////

« no previous file with comments | « src/core/SkProcSpriteBlitter.cpp ('k') | src/gpu/SkGr.cpp » ('j') | no next file with comments »