platform/upstream/opencv.git
9 years agoMerge pull request #3479 from mshabunin:doxygen-tutorials
Vadim Pisarevsky [Tue, 9 Dec 2014 14:06:23 +0000 (14:06 +0000)]
Merge pull request #3479 from mshabunin:doxygen-tutorials

9 years agoMerge pull request #3492 from Dmitry-Me:reduceVariablesScope1
Vadim Pisarevsky [Tue, 9 Dec 2014 14:05:35 +0000 (14:05 +0000)]
Merge pull request #3492 from Dmitry-Me:reduceVariablesScope1

9 years agoMerge pull request #3486 from Chuanbo-Weng:repeat-perf
Alexander Alekhin [Mon, 8 Dec 2014 15:49:21 +0000 (15:49 +0000)]
Merge pull request #3486 from Chuanbo-Weng:repeat-perf

9 years agoReduce variables scope, move declaration to first use point
Dmitry-Me [Mon, 8 Dec 2014 15:21:17 +0000 (18:21 +0300)]
Reduce variables scope, move declaration to first use point

9 years agoMerge pull request #3487 from taka-no-me:ctrl_s_gtk
Vadim Pisarevsky [Sat, 6 Dec 2014 10:04:22 +0000 (10:04 +0000)]
Merge pull request #3487 from taka-no-me:ctrl_s_gtk

9 years agoMerge pull request #3472 from Dmitry-Me:preventDivByZero
Vadim Pisarevsky [Sat, 6 Dec 2014 08:09:01 +0000 (08:09 +0000)]
Merge pull request #3472 from Dmitry-Me:preventDivByZero

9 years agoMerge pull request #3475 from fhsm:master
Vadim Pisarevsky [Sat, 6 Dec 2014 08:08:44 +0000 (08:08 +0000)]
Merge pull request #3475 from fhsm:master

9 years agoMerge pull request #3478 from akarsakov:rect_fix_typo
Vadim Pisarevsky [Sat, 6 Dec 2014 08:08:27 +0000 (08:08 +0000)]
Merge pull request #3478 from akarsakov:rect_fix_typo

9 years agoMerge pull request #3481 from mshabunin:python-test
Vadim Pisarevsky [Sat, 6 Dec 2014 08:07:39 +0000 (08:07 +0000)]
Merge pull request #3481 from mshabunin:python-test

9 years agoMerge pull request #3483 from wangyan42164:ocl_orb_improve
Alexander Alekhin [Fri, 5 Dec 2014 12:55:54 +0000 (12:55 +0000)]
Merge pull request #3483 from wangyan42164:ocl_orb_improve

9 years agoMerge pull request #3482 from wangyan42164:ocl_brute_match_improve
Alexander Alekhin [Fri, 5 Dec 2014 12:55:29 +0000 (12:55 +0000)]
Merge pull request #3482 from wangyan42164:ocl_brute_match_improve

9 years agoFixed whitespace warnings in new tutorials
Maksim Shabunin [Fri, 5 Dec 2014 12:33:53 +0000 (15:33 +0300)]
Fixed whitespace warnings in new tutorials

9 years agoMake Ctrl+S open save dialog on Gtk backend
Andrey Kamaev [Fri, 5 Dec 2014 11:53:19 +0000 (14:53 +0300)]
Make Ctrl+S open save dialog on Gtk backend

9 years agoIt turns opengl gheck is not needed for win ctrl+s
Andrey Kamaev [Fri, 5 Dec 2014 11:06:01 +0000 (14:06 +0300)]
It turns opengl gheck is not needed for win ctrl+s

9 years agoUse sincos instead of sin and cos.
Yan Wang [Thu, 4 Dec 2014 07:48:23 +0000 (15:48 +0800)]
Use sincos instead of sin and cos.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agoRemove unnecesary operations and calculations in loop body.
Yan Wang [Thu, 4 Dec 2014 06:35:54 +0000 (14:35 +0800)]
Remove unnecesary operations and calculations in loop body.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agoRemove unnecessary kercn limitation of 4.
Chuanbo Weng [Thu, 4 Dec 2014 03:15:13 +0000 (11:15 +0800)]
Remove unnecessary kercn limitation of 4.

When accessing global memory by DWORD4, memory bandwidth
can be fully utilized on Intel platform. This patch will
make more image format(e.g. 8UC4) be processed in DWORD4
by work-item. After applying this patch, 3 subcase of
./opencv_perf_core --gtest_filter=OCL_RepeatFixture_Repeat.Repeat/*
can be speedup on HD4000 graphics card with Beignet:
OCL_RepeatFixture_Repeat.Repeat/2, 64% improvement.
OCL_RepeatFixture_Repeat.Repeat/6, 50% improvement.
OCL_RepeatFixture_Repeat.Repeat/8, 56% improvement.

Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
9 years agoPython test: added options to provide local data path
Maksim Shabunin [Wed, 3 Dec 2014 15:12:01 +0000 (18:12 +0300)]
Python test: added options to provide local data path

9 years agoFixed typo in description of Rect operations
Alexander Karsakov [Wed, 3 Dec 2014 13:01:03 +0000 (16:01 +0300)]
Fixed typo in description of Rect operations

9 years agoWhite space and spelling in meanshift tutorial
fhsm [Tue, 2 Dec 2014 17:46:05 +0000 (12:46 -0500)]
White space and spelling in meanshift tutorial

Removed a leading whitespace from a parenthetical comment and corrected the spelling of "maybe"

9 years agoDocumentation: removed mention of Mat(IplImage*) constructor
Maksim Shabunin [Tue, 2 Dec 2014 12:15:10 +0000 (15:15 +0300)]
Documentation: removed mention of Mat(IplImage*) constructor

9 years agoPrevent division by zero
Dmitry-Me [Tue, 2 Dec 2014 11:44:09 +0000 (14:44 +0300)]
Prevent division by zero

9 years agoMerge pull request #3443 from HelenWong:bug3363Fix
Vadim Pisarevsky [Tue, 2 Dec 2014 09:14:36 +0000 (09:14 +0000)]
Merge pull request #3443 from HelenWong:bug3363Fix

9 years agoMerge pull request #3453 from mshabunin:doxygen-others
Vadim Pisarevsky [Tue, 2 Dec 2014 09:05:32 +0000 (09:05 +0000)]
Merge pull request #3453 from mshabunin:doxygen-others

9 years agoMerge pull request #3463 from Dikay900:fix_sample_video_writer
Vadim Pisarevsky [Tue, 2 Dec 2014 09:04:27 +0000 (09:04 +0000)]
Merge pull request #3463 from Dikay900:fix_sample_video_writer

9 years agoMerge pull request #3469 from a-wi:Fill_ellipse_arc_v3
Vadim Pisarevsky [Tue, 2 Dec 2014 09:03:52 +0000 (09:03 +0000)]
Merge pull request #3469 from a-wi:Fill_ellipse_arc_v3

9 years agoMerge pull request #3470 from Dmitry-Me:simplifyOverengineeredCode
Vadim Pisarevsky [Tue, 2 Dec 2014 09:00:59 +0000 (09:00 +0000)]
Merge pull request #3470 from Dmitry-Me:simplifyOverengineeredCode

9 years agoDoxygen tutorials: support contrib, some minor changes
Maksim Shabunin [Mon, 1 Dec 2014 16:22:04 +0000 (19:22 +0300)]
Doxygen tutorials: support contrib, some minor changes

9 years agoSimplify overengineered code
Dmitry-Me [Mon, 1 Dec 2014 14:58:06 +0000 (17:58 +0300)]
Simplify overengineered code

9 years agoUser guide converted to doxygen
Maksim Shabunin [Mon, 1 Dec 2014 13:40:06 +0000 (16:40 +0300)]
User guide converted to doxygen

9 years agoFix determining bounding box of the edge collection in FillEdgeCollection().
Artur Wieczorek [Mon, 1 Dec 2014 13:30:05 +0000 (14:30 +0100)]
Fix determining bounding box of the edge collection in FillEdgeCollection().

There is necessary to account also x-coordinate of the end of the edge when determining bounding box of the edge collection.

9 years agoDoxygen tutorials: python final edits
Maksim Shabunin [Mon, 1 Dec 2014 12:46:05 +0000 (15:46 +0300)]
Doxygen tutorials: python final edits

9 years agoDoxygen tutorials: python basic
Maksim Shabunin [Fri, 28 Nov 2014 14:18:32 +0000 (17:18 +0300)]
Doxygen tutorials: python basic

9 years agoDoxygen tutorials: cpp done
Maksim Shabunin [Fri, 28 Nov 2014 13:21:28 +0000 (16:21 +0300)]
Doxygen tutorials: cpp done

9 years agoDoxygen tutorials: warnings cleared
Maksim Shabunin [Thu, 27 Nov 2014 16:54:13 +0000 (19:54 +0300)]
Doxygen tutorials: warnings cleared

9 years agoDoxygen tutorials: basic structure
Maksim Shabunin [Thu, 27 Nov 2014 12:39:05 +0000 (15:39 +0300)]
Doxygen tutorials: basic structure

9 years agoDoxygen tutorials: some fixes in RST-docs
Maksim Shabunin [Thu, 27 Nov 2014 10:23:24 +0000 (13:23 +0300)]
Doxygen tutorials: some fixes in RST-docs

9 years agoDoxygen documentation: BiB references and fixes
Maksim Shabunin [Wed, 26 Nov 2014 11:21:08 +0000 (14:21 +0300)]
Doxygen documentation: BiB references and fixes

9 years agoDoxygen documentation: more fixes and cleanups
Maksim Shabunin [Fri, 21 Nov 2014 08:28:14 +0000 (11:28 +0300)]
Doxygen documentation: more fixes and cleanups

9 years agoDoxygen documentation: mathbbm support
Maksim Shabunin [Fri, 21 Nov 2014 08:27:50 +0000 (11:27 +0300)]
Doxygen documentation: mathbbm support

9 years agoDoxygen documentation: cuda submodules reorganized
Maksim Shabunin [Thu, 20 Nov 2014 15:10:59 +0000 (18:10 +0300)]
Doxygen documentation: cuda submodules reorganized

9 years agoDoxygen documentation: viz
Maksim Shabunin [Thu, 20 Nov 2014 15:02:44 +0000 (18:02 +0300)]
Doxygen documentation: viz

9 years agoDoxygen documentation: shape, superres, videostab
Maksim Shabunin [Thu, 20 Nov 2014 14:08:58 +0000 (17:08 +0300)]
Doxygen documentation: shape, superres, videostab

9 years agoDoxygen documentation: cuda
Maksim Shabunin [Thu, 20 Nov 2014 13:42:06 +0000 (16:42 +0300)]
Doxygen documentation: cuda

9 years agoDoxygen documentation: flann, photo and stitching modules
Maksim Shabunin [Wed, 19 Nov 2014 16:08:03 +0000 (19:08 +0300)]
Doxygen documentation: flann, photo and stitching modules

9 years agoDoxygen doucmentation: ml module
Maksim Shabunin [Wed, 19 Nov 2014 14:55:13 +0000 (17:55 +0300)]
Doxygen doucmentation: ml module

9 years agoDoxygen documentation: calib3d and features2d modules
Maksim Shabunin [Wed, 19 Nov 2014 13:13:41 +0000 (16:13 +0300)]
Doxygen documentation: calib3d and features2d modules

9 years agoDoxygen documentation for: highgui, video, imgcodecs and videoio
Maksim Shabunin [Wed, 19 Nov 2014 08:29:31 +0000 (11:29 +0300)]
Doxygen documentation for: highgui, video, imgcodecs and videoio

9 years agoMerge pull request #3428 from 23pointsNorth:patch-6
Vadim Pisarevsky [Mon, 1 Dec 2014 10:45:31 +0000 (10:45 +0000)]
Merge pull request #3428 from 23pointsNorth:patch-6

9 years agoMerge pull request #3452 from Dmitry-Me:fixIncorrectSizeComputation
Vadim Pisarevsky [Mon, 1 Dec 2014 10:43:43 +0000 (10:43 +0000)]
Merge pull request #3452 from Dmitry-Me:fixIncorrectSizeComputation

9 years agoMerge pull request #3426 from mshabunin:doxygen-imgproc
Vadim Pisarevsky [Mon, 1 Dec 2014 10:43:13 +0000 (10:43 +0000)]
Merge pull request #3426 from mshabunin:doxygen-imgproc

9 years agoMerge pull request #3446 from pokeefe:fix-compilation-without-videoio
Vadim Pisarevsky [Mon, 1 Dec 2014 10:41:34 +0000 (10:41 +0000)]
Merge pull request #3446 from pokeefe:fix-compilation-without-videoio

9 years agoMerge pull request #3467 from Dikay900:fix_gpu_surf_perf_test_cpu_part
Vadim Pisarevsky [Mon, 1 Dec 2014 10:37:40 +0000 (10:37 +0000)]
Merge pull request #3467 from Dikay900:fix_gpu_surf_perf_test_cpu_part

9 years agoMerge pull request #3458 from thorikawa:kmeans-index-parallel
Vadim Pisarevsky [Mon, 1 Dec 2014 10:37:23 +0000 (10:37 +0000)]
Merge pull request #3458 from thorikawa:kmeans-index-parallel

9 years agoMerge pull request #3464 from asuwend1:master
Vadim Pisarevsky [Mon, 1 Dec 2014 10:30:49 +0000 (10:30 +0000)]
Merge pull request #3464 from asuwend1:master

9 years agoMerge pull request #3457 from burun:patch-1
Vadim Pisarevsky [Mon, 1 Dec 2014 10:29:51 +0000 (10:29 +0000)]
Merge pull request #3457 from burun:patch-1

9 years agoMerge pull request #3466 from taka-no-me:ctrl_s_win
Vadim Pisarevsky [Mon, 1 Dec 2014 10:26:27 +0000 (10:26 +0000)]
Merge pull request #3466 from taka-no-me:ctrl_s_win

9 years agofix gpu sample performance test cpu part
Dikay900 [Sun, 30 Nov 2014 10:48:59 +0000 (11:48 +0100)]
fix gpu sample performance test cpu part

9 years agoMake Ctrl+S open save dialog on Windows
Andrey Kamaev [Sat, 29 Nov 2014 21:43:21 +0000 (00:43 +0300)]
Make Ctrl+S open save dialog on Windows

9 years agobug fix for a crash when input image is small
Ari Suwendi [Sat, 29 Nov 2014 09:57:15 +0000 (01:57 -0800)]
bug fix for a crash when input image is small

9 years agosamples: gpu: fix include of TickMeter
Dikay900 [Fri, 28 Nov 2014 18:19:20 +0000 (19:19 +0100)]
samples: gpu: fix include of TickMeter

9 years agoFix "assignment operator could not be generated" warnings
Takahiro Poly Horikawa [Fri, 28 Nov 2014 10:33:52 +0000 (19:33 +0900)]
Fix "assignment operator could not be generated" warnings

9 years ago- Use cv::Mutex to safely update converged flag
Takahiro Poly Horikawa [Fri, 28 Nov 2014 09:39:49 +0000 (18:39 +0900)]
- Use cv::Mutex to safely update converged flag
- Use cv::AutoBuffer rather than new allocation
- Fix "assignment operator could not be generated" warning

9 years agoMerge pull request #3451 from wangyan42164:ocl_pyrup_unrolled
Alexander Alekhin [Thu, 27 Nov 2014 09:53:36 +0000 (09:53 +0000)]
Merge pull request #3451 from wangyan42164:ocl_pyrup_unrolled

9 years agoParallize building kmeans index in flann
Takahiro Poly Horikawa [Thu, 27 Nov 2014 07:29:05 +0000 (16:29 +0900)]
Parallize building kmeans index in flann

9 years agoUpdate py_colorspaces.rst
burun [Thu, 27 Nov 2014 07:00:40 +0000 (09:00 +0200)]
Update py_colorspaces.rst

mask = cv2.inRange(hsv, lower_green, upper_green)
to
mask = cv2.inRange(hsv, lower_blue, upper_blue)

9 years agoUpdated Documentation (HoughCircles)
HelenWong [Mon, 24 Nov 2014 21:08:04 +0000 (13:08 -0800)]
Updated Documentation (HoughCircles)

Rewrite the note on HoughCircles documentation to make it more clear

Add note to clarify that the output vector of found circles is sorted by
descending order of centres accumulator values.

Also delete reductant lines on the HoughCircles documentation.

Added comments to hough circles function.

Added comments to icvhoughgradient

Misalignment in line 1183 corrected

9 years agoFix incorrect size computation
Dmitry-Me [Wed, 26 Nov 2014 09:24:53 +0000 (12:24 +0300)]
Fix incorrect size computation

9 years agoOptimize pyrUp_unrolled() by mad function.
Yan Wang [Wed, 26 Nov 2014 08:55:08 +0000 (16:55 +0800)]
Optimize pyrUp_unrolled() by mad function.

It could improve performance when image size is large.
E.g. OCL_PyrUpFixture_PyrUp.PyrUp/18

9 years agoFix compilation when building without the Video I/O module.
Pat O'Keefe [Tue, 25 Nov 2014 18:52:07 +0000 (13:52 -0500)]
Fix compilation when building without the Video I/O module.

9 years agoMerge pull request #3435 from oresths:filter_anchor_fix
Vadim Pisarevsky [Mon, 24 Nov 2014 09:38:42 +0000 (09:38 +0000)]
Merge pull request #3435 from oresths:filter_anchor_fix

9 years agoMerge pull request #3436 from oresths:compiler_option
Vadim Pisarevsky [Mon, 24 Nov 2014 09:37:27 +0000 (09:37 +0000)]
Merge pull request #3436 from oresths:compiler_option

10 years agoRemove redundant -mfpu=neon flag.
orestis [Wed, 19 Nov 2014 21:26:36 +0000 (23:26 +0200)]
Remove redundant -mfpu=neon flag.

This flag is already added in line 131.

10 years agoFix anchor for small symmetrical column filters.
orestis [Wed, 19 Nov 2014 21:12:58 +0000 (23:12 +0200)]
Fix anchor for small symmetrical column filters.

In the unoptimized version of small symmetrical column filters, when we
try to detect if the kernel, ky, is equal to [1;2;1] or [1;-2;1] we
should take into consideration that the anchor points in the middle
element.

10 years agoMerge pull request #3409 from fish2000:patch-1
Vadim Pisarevsky [Wed, 19 Nov 2014 16:25:36 +0000 (16:25 +0000)]
Merge pull request #3409 from fish2000:patch-1

10 years agoMerge pull request #3411 from eltermann:master
Vadim Pisarevsky [Wed, 19 Nov 2014 16:25:11 +0000 (16:25 +0000)]
Merge pull request #3411 from eltermann:master

10 years agoMerge pull request #3432 from taka-no-me:wintitle
Vadim Pisarevsky [Wed, 19 Nov 2014 16:23:52 +0000 (16:23 +0000)]
Merge pull request #3432 from taka-no-me:wintitle

10 years agoAdd cv::setWindowTitle to highgui
Andrey Kamaev [Mon, 17 Nov 2014 23:27:02 +0000 (02:27 +0300)]
Add cv::setWindowTitle to highgui

10 years agosilence cmake 3.0+ warnings on LOCATION attribute
Andrey Kamaev [Tue, 18 Nov 2014 12:39:59 +0000 (15:39 +0300)]
silence cmake 3.0+ warnings on LOCATION attribute

10 years agoDocumenting imgproc module
Maksim Shabunin [Thu, 13 Nov 2014 11:34:04 +0000 (14:34 +0300)]
Documenting imgproc module

- disabled doxygen tree
- enabled doxygen enum listing
- added imgproc reference to main page
- enabled BiB support
- chenged doxygen root page format

10 years agoMerge pull request #3431 from PhilLab:patch-3
Vadim Pisarevsky [Mon, 17 Nov 2014 13:39:45 +0000 (13:39 +0000)]
Merge pull request #3431 from PhilLab:patch-3

10 years agoTypos in CMake
Philipp Hasper [Mon, 17 Nov 2014 09:43:06 +0000 (10:43 +0100)]
Typos in CMake

10 years agoMerge pull request #3424 from dsjolie:daniel
Vadim Pisarevsky [Sun, 16 Nov 2014 18:10:00 +0000 (18:10 +0000)]
Merge pull request #3424 from dsjolie:daniel

10 years agoMerge pull request #3422 from avdmitry:install_doc_update
Vadim Pisarevsky [Sun, 16 Nov 2014 18:08:34 +0000 (18:08 +0000)]
Merge pull request #3422 from avdmitry:install_doc_update

10 years agoFixed variable name consistency
Daniel Angelov [Fri, 14 Nov 2014 22:49:22 +0000 (22:49 +0000)]
Fixed variable name consistency

The function parameters were different from the ones described below.

P.S. Why is ``flow`` InputOutputArray, shouldn't it be just OutputArray? If so, shouldn't the reason be specified - e.g. so others can benefit as well (e.g. not allocating memory on every frame?)

10 years agoMerge remote-tracking branch 'upstream/master' into daniel
Daniel Sjölie [Wed, 5 Nov 2014 14:00:10 +0000 (15:00 +0100)]
Merge remote-tracking branch 'upstream/master' into daniel

10 years agoupdated linux installation documentation
Dmitriy Anisimov [Fri, 14 Nov 2014 09:32:42 +0000 (12:32 +0300)]
updated linux installation documentation

10 years agoMerge pull request #3399 from mshabunin:doxygen-core
Vadim Pisarevsky [Thu, 13 Nov 2014 07:25:26 +0000 (07:25 +0000)]
Merge pull request #3399 from mshabunin:doxygen-core

10 years agoMerge pull request #3415 from jet47:fix-gpu-perf-sample
Vadim Pisarevsky [Thu, 13 Nov 2014 07:21:02 +0000 (07:21 +0000)]
Merge pull request #3415 from jet47:fix-gpu-perf-sample

10 years agoMerge pull request #3413 from wangyan42164:denoising_opencl_improvement
Alexander Alekhin [Thu, 13 Nov 2014 01:47:01 +0000 (01:47 +0000)]
Merge pull request #3413 from wangyan42164:denoising_opencl_improvement

10 years agofix gpu performance sample compilation
Vladislav Vinogradov [Wed, 12 Nov 2014 15:06:47 +0000 (18:06 +0300)]
fix gpu performance sample compilation

10 years agoImprove the performance of fast_nlmeans_denoising_opencl.
Yan Wang [Wed, 12 Nov 2014 10:47:48 +0000 (18:47 +0800)]
Improve the performance of fast_nlmeans_denoising_opencl.

1. Remove unnecessary barriers.
2. Adjust CTA_SIZE based on the following cases for Intel platform:
   a) OCL_Photo_DenoisingGrayscale.DenoisingGrayscale
   b) OCL_Photo_DenoisingColored.DenoisingColored

10 years agoMerge pull request #3406 from shiquanwang:Fix-bug-#4003_build-python-binding-under...
Vadim Pisarevsky [Wed, 12 Nov 2014 11:26:19 +0000 (11:26 +0000)]
Merge pull request #3406 from shiquanwang:Fix-bug-#4003_build-python-binding-under-python3

10 years agoDoxygen documentation for core module
Maksim Shabunin [Fri, 31 Oct 2014 15:09:19 +0000 (18:09 +0300)]
Doxygen documentation for core module

10 years agoMerge pull request #3407 from wangyan42164:canny_bug_fix
Vadim Pisarevsky [Wed, 12 Nov 2014 11:09:55 +0000 (11:09 +0000)]
Merge pull request #3407 from wangyan42164:canny_bug_fix

10 years agoFix canny segment fault (Bug #3978)
Yan Wang [Mon, 10 Nov 2014 07:41:04 +0000 (15:41 +0800)]
Fix canny segment fault (Bug #3978)

Avoid stack overflow based on std::vector cause
std::vector::resize() segmentation fault.

10 years agoMerge pull request #3410 from mgharbi:master
Vadim Pisarevsky [Wed, 12 Nov 2014 08:49:50 +0000 (08:49 +0000)]
Merge pull request #3410 from mgharbi:master

10 years agoDocumentation fix on py_tutorials/py_feature2d
eltermann [Tue, 11 Nov 2014 19:10:33 +0000 (17:10 -0200)]
Documentation fix on py_tutorials/py_feature2d

10 years agoFix Cuda -Wl linker options
Michae Gharbi [Tue, 11 Nov 2014 17:12:28 +0000 (12:12 -0500)]
Fix Cuda -Wl linker options

This line causes the following error when building custom projects that use OpenCV beta 3:
ld: warning: directory not found for option '-L/<project_root>/-Wl,/usr/local/cuda'

10 years agoMerge pull request #3408 from ilya-lavrenov:doc_fix
Vadim Pisarevsky [Tue, 11 Nov 2014 13:29:46 +0000 (13:29 +0000)]
Merge pull request #3408 from ilya-lavrenov:doc_fix