Remove some PdfViewer warnings.

Fix build.

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

diff --git a/experimental/PdfViewer/SkPdfFont.h b/experimental/PdfViewer/SkPdfFont.h
index 4a66edf..a46e31c 100644 (file)
--- a/experimental/PdfViewer/SkPdfFont.h
+++ b/experimental/PdfViewer/SkPdfFont.h
@@ -54,7 +54,7 @@ struct SkUnencodedText {
 public:
     SkUnencodedText(const SkPdfString* obj) {
         text = (void*)obj->c_str();
-        len = obj->lenstr();
+        len = (int) obj->lenstr();
     }
 };
 
@@ -272,7 +272,7 @@ public:
 
         unsigned long ch4 = ch;
         char utf8[10];
-        int len = SkUTF8_FromUnichar(ch4, utf8);
+        size_t len = SkUTF8_FromUnichar((SkUnichar) ch4, utf8);
 
         canvas->drawText(utf8, len, SkDoubleToScalar(0), SkDoubleToScalar(0), *paint);
 

diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp
index 1c376b8..8c77637 100644 (file)
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp
@@ -379,7 +379,7 @@ SkPdfNativeObject* SkPdfNativeDoc::readObject(int id/*, int expectedGeneration*/
     const unsigned char* current = fFileContent + startOffset;
     const unsigned char* end = fFileContent + fContentLength;
 
-    SkPdfNativeTokenizer tokenizer(current, end - current, fAllocator, this);
+    SkPdfNativeTokenizer tokenizer(current, (int) (end - current), fAllocator, this);
 
     SkPdfNativeObject idObj;
     SkPdfNativeObject generationObj;
@@ -439,7 +439,7 @@ void SkPdfNativeDoc::fillPages(SkPdfPageTreeNodeDictionary* tree) {
         return;
     }
 
-    int cnt = kids->size();
+    int cnt = (int) kids->size();
     for (int i = 0; i < cnt; i++) {
         SkPdfNativeObject* obj = resolveReference(kids->objAtAIndex(i));
         if (fMapper->mapPageObjectDictionary(obj) != kPageObjectDictionary_SkPdfNativeObjectType) {

diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
index 1682fb9..d9b3c01 100644 (file)
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
@@ -91,7 +91,7 @@ bool SkPdfNativeObject::filterStream() {
         applyFilter(filterName.c_str());
     } else if (stream->isFilterAArray(NULL)) {
         const SkPdfArray* filters = stream->getFilterAsArray(NULL);
-        int cnt = filters->size();
+        int cnt = (int) filters->size();
         for (int i = cnt - 1; i >= 0; i--) {
             const SkPdfNativeObject* filterName = filters->objAtAIndex(i);
             if (filterName != NULL && filterName->isName()) {

diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.h b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.h
index 6ce5622..22b5a58 100644 (file)
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.h
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.h
@@ -1240,7 +1240,7 @@ public:
                     while ((key = iter.next(&obj)) != NULL) {
                         appendSpaces(&str, level + 2);
                         str.appendf("/%s %s\n", key,
-                                    obj->toString(0, level + strlen(key) + 4).c_str());
+                                    obj->toString(0, level + (int) strlen(key) + 4).c_str());
                     }
                     appendSpaces(&str, level);
                     str.append(">>");

diff --git a/experimental/PdfViewer/src/SkPdfContext.cpp b/experimental/PdfViewer/src/SkPdfContext.cpp
index c216255..f29afe5 100644 (file)
--- a/experimental/PdfViewer/src/SkPdfContext.cpp
+++ b/experimental/PdfViewer/src/SkPdfContext.cpp
@@ -74,7 +74,7 @@ void reportPdfRenderStats() {
         const char* key;
         int value = 0;
         while ((key = iter.next(&value)) != NULL) {
-            printf("%s: %s -> count %i\n", gRenderStatsNames[i], key, value);
+            SkDebugf("%s: %s -> count %i\n", gRenderStatsNames[i], key, value);
         }
     }
 }

diff --git a/experimental/PdfViewer/src/SkPdfRenderer.cpp b/experimental/PdfViewer/src/SkPdfRenderer.cpp
index 69adbda..714da50 100644 (file)
--- a/experimental/PdfViewer/src/SkPdfRenderer.cpp
+++ b/experimental/PdfViewer/src/SkPdfRenderer.cpp
@@ -1635,7 +1635,7 @@ static SkPdfResult PdfOp_CS_cs(SkPdfContext* pdfContext, SkCanvas* canvas,
         if (colorSpace->isName()) {
             colorOperator->fColorSpace = colorSpace->strRef();
         } else if (colorSpace->isArray()) {
-            int cnt = colorSpace->size();
+            size_t cnt = colorSpace->size();
             if (cnt == 0) {
                 SkPdfReport(kIgnoreError_SkPdfIssueSeverity, kIncostistentSizes_SkPdfIssue,
                             "color space has length 0", colorSpace, pdfContext);
@@ -1938,7 +1938,7 @@ static SkPdfResult skpdfGraphicsStateApplyD(SkPdfContext* pdfContext, SkPdfArray
         return kIgnoreError_SkPdfResult;
     }
 
-    int cnt = intervals->size();
+    int cnt = (int) intervals->size();
     if (cnt >= 256) {
         // TODO(edisonn): alloc memory
         SkPdfReport(kCodeWarning_SkPdfIssueSeverity, kNYI_SkPdfIssue,
@@ -2180,7 +2180,7 @@ static void skpdfGraphicsStateApplyBM_array(SkPdfContext* pdfContext, SkPdfArray
     }
 
     SkXfermode::Mode modes[256];
-    int cnt = blendModes->size();
+    int cnt = (int) blendModes->size();
     for (int i = 0; i < cnt; i++) {
         SkPdfNativeObject* name = blendModes->objAtAIndex(i);
         if (!name || !name->isName()) {