diff --git a/apps/attributes/gradient_magnitude.hpp b/apps/attributes/gradient_magnitude.hpp index 35baa969b6796e54a3515d3d690eb37fd4dd6243..3b5953e995c7ff78acb9a1702e2f9ac72c9dc6ca 100644 --- a/apps/attributes/gradient_magnitude.hpp +++ b/apps/attributes/gradient_magnitude.hpp @@ -3,8 +3,8 @@ #include #include +#include #include -#include #include diff --git a/apps/attributes/meaningfullness.hpp b/apps/attributes/meaningfullness.hpp index 41d47976afe8be1656052698f31bdc898da19f26..5e0793a958aca5ff332f2c6f73face394135855e 100644 --- a/apps/attributes/meaningfullness.hpp +++ b/apps/attributes/meaningfullness.hpp @@ -4,11 +4,11 @@ #include #include +#include #include -#include #include #include -#include +#include #include diff --git a/doc/source/core.rst b/doc/source/core.rst index 319d69010938809f0fbf771a4943b877b1486f92..7cbd3a086c96006fc450c85bbfc4fb0607386571 100644 --- a/doc/source/core.rst +++ b/doc/source/core.rst @@ -12,6 +12,7 @@ Core Module core/ranges core/neighborhood core/stl + core/functional @@ -63,18 +64,18 @@ See :doc:`core/images` for a description of the image concepts and image basics. :widths: auto :class: full + +---------------------------------------------------------------+--------------------------------------------------------------------------------------------+ + | :cpp:func:`view::transform(ima, f) ` | Views the image with a function applied to the values. | + +---------------------------------------------------------------+--------------------------------------------------------------------------------------------+ + | :cpp:func:`view::filter(ima, pred) ` | Views the image restricted to pixels whose values pass a predicate. | + +---------------------------------------------------------------+--------------------------------------------------------------------------------------------+ + | :cpp:func:`view::mask(ima, mask) ` | Views the image restricted to pixels in a binary mask. | + +---------------------------------------------------------------+--------------------------------------------------------------------------------------------+ + | :cpp:func:`view::clip(ima, roi) ` | Views the image restricted to a sub-region. | + +---------------------------------------------------------------+--------------------------------------------------------------------------------------------+ + | :cpp:func:`view::zip(ima1, ima2, ..., imaN) ` | Views a list of images as a single image whose values are tuples of the each image values. | + +---------------------------------------------------------------+--------------------------------------------------------------------------------------------+ - +------------------------------------------------------------+--------------------------------------------------------------------------------------------+ - | :cpp:func:`view::transform(ima, f) ` | Views the image with a function applied to the values. | - +------------------------------------------------------------+--------------------------------------------------------------------------------------------+ - | ``view::filter(ima, pred)`` | Views the image restricted to pixels whose values pass a predicate. | - +------------------------------------------------------------+--------------------------------------------------------------------------------------------+ - | ``view::mask(ima, mask)`` | Views the image restricted to pixels in a binary mask. | - +------------------------------------------------------------+--------------------------------------------------------------------------------------------+ - | ``view::clip(ima, roi)`` | Views the image restricted to a sub-region. | - +------------------------------------------------------------+--------------------------------------------------------------------------------------------+ - | ``view::zip(ima1, ima2, ..., imaN)`` | Views a list of images as a single image whose values are tuples of the each image values. | - +------------------------------------------------------------+--------------------------------------------------------------------------------------------+ .. topic:: Common image operators (views) @@ -82,22 +83,33 @@ See :doc:`core/images` for a description of the image concepts and image basics. :widths: auto :class: full - +--------------+-----------------------------------------------------------+ - | Arithmetical | `a + b`, `a - b`, `a * b`, `a / b`, `a % b` | - +--------------+-----------------------------------------------------------+ - | Logical | `a && b`, `a || b`, `! a` | - +--------------+-----------------------------------------------------------+ - | Comparison | `a < b`, `a <= b`, `a == b`, `a != b`, `a >= b`, `a > b` | - +--------------+-----------------------------------------------------------+ - | Conditional | ``view::ifelse(a, b, c)`` | - +--------------+-----------------------------------------------------------+ + +--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Arithmetical | :cpp:func:`a + b `, :cpp:func:`a - b `, :cpp:func:`a * b `, :cpp:func:`a / b `, :cpp:func:`a % b ` | + +--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Logical | :cpp:func:`a && b `, :cpp:func:`a || b `, :cpp:func:`\!a ` | + +--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Comparison | :cpp:func:`a \< b `, :cpp:func:`a \<= b `, :cpp:func:`a == b `, :cpp:func:`a != b `, :cpp:func:`a >= b =>`, :cpp:func:`a > b >`, :cpp:func:`equalFP(a, b, eps) ` | + +--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Conditional | :cpp:func:`view::ifelse(a, b, c) ` | + +--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ .. topic:: Mathematical image operator (views) - +-------+-------+ - | FIXME | FIXME | - +-------+-------+ + .. table:: + :widths: auto + :class: full + + +----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Component-wise | :cpp:func:`abs(a) `, :cpp:func:`sqr(a) `, :cpp:func:`pow(a, p) `, :cpp:func:`cbrt(a) `, :cpp:func:`sqrt(a) ` | + +----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Reduction | :cpp:func:`sum(a) `, :cpp:func:`prod(a) `, :cpp:func:`min(a) `, :cpp:func:`max(a) `, :cpp:func:`dot(a, b) `, :cpp:func:`cross(a, b) ` | + +----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Norms | :cpp:func:`l0norm(a) `, :cpp:func:`l1norm(a) `, :cpp:func:`l2norm(a) `, :cpp:func:`l2norm_sqr(a) `, :cpp:func:`linfnorm(a) `, :cpp:func:`lpnorm\

(a)