aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleText.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-12 13:35:55 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-12 13:35:55 +0000
commite003aecb30fe40b0cbf4b0d38147bf794752422a (patch)
tree843f048c8810d85e976804de0df906205d9af89e /samplecode/SampleText.cpp
parentc51d6e459aa2d59f17a6bbb632f650d51aaa3ab8 (diff)
remove unused Kernel33MaskFilter
R=robertphillips@google.com TBR=robertphilips@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/280233002 git-svn-id: http://skia.googlecode.com/svn/trunk@14691 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleText.cpp')
-rw-r--r--samplecode/SampleText.cpp88
1 files changed, 3 insertions, 85 deletions
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 56fa022b22..c56ebc8b90 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -13,7 +13,6 @@
#include "SkGradientShader.h"
#include "SkGraphics.h"
#include "SkImageDecoder.h"
-#include "SkKernel33MaskFilter.h"
#include "SkPath.h"
#include "SkRandom.h"
#include "SkRegion.h"
@@ -28,77 +27,6 @@
#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";
@@ -213,9 +141,8 @@ static const struct {
{ "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
@@ -238,7 +165,6 @@ static void DrawTheText(SkCanvas* canvas, const char text[], size_t length,
#ifdef SK_DEBUG
if (true) {
- // p.setMaskFilter(mf);
p.setSubpixelText(false);
p.setLinearText(true);
x += SkIntToScalar(180);
@@ -250,18 +176,12 @@ static void DrawTheText(SkCanvas* canvas, const char text[], size_t length,
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) {
@@ -326,8 +246,7 @@ protected:
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) {
@@ -349,7 +268,6 @@ protected:
private:
int fHints;
SkScalar fClickX;
- SkMaskFilter* fMF;
typedef SampleView INHERITED;
};