platform/upstream/opencv.git
7 years agoMerge pull request #6945 from sturkmen72:update_documentation
Vadim Pisarevsky [Thu, 18 Aug 2016 13:23:17 +0000 (13:23 +0000)]
Merge pull request #6945 from sturkmen72:update_documentation

7 years agoMerge pull request #6855 from yigitsoy:patch-1
Vadim Pisarevsky [Thu, 18 Aug 2016 13:18:59 +0000 (13:18 +0000)]
Merge pull request #6855 from yigitsoy:patch-1

7 years agoMerge pull request #7055 from gylns:master
Vadim Pisarevsky [Thu, 18 Aug 2016 13:17:18 +0000 (13:17 +0000)]
Merge pull request #7055 from gylns:master

7 years agoMerge pull request #7087 from terfendail/master
Vadim Pisarevsky [Thu, 18 Aug 2016 13:12:38 +0000 (17:12 +0400)]
Merge pull request #7087 from terfendail/master

Fix for incorrect calcOpticalFlowPyrLK result evaluation with ARM NEON

7 years agoMerge pull request #7097 from JoeHowse:master
Vadim Pisarevsky [Thu, 18 Aug 2016 13:08:56 +0000 (13:08 +0000)]
Merge pull request #7097 from JoeHowse:master

7 years agoMerge pull request #7111 from sovrasov:mkl_lapack
Vadim Pisarevsky [Thu, 18 Aug 2016 13:05:26 +0000 (13:05 +0000)]
Merge pull request #7111 from sovrasov:mkl_lapack

7 years agoMerge pull request #7125 from alalek:cmake_apple_usr_local_lib
Vadim Pisarevsky [Thu, 18 Aug 2016 13:02:23 +0000 (13:02 +0000)]
Merge pull request #7125 from alalek:cmake_apple_usr_local_lib

7 years agoMerge pull request #7126 from paroj:buttonlayout
Alexander Alekhin [Thu, 18 Aug 2016 10:36:47 +0000 (10:36 +0000)]
Merge pull request #7126 from paroj:buttonlayout

7 years agoMerge pull request #6972 from vicproon:fix_6836_other_places
Alexander Alekhin [Thu, 18 Aug 2016 09:33:07 +0000 (09:33 +0000)]
Merge pull request #6972 from vicproon:fix_6836_other_places

7 years agoMerge pull request #7085 from sovrasov:hal_doc_fix
Alexander Alekhin [Wed, 17 Aug 2016 15:15:08 +0000 (15:15 +0000)]
Merge pull request #7085 from sovrasov:hal_doc_fix

7 years agoMerge pull request #7094 from terfendail:MSER_fix
Alexander Alekhin [Wed, 17 Aug 2016 15:14:33 +0000 (15:14 +0000)]
Merge pull request #7094 from terfendail:MSER_fix

7 years agocmake: add /usr/local/lib on Apple platform
Alexander Alekhin [Wed, 17 Aug 2016 10:34:59 +0000 (13:34 +0300)]
cmake: add /usr/local/lib on Apple platform

7 years agohighgui: allow specifying that a button should create a new buttonbar
Pavel Rojtberg [Wed, 17 Aug 2016 12:29:28 +0000 (14:29 +0200)]
highgui: allow specifying that a button should create a new buttonbar

7 years agoMerge pull request #7095 from PkLab:fix_rho&phi_doc
Alexander Alekhin [Wed, 17 Aug 2016 10:46:30 +0000 (10:46 +0000)]
Merge pull request #7095 from PkLab:fix_rho&phi_doc

7 years agoStatic Lapack linkage
Sovrasov [Wed, 10 Aug 2016 11:56:04 +0000 (12:56 +0100)]
Static Lapack linkage

7 years agoMerge pull request #7117 from patsp:fix_tiff_imdecode_remove_temporary_file
Alexander Alekhin [Tue, 16 Aug 2016 15:40:50 +0000 (15:40 +0000)]
Merge pull request #7117 from patsp:fix_tiff_imdecode_remove_temporary_file

7 years agoMerge pull request #7056 from ludv1x:python-extra-bindings
Maksim Shabunin [Tue, 16 Aug 2016 13:00:30 +0000 (13:00 +0000)]
Merge pull request #7056 from ludv1x:python-extra-bindings

7 years agoFix rho,phi exchange and amend linearPolar & logPolar docs with details and pics.
PkLab.net [Thu, 11 Aug 2016 17:32:29 +0000 (19:32 +0200)]
Fix rho,phi exchange and amend linearPolar & logPolar docs with details and pics.

7 years agoAdding of user-defined type conversions for python bindings inside module directories
Vitaliy Lyudvichenko [Sat, 6 Aug 2016 16:46:17 +0000 (19:46 +0300)]
Adding of user-defined type conversions for python bindings inside module directories
Adding of destructor and placement new constructors for classes wrapped with CV_EXPORTS_W_SIMPLE macro

7 years agoMerge pull request #7082 from souch55:Fixmerge
Maksim Shabunin [Tue, 16 Aug 2016 09:30:39 +0000 (09:30 +0000)]
Merge pull request #7082 from souch55:Fixmerge

7 years agoMerge pull request #7091 from alalek:reduce_precommit_ios_build
Maksim Shabunin [Tue, 16 Aug 2016 09:18:54 +0000 (09:18 +0000)]
Merge pull request #7091 from alalek:reduce_precommit_ios_build

7 years agoFix temporary file removal in imdecode for tiff
Patrick Spettel [Tue, 16 Aug 2016 08:49:11 +0000 (10:49 +0200)]
Fix temporary file removal in imdecode for tiff

The TiffDecoder keeps an open file handle.
As a consequence the file cannot be removed
before the TiffDecoder closes the file.

7 years agoCanny with own gradient (#6664)
LaurentBerger [Tue, 16 Aug 2016 07:51:09 +0000 (09:51 +0200)]
Canny with own gradient (#6664)

* example using the Canny algorithm with custom image gradient.

* Modified example to integrate new function canny with custom gradient

7 years agoMerge pull request #7110 from tomoaki0705:featureUniversalIntrinsicAccumulate
Alexander Alekhin [Mon, 15 Aug 2016 14:54:10 +0000 (14:54 +0000)]
Merge pull request #7110 from tomoaki0705:featureUniversalIntrinsicAccumulate

7 years agoUpdate documentation ( tutorials )
Suleyman TURKMEN [Mon, 18 Jul 2016 13:32:05 +0000 (16:32 +0300)]
Update documentation ( tutorials )

7 years agoReplaced quiet return from MSER:detectRegion function with exeption throwing to notif...
Vitaly Tuzov [Mon, 15 Aug 2016 08:28:52 +0000 (11:28 +0300)]
Replaced quiet return from MSER:detectRegion function with exeption throwing to notify user in case small image is processed

7 years agoMerge pull request #7106 from lupustr3:pvlasov/ipp_hal_fix
Maksim Shabunin [Mon, 15 Aug 2016 10:08:44 +0000 (10:08 +0000)]
Merge pull request #7106 from lupustr3:pvlasov/ipp_hal_fix

7 years agoMerge pull request #7077 from LaurentBerger:I7063
Maksim Shabunin [Mon, 15 Aug 2016 09:08:44 +0000 (09:08 +0000)]
Merge pull request #7077 from LaurentBerger:I7063

7 years agoMerge pull request #6995 from PkLab:i6746_naming_videoio_enums
Maksim Shabunin [Mon, 15 Aug 2016 09:01:24 +0000 (09:01 +0000)]
Merge pull request #6995 from PkLab:i6746_naming_videoio_enums

7 years agouse universal intrinsic in accumulate series
Tomoaki Teshima [Sun, 14 Aug 2016 23:40:13 +0000 (08:40 +0900)]
use universal intrinsic in accumulate series
      * accumulate, accumulateSquare, accumulateProduct and accumulateWeighted

7 years agoMSER: all test passed.
will hunt [Sun, 7 Aug 2016 00:38:38 +0000 (08:38 +0800)]
MSER: all test passed.
1. if a component's variation is a global minimum than it should be a local minimum
2. for the small image with invert and blur, the MSERs number should be 20

7 years agoIPP was enabled in mathfuncs_core;
Pavel Vlasov [Fri, 12 Aug 2016 15:16:04 +0000 (18:16 +0300)]
IPP was enabled in mathfuncs_core;
Exp and Log IPP implementations are changed to hal interface;

7 years agoMerge pull request #7104 from alalek:port_6106
Alexander Alekhin [Fri, 12 Aug 2016 13:51:55 +0000 (13:51 +0000)]
Merge pull request #7104 from alalek:port_6106

7 years agofixed compilation warning
Ilya Lavrenov [Thu, 11 Feb 2016 21:33:18 +0000 (00:33 +0300)]
fixed compilation warning

7 years agoMerge pull request #7102 from lupustr3:pvlasov/ipp_switch_fix
Alexander Alekhin [Fri, 12 Aug 2016 10:39:44 +0000 (10:39 +0000)]
Merge pull request #7102 from lupustr3:pvlasov/ipp_switch_fix

7 years agoFix for MSER::detectRegions crash on images with either dimension less than 3
Vitaly Tuzov [Thu, 11 Aug 2016 17:20:36 +0000 (20:20 +0300)]
Fix for MSER::detectRegions crash on images with either dimension less than 3

7 years agoFix for incorrect calcOpticalFlowPyrLK result evaluation with ARM NEON
Vitaly Tuzov [Wed, 10 Aug 2016 16:56:46 +0000 (19:56 +0300)]
Fix for incorrect calcOpticalFlowPyrLK result evaluation with ARM NEON

7 years agoIPP enabling fix and typo fix;
Pavel Vlasov [Fri, 12 Aug 2016 06:50:42 +0000 (09:50 +0300)]
IPP enabling fix and typo fix;

7 years agoRemoving whitespace to appease doc builder
Joe Howse [Fri, 12 Aug 2016 03:31:50 +0000 (00:31 -0300)]
Removing whitespace to appease doc builder

7 years agoImproved cat face cascades (lower false positive rate)
Joe Howse [Thu, 11 Aug 2016 23:47:08 +0000 (20:47 -0300)]
Improved cat face cascades (lower false positive rate)

7 years agoNaming some enumerations in videoio
PkLab.net [Tue, 26 Jul 2016 14:48:30 +0000 (16:48 +0200)]
Naming some enumerations in videoio

7 years agoMerge pull request #7062 from kurenai:return_if_camera_disconnected
Alexander Alekhin [Thu, 11 Aug 2016 14:07:42 +0000 (14:07 +0000)]
Merge pull request #7062 from kurenai:return_if_camera_disconnected

7 years agoMerge pull request #7057 from K-Shinotsuka:issue13
Maksim Shabunin [Thu, 11 Aug 2016 11:46:33 +0000 (11:46 +0000)]
Merge pull request #7057 from K-Shinotsuka:issue13

7 years agoFix HAL documentation
Vladislav Sovrasov [Wed, 10 Aug 2016 13:15:14 +0000 (16:15 +0300)]
Fix HAL documentation

7 years agoMerge pull request #7069 from StevenPuttemans:try_fix_cuda
Maksim Shabunin [Thu, 11 Aug 2016 11:06:34 +0000 (11:06 +0000)]
Merge pull request #7069 from StevenPuttemans:try_fix_cuda

7 years agoMerge pull request #7090 from daB0bby:patch-1
Maksim Shabunin [Thu, 11 Aug 2016 10:57:33 +0000 (10:57 +0000)]
Merge pull request #7090 from daB0bby:patch-1

7 years agoios: reduce number of test configurations in precommit builds
Alexander Alekhin [Thu, 11 Aug 2016 10:47:04 +0000 (13:47 +0300)]
ios: reduce number of test configurations in precommit builds

7 years agoMerge pull request #7075 from alalek:ocl_fix_canny_perf_test
Alexander Alekhin [Thu, 11 Aug 2016 09:19:44 +0000 (09:19 +0000)]
Merge pull request #7075 from alalek:ocl_fix_canny_perf_test

7 years agoMerge pull request #7083 from tomoaki0705:fixAccumulateShortFloat
Maksim Shabunin [Thu, 11 Aug 2016 09:00:38 +0000 (09:00 +0000)]
Merge pull request #7083 from tomoaki0705:fixAccumulateShortFloat

7 years agoSolve Issue 7063
LaurentBerger [Tue, 9 Aug 2016 14:00:03 +0000 (16:00 +0200)]
Solve Issue 7063

consequences of changes

accuracy test

Solve issue 7063

7 years agoMerge pull request #7078 from mshabunin:pr6862
Maksim Shabunin [Thu, 11 Aug 2016 08:56:07 +0000 (08:56 +0000)]
Merge pull request #7078 from mshabunin:pr6862

7 years agofix code-style consistency
daB0bby [Thu, 11 Aug 2016 08:15:48 +0000 (10:15 +0200)]
fix code-style consistency

7 years agoMerge pull request #7071 from K-Shinotsuka:issue14
Vadim Pisarevsky [Wed, 10 Aug 2016 10:49:05 +0000 (10:49 +0000)]
Merge pull request #7071 from K-Shinotsuka:issue14

7 years agoMerge pull request #7070 from paroj:noculegacy
Alexander Alekhin [Wed, 10 Aug 2016 10:48:31 +0000 (10:48 +0000)]
Merge pull request #7070 from paroj:noculegacy

7 years agoMerge pull request #7072 from alalek:ocl_fix_canny
Alexander Alekhin [Wed, 10 Aug 2016 10:44:52 +0000 (13:44 +0300)]
Merge pull request #7072 from alalek:ocl_fix_canny

7 years agoMerge pull request #6983 from K-Shinotsuka:issue8
Vadim Pisarevsky [Wed, 10 Aug 2016 10:31:12 +0000 (10:31 +0000)]
Merge pull request #6983 from K-Shinotsuka:issue8

7 years agoMerge pull request #7076 from sovrasov:mkl_lapack
Vadim Pisarevsky [Wed, 10 Aug 2016 10:25:17 +0000 (10:25 +0000)]
Merge pull request #7076 from sovrasov:mkl_lapack

7 years agoMerge pull request #7074 from sovrasov:interactive_calib_fix
Alexander Alekhin [Wed, 10 Aug 2016 10:05:52 +0000 (13:05 +0300)]
Merge pull request #7074 from sovrasov:interactive_calib_fix

7 years agolet the test of AccSqr_SIMD<ushort, float> pass
Tomoaki Teshima [Wed, 10 Aug 2016 09:36:00 +0000 (18:36 +0900)]
let the test of AccSqr_SIMD<ushort, float> pass
  * The difference becomes too large when multiply is done in int16
  * To reproduce the test failure, IPP has to be switched off

7 years agoMerge pull request #6955 from snosov1:fix-6836
Vadim Pisarevsky [Wed, 10 Aug 2016 09:26:51 +0000 (09:26 +0000)]
Merge pull request #6955 from snosov1:fix-6836

7 years agoMerge pull request #6949 from wiryls:FileStorageBase64DocsTests
Vadim Pisarevsky [Wed, 10 Aug 2016 09:26:13 +0000 (09:26 +0000)]
Merge pull request #6949 from wiryls:FileStorageBase64DocsTests

7 years agoFix modified
sourin [Wed, 10 Aug 2016 09:08:32 +0000 (14:38 +0530)]
Fix modified

7 years agoAdd MKL support
Vladislav Sovrasov [Tue, 9 Aug 2016 13:28:45 +0000 (16:28 +0300)]
Add MKL support

7 years agoAdded comments to clarify sample code
ggargov [Wed, 6 Jan 2016 21:46:49 +0000 (13:46 -0800)]
Added comments to clarify sample code

Program flow is not easily apparent so hopefully ANY comments in the code could help new users.

7 years agoMerge pull request #7044 from wolever:master
Alexander Alekhin [Tue, 9 Aug 2016 12:59:38 +0000 (12:59 +0000)]
Merge pull request #7044 from wolever:master

7 years agoocl: fix input data for Canny perf test
Alexander Alekhin [Tue, 9 Aug 2016 12:35:50 +0000 (15:35 +0300)]
ocl: fix input data for Canny perf test

"declare.in(img, WARMUP_RNG)" overrides input image with random values

Also added support for different input sizes (via cv::resize)

7 years agoFix build interactive-calibration app
Vladislav Sovrasov [Tue, 9 Aug 2016 12:29:57 +0000 (15:29 +0300)]
Fix build interactive-calibration app

7 years agofix inclusion of OpenCV header opencv.hpp
StevenPuttemans [Tue, 9 Aug 2016 09:30:38 +0000 (11:30 +0200)]
fix inclusion of OpenCV header opencv.hpp
cudev (only for use in .cu files) & cudalegacy (only legacy code) not included

7 years agoMerge pull request #7067 from tomoaki0705:fixBuildErrorJetsonK1
Alexander Alekhin [Tue, 9 Aug 2016 10:39:55 +0000 (10:39 +0000)]
Merge pull request #7067 from tomoaki0705:fixBuildErrorJetsonK1

7 years agoimprove LKTrackerInvoker::operator()
k-shinotsuka [Tue, 9 Aug 2016 09:59:29 +0000 (18:59 +0900)]
improve LKTrackerInvoker::operator()

7 years agoocl: fix Canny for Intel devices
Alexander Alekhin [Tue, 9 Aug 2016 09:48:06 +0000 (12:48 +0300)]
ocl: fix Canny for Intel devices

There is an issue with processing of abs(short) function for
negative argument.

Affected OpenCL devices:
- iGPU: Intel(R) HD Graphics 520 (OpenCL 2.0 )
- CPU: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (OpenCL 2.0 (Build 10094))

7 years agostitching: use correct ifdef to allow compilation without cudalegacy
Pavel Rojtberg [Mon, 8 Aug 2016 13:43:04 +0000 (15:43 +0200)]
stitching: use correct ifdef to allow compilation without cudalegacy

GraphCutSeamFinderGpu requires cudalegacy.

7 years agofix build error on JetsonTK1
Tomoaki Teshima [Mon, 8 Aug 2016 13:13:13 +0000 (22:13 +0900)]
fix build error on JetsonTK1
  * avoid using vld1_f16 and vst1_f16 on gcc 4 series (Ubuntu 14.04)
  * guard correctly with #if
  * use static inline

7 years agoimprove RGB2YCrCb_i<uchar>()
k-shinotsuka [Sun, 7 Aug 2016 03:05:27 +0000 (12:05 +0900)]
improve RGB2YCrCb_i<uchar>()

7 years agoMerge pull request #7059 from berak:doc_python_drawkeypoints
Vadim Pisarevsky [Mon, 8 Aug 2016 15:31:11 +0000 (15:31 +0000)]
Merge pull request #7059 from berak:doc_python_drawkeypoints

7 years agoMerge pull request #7016 from lewgate:bugfix_2
Vadim Pisarevsky [Mon, 8 Aug 2016 15:20:10 +0000 (15:20 +0000)]
Merge pull request #7016 from lewgate:bugfix_2

7 years agoMerge pull request #7024 from paroj:semanticidx
Vadim Pisarevsky [Mon, 8 Aug 2016 15:19:36 +0000 (15:19 +0000)]
Merge pull request #7024 from paroj:semanticidx

7 years agoMerge pull request #7043 from alalek:add_nonfree_flag
Vadim Pisarevsky [Mon, 8 Aug 2016 15:18:49 +0000 (15:18 +0000)]
Merge pull request #7043 from alalek:add_nonfree_flag

7 years agoMerge pull request #7042 from alalek:update_6967
Vadim Pisarevsky [Mon, 8 Aug 2016 15:17:48 +0000 (15:17 +0000)]
Merge pull request #7042 from alalek:update_6967

7 years agoMerge pull request #7047 from tomoaki0705:brushUpFp16Cuda
Vadim Pisarevsky [Mon, 8 Aug 2016 14:43:57 +0000 (14:43 +0000)]
Merge pull request #7047 from tomoaki0705:brushUpFp16Cuda

7 years agoMerge pull request #7066 from StevenPuttemans:fix_build_cuda_issues
Maksim Shabunin [Mon, 8 Aug 2016 13:22:49 +0000 (13:22 +0000)]
Merge pull request #7066 from StevenPuttemans:fix_build_cuda_issues

7 years agoreturn false from VideoCapture::grabFrame when camera is disconneted
kurenai [Mon, 8 Aug 2016 04:24:06 +0000 (12:24 +0800)]
return false from VideoCapture::grabFrame when camera is disconneted

7 years agoMerge pull request #7060 from catree:add_camera_model_doc
Alexander Alekhin [Mon, 8 Aug 2016 11:49:41 +0000 (11:49 +0000)]
Merge pull request #7060 from catree:add_camera_model_doc

7 years agoMerge pull request #7040 from sovrasov:calib_tutorial_code_update
Alexander Alekhin [Mon, 8 Aug 2016 11:38:19 +0000 (11:38 +0000)]
Merge pull request #7040 from sovrasov:calib_tutorial_code_update

7 years agofixing issues
StevenPuttemans [Mon, 8 Aug 2016 10:12:35 +0000 (12:12 +0200)]
fixing issues

7 years agoImprovements in camera_calibration tutorial code
Vladislav Sovrasov [Thu, 4 Aug 2016 11:10:15 +0000 (14:10 +0300)]
Improvements in camera_calibration tutorial code

7 years agopython docs: fix missing output image in cv2.drawKeypoint examples
berak [Sun, 7 Aug 2016 13:59:11 +0000 (15:59 +0200)]
python docs: fix missing output image in cv2.drawKeypoint examples

7 years agoModify the figure of the pinhole camera model with pixels starting from the uv axis.
catree [Mon, 8 Aug 2016 01:31:31 +0000 (03:31 +0200)]
Modify the figure of the pinhole camera model with pixels starting from the uv axis.

7 years agoMSER: grew unnecessary histories.
will hunt [Sat, 6 Aug 2016 04:27:43 +0000 (12:27 +0800)]
MSER: grew unnecessary histories.
the merge() calls growHistory() too many times such that:
1. some CompHistory nodes not used have been created
2. some CompHistory node's val equal their parents

7 years agoMSER: off-by-one bug
will hunt [Sat, 6 Aug 2016 04:24:16 +0000 (12:24 +0800)]
MSER: off-by-one bug

7 years agoMerge pull request #6958 from mschoeneck:Common-Canny-parallelization
mschoeneck [Fri, 5 Aug 2016 14:20:56 +0000 (16:20 +0200)]
Merge pull request #6958 from mschoeneck:Common-Canny-parallelization

* Common Canny parallelization added. TBB and single thread code removed. Final pass vectorized with SSE2 intrinsics.

* wrong #ifdef replaced with #if

* Merged to actual Canny version

* Merged common parallelized Canny with actual Canny implementation

* Remove 'Mutex *mutex' and pass 'Mutex mutex' from outside to parallelCanny

* Replaced extern Mutex with intern mutable Mutex.

7 years agofollow the naming rule as other API
Tomoaki Teshima [Mon, 1 Aug 2016 09:42:09 +0000 (18:42 +0900)]
follow the naming rule as other API
  * stop using 'CUDA' prefix
  * add explanation

7 years agoimgproc: sepFilter: update OpenCL condition
Alexander Alekhin [Thu, 4 Aug 2016 15:05:39 +0000 (18:05 +0300)]
imgproc: sepFilter: update OpenCL condition

Problem is observed with test_loop_times=100
in corner cases like 93x1 or similar

7 years agoimgproc: disable IPP for GaussianBlur in case of ROI
Alexander Alekhin [Thu, 4 Aug 2016 14:50:23 +0000 (17:50 +0300)]
imgproc: disable IPP for GaussianBlur in case of ROI

7 years agoimgproc: Prefer OCL calculation before IPP in GaussianBlur.
matze [Thu, 21 Jul 2016 17:59:26 +0000 (19:59 +0200)]
imgproc: Prefer OCL calculation before IPP in GaussianBlur.

7 years agofixed two bugs that I caused.
MYLS [Fri, 5 Aug 2016 08:15:03 +0000 (16:15 +0800)]
fixed two bugs that I caused.

7 years agomake some changes according to the code review.
MYLS [Fri, 5 Aug 2016 07:17:21 +0000 (15:17 +0800)]
make some changes according to the code review.

- use `std::string` instead of `new char`;
- reserve 1 MB for buffer;

7 years agoCleaner fix for crash on double-stop of CvVideoCamera
David Wolever [Thu, 4 Aug 2016 16:44:07 +0000 (12:44 -0400)]
Cleaner fix for crash on double-stop of CvVideoCamera

7 years agocmake: add OPENCV_ENABLE_NONFREE option and macro
Alexander Alekhin [Thu, 4 Aug 2016 16:23:49 +0000 (19:23 +0300)]
cmake: add OPENCV_ENABLE_NONFREE option and macro

7 years agoMerge pull request #7020 from StevenPuttemans:add_scale_option
Vadim Pisarevsky [Thu, 4 Aug 2016 13:37:29 +0000 (13:37 +0000)]
Merge pull request #7020 from StevenPuttemans:add_scale_option