commit 2cfa3200fda29279eba1240170c7e873d12f9d48
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Apr 19 22:00:40 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Apr 19 22:00:40 2014 +0000
tree 42c50379d08cfbbf9d2af7b316010feafe1b1f78
parent 2dceedaa1e4dfb9accc82d8e3d3afac9ba5b2142

fix warnings around size_t/int
fix warnings around undeclared (non-static) functions

TBR=bsalomon@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/242643008

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

src/utils/SkLuaCanvas.cpp

diff --git a/src/utils/SkLuaCanvas.cpp b/src/utils/SkLuaCanvas.cpp
index 7e1d5a8..531cbb0 100644
--- a/src/utils/SkLuaCanvas.cpp
+++ b/src/utils/SkLuaCanvas.cpp
@@ -168,7 +168,7 @@
 void SkLuaCanvas::drawPoints(PointMode mode, size_t count,
                                const SkPoint pts[], const SkPaint& paint) {
     AUTO_LUA("drawPoints");
-    lua.pushArrayPoint(pts, count, "points");
+    lua.pushArrayPoint(pts, SkToInt(count), "points");
     lua.pushPaint(paint, "paint");
 }
 

src/utils/SkMatrix22.cpp

diff --git a/src/utils/SkMatrix22.cpp b/src/utils/SkMatrix22.cpp
index 107e123..a13b729 100644
--- a/src/utils/SkMatrix22.cpp
+++ b/src/utils/SkMatrix22.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkMatrix.h"
+#include "SkMatrix22.h"
 #include "SkPoint.h"
 #include "SkScalar.h"
 

src/utils/SkMatrix22.h

diff --git a/src/utils/SkMatrix22.h b/src/utils/SkMatrix22.h
index d0f4ed3..bc567ea 100644
--- a/src/utils/SkMatrix22.h
+++ b/src/utils/SkMatrix22.h
@@ -5,6 +5,9 @@
  * found in the LICENSE file.
  */
 
+#ifndef SkMatrix22_DEFINED
+#define SkMatrix22_DEFINED
+
 #include "SkPoint.h"
 
 class SkMatrix;
@@ -24,3 +27,5 @@
  *  and saves a multiply by not computing r.
  */
 void SkComputeGivensRotation(const SkVector& h, SkMatrix* G);
+
+#endif