Cherry pick Android-related changes from master till 2012-08-23

* service
* tutorials
* samples
* gitignore

.gitignore

+*.pyc
+.DS_Store
+refman.rst
+OpenCV4Tegra/
+*.user

3rdparty/tbb/.gitignore

+tbb*.tgz
\ No newline at end of file

android/scripts/package.sh

-#!/bin/sh
-cd `dirname $0`/..
-
-ANDROID_DIR=`pwd`
-
-rm -rf package
-mkdir -p package
-cd package
-
-PRG_DIR=`pwd`
-mkdir opencv
-
-# neon-enabled build
-#cd $PRG_DIR
-#mkdir build-neon
-#cd build-neon
-
-#cmake -DANDROID_ABI="armeabi-v7a with NEON" -DBUILD_DOCS=OFF -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_ANDROID_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE="$ANDROID_DIR/android.toolchain.cmake" -DCMAKE_INSTALL_PREFIX="$PRG_DIR/opencv" "$ANDROID_DIR/.."  || exit 1
-#make -j8 install/strip || exit 1
-
-#cd "$PRG_DIR/opencv"
-#rm -rf doc include src .classpath .project AndroidManifest.xml default.properties share/OpenCV/haarcascades share/OpenCV/lbpcascades share/OpenCV/*.cmake share/OpenCV/OpenCV.mk
-#mv libs/armeabi-v7a libs/armeabi-v7a-neon
-#mv share/OpenCV/3rdparty/libs/armeabi-v7a share/OpenCV/3rdparty/libs/armeabi-v7a-neon
-
-
-# armeabi-v7a build
-cd "$PRG_DIR"
-mkdir build
-cd build
-
-cmake -DANDROID_ABI="armeabi-v7a" -DBUILD_DOCS=OFF -DBUILD_TESTS=ON -DBUILD_EXAMPLES=OFF -DBUILD_ANDROID_EXAMPLES=ON -DCMAKE_TOOLCHAIN_FILE="$ANDROID_DIR/android.toolchain.cmake" -DCMAKE_INSTALL_PREFIX="$PRG_DIR/opencv" "$ANDROID_DIR/.."  || exit 1
-make -j8 install/strip || exit 1
-
-cd "$PRG_DIR/opencv"
-rm -rf doc include src .classpath .project AndroidManifest.xml default.properties project.properties share/OpenCV/haarcascades share/OpenCV/lbpcascades share/OpenCV/*.cmake share/OpenCV/OpenCV.mk
-
-
-# armeabi build
-cd "$PRG_DIR/build"
-rm -rf CMakeCache.txt
-
-cmake -DANDROID_ABI="armeabi" -DBUILD_DOCS=ON -DBUILD_TESTS=ON -DBUILD_EXAMPLES=OFF -DBUILD_ANDROID_EXAMPLES=ON -DINSTALL_ANDROID_EXAMPLES=ON -DCMAKE_TOOLCHAIN_FILE="$ANDROID_DIR/android.toolchain.cmake" -DCMAKE_INSTALL_PREFIX="$PRG_DIR/opencv" "$ANDROID_DIR/.."  || exit 1
-make -j8 install/strip docs || exit 1
-
-find doc -name "*.pdf" -exec cp {} $PRG_DIR/opencv/doc \;
-
-cd $PRG_DIR
-rm -rf opencv/doc/CMakeLists.txt
-cp "$ANDROID_DIR/README.android" opencv/
-cp "$ANDROID_DIR/../README" opencv/
-
-
-# get opencv version
-CV_VERSION=`grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+" opencv/share/OpenCV/OpenCVConfig-version.cmake`
-OPENCV_NAME=OpenCV-$CV_VERSION
-mv opencv $OPENCV_NAME
-
-#samples
-cp -r "$ANDROID_DIR/../samples/android" "$PRG_DIR/samples"
-cd "$PRG_DIR/samples"
-
-#enable for loops over items with spaces in their name
-IFS="
-"
-for dir in `ls -1`
-do
-  if [ -f "$dir/default.properties" ]
-  then
-    HAS_REFERENCE=`cat "$dir/project.properties" | grep -c android.library.reference.1`
-    if [ $HAS_REFERENCE = 1 ]
-    then
-      echo -n > "$dir/project.properties"
-      android update project --name "$dir" --target "android-8" --library "../../$OPENCV_NAME" --path "$dir"
-      #echo 'android update project --name "$dir" --target "android-8" --library "../opencv$CV_VERSION" --path "$dir"'
-    fi
-  else
-    if [ -f "$dir/default.properties" ]
-    then
-      HAS_REFERENCE=`cat "$dir/default.properties" | grep -c android.library.reference.1`
-      if [ $HAS_REFERENCE = 1 ]
-      then
-        echo -n > "$dir/default.properties"
-        android update project --name "$dir" --target "android-8" --library "../../$OPENCV_NAME" --path "$dir"
-        #echo 'android update project --name "$dir" --target "android-8" --library "../opencv$CV_VERSION" --path "$dir"'
-      fi
-    else
-      rm -rf "$dir"
-    fi
-  fi
-done
-
-echo "OPENCV_MK_PATH:=../../$OPENCV_NAME/share/OpenCV/OpenCV.mk" > includeOpenCV.mk
-
-
-#clean samples
-cd "$PRG_DIR/samples"
-#remove ignored files/folders
-svn status --no-ignore | grep ^I | cut -c9- | xargs -d \\n rm -rf
-#remove unversioned files/folders
-svn status | grep ^\? | cut -c9- | xargs -d \\n rm -rf
-
-
-#generate "gen" folders to eliminate eclipse warnings
-cd "$PRG_DIR/samples"
-for dir in `ls -1`
-do
-  if [ -d "$dir" ]
-  then
-    mkdir "$dir/gen"
-  fi
-done
-
-
-#generate folders "gen" and "res" for opencv (dummy eclipse stiff)
-cd $PRG_DIR
-mkdir "$OPENCV_NAME/gen"
-mkdir "$OPENCV_NAME/res"
-
-# pack all files
-cd $PRG_DIR
-PRG_NAME=OpenCV-$CV_VERSION-tp-android-bin.tar.bz2
-tar cjpf $PRG_NAME --exclude-vcs $OPENCV_NAME samples || exit -1
-echo
-echo "Package $PRG_NAME is successfully created"

cmake/OpenCVDetectAndroidSDK.cmake

@@ -219,7 +219,6 @@ macro(add_android_project target path)
 
     # get project sources
     file(GLOB_RECURSE android_proj_files RELATIVE "${path}" "${path}/res/*" "${path}/src/*")
-    ocv_list_filterout(android_proj_files "\\\\.svn")
 
     # copy sources out from the build tree
     set(android_proj_file_deps "")
@@ -277,9 +276,11 @@ macro(add_android_project target path)
             )
 
         get_target_property(android_proj_jni_location "${JNI_LIB_NAME}" LOCATION)
+	if (NOT (CMAKE_BUILD_TYPE MATCHES "debug"))
 	    add_custom_command(TARGET ${JNI_LIB_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} --strip-unneeded "${android_proj_jni_location}")
 	endif()
       endif()
+    endif()
 
     # build java part
     if(android_proj_IGNORE_JAVA)

cmake/OpenCVExtraTargets.cmake

@@ -26,11 +26,11 @@ if(BUILD_PACKAGE)
     set(TAR_TRANSFORM "\"s,^,${TARBALL_NAME}/,\"")
     add_custom_target(package_source
       #TODO: maybe we should not remove dll's
-      COMMAND ${TAR_CMD} --transform ${TAR_TRANSFORM} -cjpf ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL_NAME}.tar.bz2 --exclude=".svn" --exclude="*.pyc" --exclude="*.vcproj" --exclude="*/lib/*" --exclude="*.dll" ./
+      COMMAND ${TAR_CMD} --transform ${TAR_TRANSFORM} -cjpf ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL_NAME}.tar.bz2 --exclude=".svn" --exclude=".git" --exclude="*.pyc" --exclude="*.vcproj" --exclude="*/lib/*" --exclude="*.dll" ./
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
   else()
     add_custom_target(package_source
-      COMMAND zip -9 -r ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL_NAME}.zip . -x '*/.svn/*' '*.vcproj' '*.pyc'
+      COMMAND zip -9 -r ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL_NAME}.zip . -x '*/.svn/*' '*/.git/*' '*.vcproj' '*.pyc'
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
   endif()
   if(ENABLE_SOLUTION_FOLDERS)

doc/_themes/blue/static/default.css_t

@@ -175,6 +175,8 @@ a:hover {
 div.body p, div.body dd, div.body li {
     text-align: justify;
     line-height: 130%;
+    margin-top: 1em;
+    margin-bottom: 1em;
 }
 
 div.body h1,
@@ -327,9 +329,9 @@ table.field-list {
     margin-top: 20px;
 }
 
-ul.simple {
+/*ul.simple {
     list-style: none;
-}
+}*/
 
 em.menuselection, em.guilabel {
     font-family: {{ theme_guifont }};
@@ -384,3 +386,8 @@ margin-top: 0px;
 div.body ul.search li {
     text-align: left;
 }
+
+div.linenodiv {
+    min-width: 1em;
+    text-align: right;
+}
\ No newline at end of file

doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst

@@ -56,7 +56,7 @@ Scalar
 
 Code
 =====
-* This code is in your OpenCV sample folder. Otherwise you can grab it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp>`_
+* This code is in your OpenCV sample folder. Otherwise you can grab it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp>`_
 
 Explanation
 =============

doc/tutorials/core/random_generator_and_text/random_generator_and_text.rst

@@ -22,7 +22,7 @@ Code
 
    * In this tutorial, we intend to use *random* values for the drawing parameters. Also, we intend to populate our image with a big number of geometric figures. Since we will be initializing them in a random fashion, this process will be automatic and made by using *loops* .
 
-   * This code is in your OpenCV sample folder. Otherwise you can grab it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/core/Matrix/Drawing_2.cpp>`_ .
+   * This code is in your OpenCV sample folder. Otherwise you can grab it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/core/Matrix/Drawing_2.cpp>`_ .
 
 Explanation
 ============

doc/tutorials/definitions/tocDefinitions.rst

@@ -2,6 +2,7 @@
 .. |Author_BernatG| unicode:: Bern U+00E1 t U+0020 G U+00E1 bor
 .. |Author_AndreyK| unicode:: Andrey U+0020 Kamaev
 .. |Author_LeonidBLB| unicode:: Leonid U+0020 Beynenson
+.. |Author_VsevolodG| unicode:: Vsevolod U+0020 Glumov
 .. |Author_VictorE| unicode:: Victor U+0020 Eruhimov 
 .. |Author_ArtemM| unicode:: Artem U+0020 Myagkov 
 .. |Author_FernandoI| unicode:: Fernando U+0020 Iglesias U+0020 Garc U+00ED a 

doc/tutorials/features2d/feature_description/feature_description.rst

@@ -23,7 +23,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/features2d/feature_detection/feature_detection.rst

@@ -22,7 +22,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/features2D/SURF_detector.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/features2D/SURF_detector.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst

@@ -19,7 +19,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/features2d/feature_homography/feature_homography.rst

@@ -20,7 +20,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/features2D/SURF_Homography.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/features2D/SURF_Homography.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst

@@ -19,7 +19,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst

@@ -20,7 +20,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst

@@ -18,7 +18,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst

@@ -151,7 +151,7 @@ How does it work?
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/TrackingMotion/cornerHarris_Demo.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/TrackingMotion/cornerHarris_Demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst

@@ -70,7 +70,7 @@ Erosion
 Code
 ======
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst

@@ -115,7 +115,7 @@ Code
         * Applies 4 different kinds of filters (explained in Theory) and show the filtered images sequentially
 
    * **Downloadable code**:
-     Click `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp>`_
+     Click `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp>`_
 
    * **Code at glance:**
 

doc/tutorials/imgproc/histograms/back_projection/back_projection.rst

@@ -99,9 +99,9 @@ Code
 
    * **Downloadable code**:
 
-      a. Click `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp>`_ for the basic version (explained in this tutorial). 
-      b. For stuff slightly fancier (using H-S histograms and floodFill to define a mask for the skin area) you can check the `improved demo <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp>`_ 
-      c. ...or you can always check out the classical `camshiftdemo <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/camshiftdemo.cpp>`_ in samples.
+      a. Click `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp>`_ for the basic version (explained in this tutorial).
+      b. For stuff slightly fancier (using H-S histograms and floodFill to define a mask for the skin area) you can check the `improved demo <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp>`_
+      c. ...or you can always check out the classical `camshiftdemo <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/camshiftdemo.cpp>`_ in samples.
 
    * **Code at glance:**
 

doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst

@@ -82,7 +82,7 @@ Code
         * Plot the three histograms in a window
 
    * **Downloadable code**:
-     Click `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp>`_
+     Click `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp>`_
 
    * **Code at glance:**
 

doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst

@@ -80,7 +80,7 @@ Code
         * Display the numerical matching parameters obtained.
 
    * **Downloadable code**:
-     Click `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp>`_ 
+     Click `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp>`_
 
    * **Code at glance:**
 

doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst

@@ -83,7 +83,7 @@ Code
         * Display the source and equalized images in a window.
 
    * **Downloadable code**:
-     Click `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp>`_
+     Click `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp>`_
 
    * **Code at glance:**
 

doc/tutorials/imgproc/histograms/template_matching/template_matching.rst

@@ -125,7 +125,7 @@ Code
         * Draw a rectangle around the area corresponding to the highest match
 
    * **Downloadable code**:
-     Click `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp>`_
+     Click `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp>`_
 
    * **Code at glance:**
 

doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst

@@ -86,7 +86,7 @@ Code
    * Applies the *Canny Detector* and generates a **mask** (bright lines representing the edges on a black background).
    * Applies the mask obtained on the original image and display it in a window.
 
-#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/CannyDetector_Demo.cpp>`_
+#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/CannyDetector_Demo.cpp>`_
 
 .. code-block::  cpp
 

doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.rst

@@ -47,7 +47,7 @@ Code
      The user chooses either option by pressing 'c' (constant) or 'r' (replicate)
    * The program finishes when the user presses 'ESC'
 
-#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp>`_
+#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp>`_
 
 
 .. code-block:: cpp

doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst

@@ -72,7 +72,7 @@ Code
 
    * The filter output (with each kernel) will be shown during 500 milliseconds
 
-#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp>`_
+#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp>`_
 
 
 .. code-block:: cpp

doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst

@@ -40,9 +40,9 @@ Code
    * Display the detected circle in a window.
 
    .. |TutorialHoughCirclesSimpleDownload| replace:: here
-   .. _TutorialHoughCirclesSimpleDownload: http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/houghlines.cpp
+   .. _TutorialHoughCirclesSimpleDownload: http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/houghlines.cpp
    .. |TutorialHoughCirclesFancyDownload| replace:: here
-   .. _TutorialHoughCirclesFancyDownload: http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
+   .. _TutorialHoughCirclesFancyDownload: http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
 
 #. The sample code that we will explain can be downloaded from |TutorialHoughCirclesSimpleDownload|_. A slightly fancier version (which shows both Hough standard and probabilistic with trackbars for changing the threshold values) can be found |TutorialHoughCirclesFancyDownload|_.
 

doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst

@@ -89,9 +89,9 @@ Code
 ======
 
 .. |TutorialHoughLinesSimpleDownload| replace:: here
-.. _TutorialHoughLinesSimpleDownload: http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/houghlines.cpp
+.. _TutorialHoughLinesSimpleDownload: http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/houghlines.cpp
 .. |TutorialHoughLinesFancyDownload| replace:: here
-.. _TutorialHoughLinesFancyDownload: http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp
+.. _TutorialHoughLinesFancyDownload: http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp
 
 
 #. **What does this program do?**

doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst

@@ -55,7 +55,7 @@ Code
    * Applies a Laplacian operator to the grayscale image and stores the output image
    * Display the result in a window
 
-#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp>`_
+#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/imgtrans/remap/remap.rst

@@ -59,7 +59,7 @@ Code
    * Each second, apply 1 of 4 different remapping processes to the image and display them indefinitely in a window.
    * Wait for the user to exit the program
 
-#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp>`_
+#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst

@@ -121,7 +121,7 @@ Code
 
    * Applies the *Sobel Operator* and generates as output an image with the detected *edges* bright on a darker background.
 
-#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp>`_
+#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst

@@ -93,7 +93,7 @@ Code
    * Applies a Rotation to the image after being transformed. This rotation is with respect to the image center
    * Waits until the user exits the program
 
-#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp>`_
+#. The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst

@@ -111,7 +111,7 @@ Black Hat
 Code
 ======
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/pyramids/pyramids.rst

@@ -80,7 +80,7 @@ Gaussian Pyramid
 Code
 ======
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst

@@ -21,7 +21,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo1.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo1.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst

@@ -21,7 +21,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo2.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo2.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst

@@ -19,7 +19,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/shapedescriptors/hull/hull.rst

@@ -19,7 +19,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ShapeDescriptors/hull_demo.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ShapeDescriptors/hull_demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/shapedescriptors/moments/moments.rst

@@ -21,7 +21,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst

@@ -19,7 +19,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp>`_
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/imgproc/threshold/threshold.rst

@@ -130,7 +130,7 @@ Threshold to Zero, Inverted
 Code
 ======
 
-The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/ImgProc/Threshold.cpp>`_
+The tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/ImgProc/Threshold.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/introduction/display_image/display_image.rst

@@ -17,7 +17,7 @@ In this tutorial you will learn how to:
 Source Code
 ===========
 
-Download the source code from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp>`_.
+Download the source code from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp>`_.
 
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp

doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.rst

@@ -106,46 +106,57 @@ Here you can read tutorials about how to set up your computer to work with the O
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
 
-  ================ ======================================================
-  |AndroidBinPack| **Title:** :ref:`Android_Binary_Package`
+  ================ =================================================
+  |AndroidLogo|    **Title:** :ref:`Android_Dev_Intro`
 
-                   *Compatibility:* > OpenCV 2.3.1
+                   *Compatibility:* > OpenCV 2.4.2
 
-                   *Author:* |Author_AndreyK|
+                   *Author:* |Author_VsevolodG|
 
-                   You will learn how to setup OpenCV for Android platform!
+                   Not a tutorial, but a guide introducing Android development basics and environment setup
 
-  ================ ======================================================
+  ================ =================================================
 
-     .. |AndroidBinPack| image:: images/android_logo.png
-                           :height: 90pt
-                           :width:  90pt
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+
+  ================ =================================================
+  |AndroidLogo|    **Title:** :ref:`O4A_SDK`
+
+                   *Compatibility:* > OpenCV 2.4.2
+
+                   *Author:* |Author_VsevolodG|
+
+                   OpenCV4Android SDK: general info, installation, running samples
+
+  ================ =================================================
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
 
-  ================ ======================================================
-  |AndroidNDKPack| **Title:** :ref:`Android_Binary_Package_with_NDK`
+  ================ =================================================
+  |AndroidLogo|    **Title:** :ref:`dev_with_OCV_on_Android`
 
-                   *Compatibility:* > OpenCV 2.3.1
+                   *Compatibility:* > OpenCV 2.4.2
 
-                   *Author:* |Author_LeonidBLB|
+                   *Author:* |Author_VsevolodG|
 
-                   You will learn how to work with C++ OpenCV code for Android platform
+                   Development with OpenCV4Android SDK
 
-  ================ ======================================================
+  ================ =================================================
 
-     .. |AndroidNDKPack| image:: images/android_logo.png
+     .. |AndroidLogo| image:: images/android_logo.png
                         :height: 90pt
                         :width:  90pt
 
+
 * **iOS**
 
-.. tabularcolumns:: m{100pt} m{300pt}
-.. cssclass:: toctableopencv
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
 
-=========== ======================================================
-|Install_2| **Title:** :ref:`iOS-Installation`
+  =========== ======================================================
+  |Install_2| **Title:** :ref:`iOS-Installation`
 
               *Compatibility:* > OpenCV 2.3.1
 
@@ -153,13 +164,13 @@ Here you can read tutorials about how to set up your computer to work with the O
 
               We will learn how to setup OpenCV for using it in iOS!
 
-=========== ======================================================
+  =========== ======================================================
 
-.. |Install_2| image:: images/ios4_logo.jpg
+     .. |Install_2| image:: images/ios4_logo.jpg
                  :width:  90pt
 
-.. tabularcolumns:: m{100pt} m{300pt}
-.. cssclass:: toctableopencv
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
 
   ============= ======================================================
   |Beginners_1| **Title:** :ref:`Display_Image`
@@ -196,6 +207,9 @@ Here you can read tutorials about how to set up your computer to work with the O
 
 * **Want to contribute, and see your own work between the OpenCV tutorials?**
 
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+
   =============== ======================================================
    |HowToWriteT|  **Title:** :ref:`howToWriteTutorial`
 
@@ -224,8 +238,9 @@ Here you can read tutorials about how to set up your computer to work with the O
    ../linux_eclipse/linux_eclipse
    ../windows_install/windows_install
    ../windows_visual_studio_Opencv/windows_visual_studio_Opencv
-   ../android_binary_package/android_binary_package
-   ../android_binary_package/android_binary_package_using_with_NDK
+   ../android_binary_package/android_dev_intro
+   ../android_binary_package/O4A_SDK
+   ../android_binary_package/dev_with_OCV_on_Android
    ../ios_install/ios_install
    ../display_image/display_image
    ../load_save_image/load_save_image

doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst

@@ -22,7 +22,7 @@ Theory
 Code
 ====
 
-This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/objectDetection/objectDetection.cpp>`_ . The second version (using LBP for face detection) can be `found here <http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp>`_ 
+This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/objectDetection/objectDetection.cpp>`_ . The second version (using LBP for face detection) can be `found here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp>`_
 
 .. code-block:: cpp
 

doc/tutorials/tutorials.rst

@@ -2,7 +2,7 @@
 OpenCV Tutorials
 ################
 
-The following links describe a set of basic OpenCV  tutorials. All the source code mentioned here is provide as part of the OpenCV regular releases, so check before you start copy & pasting the code. The list of tutorials below is automatically generated from reST files located in our SVN repository.
+The following links describe a set of basic OpenCV  tutorials. All the source code mentioned here is provide as part of the OpenCV regular releases, so check before you start copy & pasting the code. The list of tutorials below is automatically generated from reST files located in our GIT repository.
 
 As always, we would be happy to hear your comments and receive your contributions on any tutorial.
 

doc/user_guide/ug_highgui.rst

@@ -130,4 +130,4 @@ Flags specifing the needed generator type must be used in combination with parti
 
 For more information please refer to the example of usage openni_capture.cpp_ in ``opencv/samples/cpp`` folder.
 
-.. _openni_capture.cpp: http://code.opencv.org/svn/opencv/trunk/opencv/samples/cpp/openni_capture.cpp
+.. _openni_capture.cpp: http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/openni_capture.cpp

ios/build_framework.py

@@ -6,7 +6,7 @@ The built framework is universal, it can be used to build app and run it on eith
 Usage:
     ./build_framework.py <outputdir>
 
-By cmake conventions (and especially if you work with OpenCV SVN repository),
+By cmake conventions (and especially if you work with OpenCV repository),
 the output dir should not be a subdirectory of OpenCV source tree.
 
 Script will create <outputdir>, if it's missing, and a few its subdirectories:

modules/androidcamera/camera_wrapper/CMakeLists.txt

@@ -57,8 +57,9 @@ SET_TARGET_PROPERTIES(${the_target} PROPERTIES
                       RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
                       )
 
-# force strip library after the build command
-ADD_CUSTOM_COMMAND( TARGET ${the_target} POST_BUILD COMMAND ${CMAKE_STRIP} "${LIBRARY_OUTPUT_PATH}/lib${the_target}.so" )
+if (NOT (CMAKE_BUILD_TYPE MATCHES "debug"))
+    ADD_CUSTOM_COMMAND( TARGET ${the_target} POST_BUILD COMMAND ${CMAKE_STRIP} "${LIBRARY_OUTPUT_PATH}/lib${the_target}.so" )
+endif()
 
 
 install(TARGETS ${the_target} LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)