diff options
author | 2014-01-24 15:43:50 +0000 | |
---|---|---|
committer | 2014-01-24 15:43:50 +0000 | |
commit | 0ded88d431a1872e21986984f009db2e84f52738 (patch) | |
tree | 31050e07a32353fcbd687ee79c6b8b051baf7961 /src/opts/SkMorphology_opts.h | |
parent | 94ecb66c4920018c833d8bbbbb8b51d18e1c5d56 (diff) |
[Reland of r13154, since the Housekeeping bot seems to have reverted it in r13155. Next time I'll put the "do not disturb" sign on my commit.]
Refactor SkMorphologyImageFilter, CPU and GPU paths. This required making opts/ dependent on effects/, so that we could use the SkMorphologyProc type in SkMorphologyImageFilter.h.
Correctness and performance covered by existing tests; no change in functionality.
R=bsalomon@google.com, djsollen@google.com, reed@google.com
Committed: https://code.google.com/p/skia/source/detail?r=13154
BUG=skia:
Review URL: https://codereview.chromium.org/135013004
git-svn-id: http://skia.googlecode.com/svn/trunk@13168 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/opts/SkMorphology_opts.h')
-rw-r--r-- | src/opts/SkMorphology_opts.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/opts/SkMorphology_opts.h b/src/opts/SkMorphology_opts.h index e3ad853cf6..7ea7c54623 100644 --- a/src/opts/SkMorphology_opts.h +++ b/src/opts/SkMorphology_opts.h @@ -5,17 +5,10 @@ * found in the LICENSE file. */ -#include <SkColor.h> +#ifndef SkMorphology_opts_DEFINED +#define SkMorphology_opts_DEFINED -/** - * All morphology procs have the same signature: src is the source buffer, dst the - * destination buffer, radius is the morphology radius, width and height are the bounds - * of the destination buffer (in pixels), and srcStride and dstStride are the - * number of pixels per row in each buffer. All buffers are 8888. - */ - -typedef void (*SkMorphologyProc)(const SkPMColor* src, SkPMColor* dst, int radius, - int width, int height, int srcStride, int dstStride); +#include <SkMorphologyImageFilter.h> enum SkMorphologyProcType { kDilateX_SkMorphologyProcType, @@ -24,4 +17,6 @@ enum SkMorphologyProcType { kErodeY_SkMorphologyProcType }; -SkMorphologyProc SkMorphologyGetPlatformProc(SkMorphologyProcType type); +SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType type); + +#endif |