Reverting r12315 (More Windows 64b compilation warning fixes) due to compilation failures

git-svn-id: http://skia.googlecode.com/svn/trunk@12316 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 3 insertions, 3 deletions

diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 804dc41074..0b15d6ab43 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -123,7 +123,7 @@ static void align_text(SkDrawCacheProc glyphCacheProc, const SkPaint& paint,
     *y = *y - yAdj;
 }
 
-static int max_glyphid_for_typeface(SkTypeface* typeface) {
+static size_t max_glyphid_for_typeface(SkTypeface* typeface) {
     SkAutoResolveDefaultTypeface autoResolve(typeface);
     typeface = autoResolve.get();
     return typeface->countGlyphs() - 1;
diff --git a/src/pdf/SkPDFDeviceFlattener.cpp b/src/pdf/SkPDFDeviceFlattener.cpp
index 91c9803c32..9c0bf41db2 100644
--- a/src/pdf/SkPDFDeviceFlattener.cpp
+++ b/src/pdf/SkPDFDeviceFlattener.cpp
@@ -43,7 +43,7 @@ void SkPDFDeviceFlattener::drawPoints(const SkDraw& d, SkCanvas::PointMode mode,
     flattenPaint(d, &paintFlatten);
 
     SkPoint* flattenedPoints = SkNEW_ARRAY(SkPoint, count);
-    d.fMatrix->mapPoints(flattenedPoints, points, SkToS32(count));
+    d.fMatrix->mapPoints(flattenedPoints, points, count);
     SkDraw draw(d);
     SkMatrix identity = SkMatrix::I();
     draw.fMatrix = &identity;
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index f2b105d473..c3dc396fc4 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -426,7 +426,7 @@ static SkBitmap unpremultiply_bitmap(const SkBitmap& bitmap,
     SkBitmap outBitmap;
     outBitmap.setConfig(bitmap.config(), srcRect.width(), srcRect.height());
     outBitmap.allocPixels();
-    int dstRow = 0;
+    size_t dstRow = 0;
 
     outBitmap.lockPixels();
     bitmap.lockPixels();