Remove unused static functions from SampleApp and effects

Review URL: https://codereview.appspot.com/5956050

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

5 files changed, 0 insertions, 151 deletions

diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 5b12e68a99..b366ee1232 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -283,23 +283,6 @@ static const struct {
     { 0xFFFFFF, 0x000000 }  // identity case
 };
 
-static unsigned color_dist16(uint16_t a, uint16_t b) {
-    unsigned dr = SkAbs32(SkPacked16ToR32(a) - SkPacked16ToR32(b));
-    unsigned dg = SkAbs32(SkPacked16ToG32(a) - SkPacked16ToG32(b));
-    unsigned db = SkAbs32(SkPacked16ToB32(a) - SkPacked16ToB32(b));
-    
-    return SkMax32(dr, SkMax32(dg, db));
-}
-
-static unsigned scale_dist(unsigned dist, unsigned scale) {
-    dist >>= 6;
-    dist = (dist << 2) | dist;
-    dist = (dist << 4) | dist;
-    return dist;
-
-//    return SkAlphaMul(dist, scale);
-}
-
 static void apply_shader(SkPaint* paint, int index) {    
     raster_proc proc = gRastProcs[index];
     if (proc) {
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 7ed16dcc46..eced08a239 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -27,12 +27,6 @@
 #include "SkStream.h"
 #include "SkXMLParser.h"
 
-static const int gKernel[3][3] = {
-//    { -1, -2, -1 }, { -2, 12, -2 }, { -1, -2, -1 }
-    { 1, 2, 1 }, { 2, 64-12, 2 }, { 1, 2, 1 }
-};
-static const int gShift = 6;
-
 class ReduceNoise : public SkKernel33ProcMaskFilter {
 public:
     ReduceNoise(int percent256) : SkKernel33ProcMaskFilter(percent256) {}
@@ -190,64 +184,6 @@ static const struct {
     { "Subpixel", SkPaint::kSubpixelText_Flag, true }
 };
 
-static int count_char_points(const SkPaint& paint, char c) {
-    SkPath  path;
-
-    paint.getTextPath(&c, 1, 0, 0, &path);
-    return path.getPoints(NULL, 0);
-}
-
-static int gOld, gNew, gCount;
-
-static void dump(int c, int oldc, int newc) {
-    if (oldc != newc) {
-        gOld += oldc;
-        gNew += newc;
-        gCount += 1;
-        printf("char %c: old = %3d, new = %3d, reduction %g%%\n", c, oldc, newc, 100. * (oldc - newc) / oldc);
-    }
-}
-
-static void tab(int n) {
-//    printf("[%d] ", n); return;
-    SkASSERT(n >= 0);
-    for (int i = 0; i < n; i++)
-        printf("    ");
-}
-
-static void draw_rgn(const SkRegion& rgn, SkCanvas* canvas, const SkPaint& paint) {
-    SkRect    r;
-    SkRegion::Iterator  iter(rgn);
-
-    for (; !iter.done(); iter.next()) {
-        r.set(iter.rect());
-        canvas->drawRect(r, paint);
-    }
-}
-
-static void test_break(SkCanvas* canvas, const char text[], size_t length,
-                        SkScalar x, SkScalar y, const SkPaint& paint,
-                        SkScalar clickX) {
-    SkPaint linePaint;
-
-    linePaint.setAntiAlias(true);
-
-    SkScalar measured;
-
-    if (paint.breakText(text, length, clickX - x, &measured,
-                        SkPaint::kForward_TextBufferDirection)) {
-        linePaint.setColor(SK_ColorRED);
-        canvas->drawLine(x, y, x + measured, y, linePaint);
-    }
-
-    x += paint.measureText(text, length);
-    if (paint.breakText(text, length, x - clickX, &measured,
-                        SkPaint::kBackward_TextBufferDirection)) {
-        linePaint.setColor(SK_ColorBLUE);
-        canvas->drawLine(x - measured, y, x, y, linePaint);
-    }
-}
-
 static void DrawTheText(SkCanvas* canvas, const char text[], size_t length,
                         SkScalar x, SkScalar y, const SkPaint& paint,
                         SkScalar clickX, SkMaskFilter* mf) {
diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index a37d1039a5..4a1e202877 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -256,23 +256,6 @@ static const struct {
 
 #include "SkXfermode.h"
 
-static unsigned color_dist16(uint16_t a, uint16_t b) {
-    unsigned dr = SkAbs32(SkPacked16ToR32(a) - SkPacked16ToR32(b));
-    unsigned dg = SkAbs32(SkPacked16ToG32(a) - SkPacked16ToG32(b));
-    unsigned db = SkAbs32(SkPacked16ToB32(a) - SkPacked16ToB32(b));
-
-    return SkMax32(dr, SkMax32(dg, db));
-}
-
-static unsigned scale_dist(unsigned dist, unsigned scale) {
-    dist >>= 6;
-    dist = (dist << 2) | dist;
-    dist = (dist << 4) | dist;
-    return dist;
-
-//    return SkAlphaMul(dist, scale);
-}
-
 static void apply_shader(SkPaint* paint, int index) {
     raster_proc proc = gRastProcs[index];
     if (proc)
diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index 3b97250930..5905c1c90b 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -270,17 +270,6 @@ static inline unsigned pin(unsigned value, unsigned max) {
     return value;
 }
 
-static inline unsigned SkUClampMax(unsigned value, unsigned max) {
-    SkASSERT((int32_t)value >= 0);
-    SkASSERT((int32_t)max >= 0);
-
-    int diff = max - value;
-    // clear diff if diff is positive
-    diff &= diff >> 31;
-
-    return value + diff;
-}
-
 class SkLightingColorFilter : public SkColorFilter {
 public:
     SkLightingColorFilter(SkColor mul, SkColor add) : fMul(mul), fAdd(add) {}
diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp
index a93bd52dbb..6e8d2fe0f1 100644
--- a/src/effects/SkGradientShader.cpp
+++ b/src/effects/SkGradientShader.cpp
@@ -224,16 +224,6 @@ private:
     typedef SkShader INHERITED;
 };
 
-static inline unsigned scalarToU16(SkScalar x) {
-    SkASSERT(x >= 0 && x <= SK_Scalar1);
-
-#ifdef SK_SCALAR_IS_FLOAT
-    return (unsigned)(x * 0xFFFF);
-#else
-    return x - (x >> 16);   // probably should be x - (x > 0x7FFF) but that is slower
-#endif
-}
-
 Gradient_Shader::Gradient_Shader(const SkColor colors[], const SkScalar pos[],
              int colorCount, SkShader::TileMode mode, SkUnitMapper* mapper) {
     SkASSERT(colorCount > 1);
@@ -473,38 +463,6 @@ void Gradient_Shader::setCacheAlpha(U8CPU alpha) const {
     }
 }
 
-static inline int blend8(int a, int b, int scale) {
-    SkASSERT(a == SkToU8(a));
-    SkASSERT(b == SkToU8(b));
-    SkASSERT(scale >= 0 && scale <= 256);
-    return a + ((b - a) * scale >> 8);
-}
-
-static inline uint32_t dot8_blend_packed32(uint32_t s0, uint32_t s1,
-                                           int blend) {
-#if 0
-    int a = blend8(SkGetPackedA32(s0), SkGetPackedA32(s1), blend);
-    int r = blend8(SkGetPackedR32(s0), SkGetPackedR32(s1), blend);
-    int g = blend8(SkGetPackedG32(s0), SkGetPackedG32(s1), blend);
-    int b = blend8(SkGetPackedB32(s0), SkGetPackedB32(s1), blend);
-
-    return SkPackARGB32(a, r, g, b);
-#else
-    int otherBlend = 256 - blend;
-
-#if 0
-    U32 t0 = (((s0 & 0xFF00FF) * blend + (s1 & 0xFF00FF) * otherBlend) >> 8) & 0xFF00FF;
-    U32 t1 = (((s0 >> 8) & 0xFF00FF) * blend + ((s1 >> 8) & 0xFF00FF) * otherBlend) & 0xFF00FF00;
-    SkASSERT((t0 & t1) == 0);
-    return t0 | t1;
-#else
-    return  ((((s0 & 0xFF00FF) * blend + (s1 & 0xFF00FF) * otherBlend) >> 8) & 0xFF00FF) |
-            ((((s0 >> 8) & 0xFF00FF) * blend + ((s1 >> 8) & 0xFF00FF) * otherBlend) & 0xFF00FF00);
-#endif
-
-#endif
-}
-
 #define Fixed_To_Dot8(x)        (((x) + 0x80) >> 8)
 
 /** We take the original colors, not our premultiplied PMColors, since we can