commit 1220e1c28a6fb75817eec056fc307190d50ae8e6
author deanm@chromium.org <deanm@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jun 11 12:26:47 2009 +0000
committer deanm@chromium.org <deanm@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jun 11 12:26:47 2009 +0000
tree 2ec1fb398375506a4e14b360cd5461415ab68127
parent 00dae86f5872b60927b28a32b375bc01cd7c61c9

Some Linux / 64-bit compile fixes.

Review URL: http://codereview.appspot.com/63189


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

samplecode/SampleAll.cpp

diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 0394056..748c4bc 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -257,7 +257,7 @@
         }
     }
     
-    Line2DPathEffect::Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
+    Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
     {
         fWidth = buffer.readScalar();
     }

samplecode/SampleCode.h

diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h
index ff660f2..fd3ed2a 100644
--- a/samplecode/SampleCode.h
+++ b/samplecode/SampleCode.h
@@ -20,7 +20,7 @@
 
 class SkViewRegister : SkNoncopyable {
 public:
-    SkViewRegister(SkViewFactory);
+    explicit SkViewRegister(SkViewFactory);
     
     static const SkViewRegister* Head() { return gHead; }
     

samplecode/SampleTextEffects.cpp

diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index f64e187..cd18006 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -245,7 +245,7 @@
         }
     }
     
-    Line2DPathEffect::Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
+    Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
     {
         fWidth = buffer.readScalar();
     }

src/animator/SkPaintParts.h

diff --git a/src/animator/SkPaintParts.h b/src/animator/SkPaintParts.h
index a8bb8bd..c8c978f 100644
--- a/src/animator/SkPaintParts.h
+++ b/src/animator/SkPaintParts.h
@@ -73,7 +73,7 @@
     virtual void dump(SkAnimateMaker *);
 #endif
     SkTypeface* getTypeface() {
-        return SkTypeface::Create(fontName.c_str(), style); }
+        return SkTypeface::CreateFromName(fontName.c_str(), style); }
 protected:
     virtual bool add();
     SkString fontName;

src/ports/SkFontHost_fontconfig.cpp

diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index a52747a..d3a3211 100644
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -119,7 +119,7 @@
                 fcvalue.u.s = (FcChar8*) value;
                 break;
             case FcTypeInteger:
-                fcvalue.u.i = (int) value;
+                fcvalue.u.i = (int)(intptr_t)value;
                 break;
             default:
                 SkASSERT(!"FontMatch unhandled type");