remove unused Kernel33MaskFilter

samplecode/SampleText.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
-#include "SkKernel33MaskFilter.h"
 #include "SkPath.h"
 #include "SkRandom.h"
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
 #include "SkXfermode.h"
 
 #include "SkStream.h"
 #include "SkXMLParser.h"
 
-class ReduceNoise : public SkKernel33ProcMaskFilter {
-public:
-    ReduceNoise(int percent256) : SkKernel33ProcMaskFilter(percent256) {}
-    virtual uint8_t computeValue(uint8_t* const* srcRows) const {
-        int c = srcRows[1][1];
-        int min = 255, max = 0;
-        for (int i = 0; i < 3; i++)
-            for (int j = 0; j < 3; j++)
-                if (i != 1 || j != 1)
-                {
-                    int v = srcRows[i][j];
-                    if (max < v)
-                        max = v;
-                    if  (min > v)
-                        min = v;
-                }
-        if (c > max) c = max;
-    //    if (c < min) c = min;
-        return c;
-    }
-
-#ifndef SK_IGNORE_TO_STRING
-    virtual void toString(SkString* str) const SK_OVERRIDE {
-        str->append("ReduceNoise: (");
-        this->INHERITED::toString(str);
-        str->append(")");
-    }
-#endif
-
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(ReduceNoise)
-
-private:
-    ReduceNoise(SkReadBuffer& rb) : SkKernel33ProcMaskFilter(rb) {}
-
-    typedef SkKernel33ProcMaskFilter INHERITED;
-};
-
-class Darken : public SkKernel33ProcMaskFilter {
-public:
-    Darken(int percent256) : SkKernel33ProcMaskFilter(percent256) {}
-    virtual uint8_t computeValue(uint8_t* const* srcRows) const {
-        int c = srcRows[1][1];
-        float f = c / 255.f;
-
-        if (c >= 0) {
-            f = sqrtf(f);
-        } else {
-            f *= f;
-        }
-        SkASSERT(f >= 0 && f <= 1);
-        return (int)(f * 255);
-    }
-
-#ifndef SK_IGNORE_TO_STRING
-    virtual void toString(SkString* str) const SK_OVERRIDE {
-        str->append("Darken: (");
-        this->INHERITED::toString(str);
-        str->append(")");
-    }
-#endif
-
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Darken)
-
-private:
-    Darken(SkReadBuffer& rb) : SkKernel33ProcMaskFilter(rb) {}
-
-    typedef SkKernel33ProcMaskFilter INHERITED;
-};
-
-static SkMaskFilter* makemf() { return new Darken(0x30); }
-
 static void test_breakText() {
     SkPaint paint;
     const char* text = "sdfkljAKLDFJKEWkldfjlk#$%&sdfs.dsj";
     size_t length = strlen(text);
     SkScalar width = paint.measureText(text, length);
 
     SkScalar mm = 0;
     SkScalar nn = 0;
     for (SkScalar w = 0; w <= width; w += SK_Scalar1) {
         SkScalar m;
@@ skipping 94 matching lines @@
 static const struct {
     const char* fName;
     uint32_t    fFlags;
     bool        fFlushCache;
 } gHints[] = {
     { "Linear", SkPaint::kLinearText_Flag,     false },
     { "Normal",   0,                           true },
     { "Subpixel", SkPaint::kSubpixelText_Flag, true }
 };
 
-static void DrawTheText(SkCanvas* canvas, const char text[], size_t length,
-                        SkScalar x, SkScalar y, const SkPaint& paint,
-                        SkScalar clickX, SkMaskFilter* mf) {
+static void DrawTheText(SkCanvas* canvas, const char text[], size_t length, SkScalar x, SkScalar y,
+                        const SkPaint& paint, SkScalar clickX) {
     SkPaint p(paint);
 
 #if 0
     canvas->drawText(text, length, x, y, paint);
 #else
     {
         SkPoint pts[1000];
         SkScalar xpos = x;
         SkASSERT(length <= SK_ARRAY_COUNT(pts));
         for (size_t i = 0; i < length; i++) {
             pts[i].set(xpos, y), xpos += paint.getTextSize();
         }
         canvas->drawPosText(text, length, pts, paint);
     }
 #endif
 
     p.setSubpixelText(true);
     x += SkIntToScalar(180);
     canvas->drawText(text, length, x, y, p);
 
 #ifdef SK_DEBUG
     if (true) {
-    //    p.setMaskFilter(mf);
         p.setSubpixelText(false);
         p.setLinearText(true);
         x += SkIntToScalar(180);
         canvas->drawText(text, length, x, y, p);
     }
 #endif
 }
 
 class TextSpeedView : public SampleView {
 public:
     TextSpeedView() {
-        fMF = makemf();
-
         fHints = 0;
         fClickX = 0;
 
         test_breakText();
     }
 
-    virtual ~TextSpeedView() {
-        SkSafeUnref(fMF);
-    }
-
 protected:
     // overrides from SkEventSink
     virtual bool onQuery(SkEvent* evt) {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "Text");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
@@ skipping 44 matching lines @@
 
         const char* text = "Hamburgefons";
         size_t length = strlen(text);
 
         SkScalar y = SkIntToScalar(0);
         for (int i = 9; i <= 24; i++) {
             paint.setTextSize(SkIntToScalar(i) /*+ (gRand.nextU() & 0xFFFF)*/);
             for (SkScalar dx = 0; dx <= SkIntToScalar(3)/4;
                                             dx += SkIntToScalar(1) /* /4 */) {
                 y += paint.getFontSpacing();
-                DrawTheText(canvas, text, length, SkIntToScalar(20) + dx, y,
-                            paint, fClickX, fMF);
+                DrawTheText(canvas, text, length, SkIntToScalar(20) + dx, y, paint, fClickX);
             }
         }
         if (gHints[index].fFlushCache) {
 //                SkGraphics::SetFontCacheUsed(0);
         }
     }
 
     virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
                                               unsigned modi) SK_OVERRIDE {
         fClickX = x;
         this->inval(NULL);
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 
     virtual bool onClick(Click* click) {
         return this->INHERITED::onClick(click);
     }
 
 private:
     int fHints;
     SkScalar fClickX;
-    SkMaskFilter* fMF;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new TextSpeedView; }
 static SkViewRegister reg(MyFactory);