fix warnings:

- initializer order in PictureRenderer.h
- const in xfermode overrides



git-svn-id: http://skia.googlecode.com/svn/trunk@6946 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
mike@reedtribe.org 2012-12-24 18:26:43 +00:00
parent 102b4d57af
commit 3af2b8def6
2 changed files with 3 additions and 3 deletions

View File

@ -120,7 +120,7 @@ public:
SkPowerMode(SkScalar exponent) { this->init(exponent); }
virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
const SkAlpha aa[]);
const SkAlpha aa[]) const SK_OVERRIDE;
typedef SkFlattenable* (*Factory)(SkFlattenableReadBuffer&);
@ -160,7 +160,7 @@ void SkPowerMode::init(SkScalar e) {
}
void SkPowerMode::xfer16(uint16_t dst[], const SkPMColor src[], int count,
const SkAlpha aa[]) {
const SkAlpha aa[]) const {
for (int i = 0; i < count; i++) {
SkPMColor c = src[i];
int r = SkGetPackedR32(c);

View File

@ -184,10 +184,10 @@ public:
, fBBoxHierarchyType(kNone_BBoxHierarchyType)
, fGridWidth(0)
, fGridHeight(0)
, fScaleFactor(SK_Scalar1)
#if SK_SUPPORT_GPU
, fGrContext(fGrContextFactory.get(GrContextFactory::kNative_GLContextType))
#endif
, fScaleFactor(SK_Scalar1)
{
sk_bzero(fDrawFilters, sizeof(fDrawFilters));
fViewport.set(0, 0);