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
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 6483218..26c122d 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -120,7 +120,7 @@
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::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);
diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index 5d6c516..c310b9f 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -184,10 +184,10 @@
, 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);