commit 59f46b81f8bdd1b524f5cc43bc27603f9604c71a
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 10 17:30:58 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 10 17:30:58 2012 +0000
tree c074f4d76c87c4ab67e32405327a0c10201ed7e8
parent 676e66096c60615bac52f365111596de5c4ca8a6

Fixed Windows compiler complaints

http://codereview.appspot.com/6392044



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

src/pdf/SkPDFDevice.cpp

diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 68c210d..d05b640 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -1119,7 +1119,7 @@
         gsState.updateDrawingState(entry->fState);
 
         SkAutoDataUnref copy(entry->fContent.copyToData());
-        data->write(copy.data(), copy.size());
+        data->write(copy->data(), copy->size());
         entry = entry->fNext.get();
     }
     gsState.drainStack();

src/pdf/SkPDFImage.cpp

diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 72379b1..429667a 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -338,10 +338,10 @@
         SkRefPtr<SkPDFInt> zeroVal = new SkPDFInt(0);
         zeroVal->unref();  // SkRefPtr and new both took a reference.
         SkRefPtr<SkPDFScalar> scale5Val =
-                new SkPDFScalar(8.2258f);  // 255/2^5-1
+                new SkPDFScalar(SkFloatToScalar(8.2258f));  // 255/2^5-1
         scale5Val->unref();  // SkRefPtr and new both took a reference.
         SkRefPtr<SkPDFScalar> scale6Val =
-                new SkPDFScalar(4.0476f);  // 255/2^6-1
+                new SkPDFScalar(SkFloatToScalar(4.0476f));  // 255/2^6-1
         scale6Val->unref();  // SkRefPtr and new both took a reference.
         SkRefPtr<SkPDFArray> decodeValue = new SkPDFArray();
         decodeValue->unref();  // SkRefPtr and new both took a reference.