Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: src/core/SkOpts.cpp

Issue 1267343004: Port morphology to SkOpts. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkOpts.h ('k') | src/effects/SkMorphologyImageFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkOpts.cpp
diff --git a/src/core/SkOpts.cpp b/src/core/SkOpts.cpp
index 815216b0260943ac1e62c39b872b2bd1abebfae3..86981b9cf91fccefa40f670393c31aca2989578d 100644
--- a/src/core/SkOpts.cpp
+++ b/src/core/SkOpts.cpp
@@ -11,6 +11,7 @@
#define SK_OPTS_NS portable
#include "SkBlurImageFilter_opts.h"
#include "SkFloatingPoint_opts.h"
+#include "SkMorphologyImageFilter_opts.h"
#include "SkUtils_opts.h"
#include "SkXfermode_opts.h"
@@ -36,10 +37,14 @@ namespace SkOpts {
decltype(memset32) memset32 = portable::memset32;
decltype(create_xfermode) create_xfermode = SkCreate4pxXfermode;
- static const auto x = portable::kX, y = portable::kY;
- decltype(box_blur_xx) box_blur_xx = portable::box_blur<x,x>;
- decltype(box_blur_xy) box_blur_xy = portable::box_blur<x,y>;
- decltype(box_blur_yx) box_blur_yx = portable::box_blur<y,x>;
+ decltype(box_blur_xx) box_blur_xx = portable::box_blur_xx;
+ decltype(box_blur_xy) box_blur_xy = portable::box_blur_xy;
+ decltype(box_blur_yx) box_blur_yx = portable::box_blur_yx;
+
+ decltype(dilate_x) dilate_x = portable::dilate_x;
+ decltype(dilate_y) dilate_y = portable::dilate_y;
+ decltype( erode_x) erode_x = portable::erode_x;
+ decltype( erode_y) erode_y = portable::erode_y;
// Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.
void Init_sse2();
« no previous file with comments | « src/core/SkOpts.h ('k') | src/effects/SkMorphologyImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698