Merge pull request #122 from kirill-kornyakov:2.4-android-documentation-fixes

android/README.android

-See http://code.opencv.org/projects/opencv/wiki/OpenCV4Android
+See http://opencv.org/android

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_<Vec<uchar,n> >(abs(A*alpha + beta))``     is equivalent to :ocv:funcx:`convertScaleAbs` (A, C, alpha, beta)
+    * ``C = Mat_<Vec<uchar,n> >(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

modules/java/generator/src/java/android+CameraBridgeViewBase.java

@@ -23,10 +23,10 @@ import android.view.SurfaceView;
  * The main responsibility of it - is to control when camera can be enabled, process the frame,
  * call external listener to make any adjustments to the frame and then draw the resulting
  * frame to the screen.
- * The clients shall implement CvCameraViewListener
- * TODO: add method to control the format in which the frames will be delivered to CvCameraViewListener
+ * The clients shall implement CvCameraViewListener.
  */
 public abstract class CameraBridgeViewBase extends SurfaceView implements SurfaceHolder.Callback {
+//TODO: add method to control the format in which the frames will be delivered to CvCameraViewListener
 
     private static final int MAX_UNSPECIFIED = -1;
 

modules/java/generator/src/java/android+JavaCameraView.java

@@ -20,7 +20,7 @@ import org.opencv.highgui.Highgui;
 import org.opencv.imgproc.Imgproc;
 
 /**
- * This class is an implementation of the Bridge View between OpenCv and JAVA Camera.
+ * This class is an implementation of the Bridge View between OpenCV and Java Camera.
  * This class relays on the functionality available in base class and only implements
  * required functions:
  * connectCamera - opens Java camera and sets the PreviewCallback to be delivered.