commit 87379e17c5e95c6fe0d88b3b9ae134355cfafc66
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 29 12:11:10 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 29 12:11:10 2013 +0000
tree 8814bfed3ccb9726f88cdf0760ba81d3a88b1cb5
parent 6acd09e2b07ef547dbc0c3a69425a4dcda0cca51

Fix minor cppcheck-found issues

https://codereview.chromium.org/13146005/



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

src/gpu/GrAAHairLinePathRenderer.cpp

diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index 9e24bed..0c64a3b 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -160,7 +160,6 @@
         return -1;
     }
 
-    static const int kMaxSub = 4;
     // tolerance of triangle height in pixels
     // tuned on windows  Quadro FX 380 / Z600
     // trade off of fill vs cpu time on verts
@@ -170,6 +169,7 @@
     if (dsqd <= SkScalarMul(gSubdivTol, gSubdivTol)) {
         return 0;
     } else {
+        static const int kMaxSub = 4;
         // subdividing the quad reduces d by 4. so we want x = log4(d/tol)
         // = log4(d*d/tol*tol)/2
         // = log2(d*d/tol*tol)

src/ports/SkFontHost_mac.cpp

diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 6ae2ea4..79e4bde 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -357,7 +357,8 @@
     }
 };
 
-Offscreen::Offscreen() : fRGBSpace(NULL), fCG(NULL) {
+Offscreen::Offscreen() : fRGBSpace(NULL), fCG(NULL), 
+                         fDoAA(false), fDoLCD(false) {
     fSize.set(0, 0);
 }
 

src/utils/SkBitSet.cpp

diff --git a/src/utils/SkBitSet.cpp b/src/utils/SkBitSet.cpp
index 664c8cd..36ff6cb 100755
--- a/src/utils/SkBitSet.cpp
+++ b/src/utils/SkBitSet.cpp
@@ -23,7 +23,7 @@
     *this = source;
 }
 
-const SkBitSet& SkBitSet::operator=(const SkBitSet& rhs) {
+SkBitSet& SkBitSet::operator=(const SkBitSet& rhs) {
     if (this == &rhs) {
         return *this;
     }

src/utils/SkBitSet.h

diff --git a/src/utils/SkBitSet.h b/src/utils/SkBitSet.h
index 484fc2a..e113fd7 100755
--- a/src/utils/SkBitSet.h
+++ b/src/utils/SkBitSet.h
@@ -20,7 +20,7 @@
     explicit SkBitSet(int numberOfBits);
     explicit SkBitSet(const SkBitSet& source);
 
-    const SkBitSet& operator=(const SkBitSet& rhs);
+    SkBitSet& operator=(const SkBitSet& rhs);
     bool operator==(const SkBitSet& rhs);
     bool operator!=(const SkBitSet& rhs);