fix compiler warnings:
- initialization order in SkWriter32.h
- size_t -vs- int in rrects.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@6942 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index cccece9..e58d4f2 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -77,7 +77,7 @@
// The first complex case needs special handling since it is a square
fRRects[kNumSimpleCases].setRectRadii(SkRect::MakeWH(kTileY-2, kTileY-2), gRadii[0]);
- for (int i = 1; i < SK_ARRAY_COUNT(gRadii); ++i) {
+ for (size_t i = 1; i < SK_ARRAY_COUNT(gRadii); ++i) {
fRRects[kNumSimpleCases+i].setRectRadii(SkRect::MakeWH(kTileX-2, kTileY-2), gRadii[i]);
}
}
diff --git a/include/core/SkWriter32.h b/include/core/SkWriter32.h
index f6c216f..51044ab 100644
--- a/include/core/SkWriter32.h
+++ b/include/core/SkWriter32.h
@@ -35,11 +35,12 @@
SkWriter32(size_t minSize, void* initialStorage, size_t storageSize);
SkWriter32(size_t minSize)
- : fMinSize(minSize),
- fSize(0),
- fWrittenBeforeLastBlock(0),
- fHead(NULL),
- fTail(NULL) {}
+ : fHead(NULL)
+ , fTail(NULL)
+ , fMinSize(minSize)
+ , fSize(0)
+ , fWrittenBeforeLastBlock(0)
+ {}
~SkWriter32();