From 1c77f0abfe3a6ec425751a163dbb464c390258b5 Mon Sep 17 00:00:00 2001 From: Kirill Kornyakov Date: Wed, 31 Oct 2012 16:32:04 +0400 Subject: [PATCH] Rewrote abs documentation without funcx, so now :ocv:funcx: is used only for operator() --- modules/core/doc/operations_on_arrays.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/doc/operations_on_arrays.rst b/modules/core/doc/operations_on_arrays.rst index a924d40..6ff04e4 100644 --- a/modules/core/doc/operations_on_arrays.rst +++ b/modules/core/doc/operations_on_arrays.rst @@ -13,17 +13,17 @@ Calculates an absolute value of each matrix element. :param m: matrix. :param e: matrix expression. -``abs`` is a meta-function that is expanded to one of :ocv:func:`absdiff` forms: +``abs`` is a meta-function that is expanded to one of :ocv:func:`absdiff` or :ocv:func:`convertScaleAbs` forms: * ``C = abs(A-B)`` is equivalent to ``absdiff(A, B, C)`` * ``C = abs(A)`` is equivalent to ``absdiff(A, Scalar::all(0), C)`` - * ``C = Mat_ >(abs(A*alpha + beta))`` is equivalent to :ocv:funcx:`convertScaleAbs` (A, C, alpha, beta) + * ``C = Mat_ >(abs(A*alpha + beta))`` is equivalent to ``convertScaleAbs(A, C, alpha, beta)`` The output matrix has the same size and the same type as the input one except for the last case, where ``C`` is ``depth=CV_8U`` . - .. seealso:: :ref:`MatrixExpressions`, :ocv:func:`absdiff` + .. seealso:: :ref:`MatrixExpressions`, :ocv:func:`absdiff`, :ocv:func:`convertScaleAbs` absdiff -- 2.7.4