Port morphology to SkOpts.

src/core/SkOpts.cpp

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;

[djsollen, 2015/08/04 19:38:12]

why not

static const auto blur_x = portable::BlurDirection::kX;

and avoid having to declare those static functions.

[mtklein_C, 2015/08/04 19:41:48]

This is mostly a style / layering thing.  I noticed that the implementation
details of those box blurs (that they're a single function template) were
leaking out.  Same deal of course with the morphs.

+    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;

[djsollen, 2015/08/04 19:38:12]

does decltype really help here?  It seems that Morph would be just fine since we
have a typedef.  Same for the box blurs.

[mtklein_C, 2015/08/04 19:41:48]

Either would be fine.  On the other hand, decltype(x) x = ... works uniformly
for all these function pointers.

+    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();