shengyu
2d41321ca0
fix quote
2016-04-06 14:31:06 +08:00
Alexander Alekhin
7783836fff
Merge pull request #6265 from huang-qiao:master
2016-04-06 04:51:59 +00:00
qiao
a7fe73f284
fix OpenCV_CONFIG_PATH get null value after CMake 2.8.11
...
syntax of cmake "get_filename_component" changed after version 2.8.11
for cmake version < 2.8.11
get_filename_component(<VAR> <FileName> PATH [CACHE])
for cmake version >= 2.8.11
get_filename_component(<VAR> <FileName> DIRECTORY [CACHE])
Update OpenCVConfig.cmake
Update OpenCVConfig.cmake.in
2016-04-06 11:33:53 +08:00
Alexander Alekhin
52ba3778e3
Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24
2016-04-05 16:29:15 +00:00
Alexander Alekhin
c7b6353a3c
Merge pull request #6365 from terfendail:vt/nonlocal_testdata
2016-04-05 15:25:15 +00:00
Alexander Alekhin
1f7fea9092
Merge pull request #6244 from dreifachstein:topic-cmake-install
2016-04-05 15:23:55 +00:00
Vitaly Tuzov
34b3d31f54
Fix for nonlocal data requirement in test2.py
2016-04-05 16:47:29 +03:00
Alexander Alekhin
6f139b4f8e
ffmpeg: interrupt callback fix
...
backport from master
2016-04-05 14:19:44 +03:00
Alexander Alekhin
7d4a8bc437
Merge pull request #6358 from alalek:ffmpeg_fix_timeout
2016-04-05 11:07:00 +00:00
Alexander Alekhin
7d9a480597
ffmpeg: interrupt callback fix
2016-04-04 13:17:04 +03:00
Vadim Pisarevsky
46d218bcec
Merge pull request #6312 from KnockSoftware:split-float-epsilon
2016-04-03 23:10:10 +00:00
Maksim Shabunin
0c068768a5
Merge pull request #6351 from mshabunin:fix_java_moments
2016-04-01 09:19:09 +00:00
Maksim Shabunin
fbbe75895a
Merge pull request #6353 from shengyu7697:fix_right_quote
2016-04-01 09:18:41 +00:00
shengyu
21513caf3f
missing right quote
2016-04-01 11:03:50 +08:00
Fraser Harris
0634808bf3
Added description of the AR model
2016-03-31 17:57:55 -07:00
Alexander Alekhin
873884aa47
Merge pull request #6346 from filipsladek:box_filter_32FC1
2016-03-31 17:06:52 +00:00
Alexander Alekhin
ab3fb8b2f8
Merge pull request #6340 from BloodAxe:parallel_logistic_regression
2016-03-31 17:06:20 +00:00
Maksim Shabunin
a5af69de6a
Java wrapper for moments: do not truncate values in set method
2016-03-31 12:57:10 +03:00
filipsladek
a821fde44e
add performance test for CV_32FC1
2016-03-31 09:05:02 +02:00
Alexander Alekhin
a056c9b113
Merge pull request #6329 from paroj:window_gui_cpp
2016-03-30 14:34:55 +00:00
filipsladek
f635381662
add testcase for CV_32FC1
2016-03-30 10:38:22 +02:00
filipsladek
493ac1df37
code style
2016-03-29 22:44:03 +02:00
filipsladek
9c3f790edb
Box filter implemented for CV_32FC1
2016-03-29 22:30:49 +02:00
Eduardo Arnold
d046602ea4
Enforced DecisionFunction vector indexes to be saved on SVM save/load methods
2016-03-29 16:35:27 -03:00
Anatoly Orlov
1740218ee0
small platform compatability fix for ESC key
2016-03-29 20:02:35 +03:00
Alexander Alekhin
86a725933a
Merge pull request #6343 from terfendail:vt/python_rng_seed_backport
2016-03-29 16:06:27 +00:00
Anatoly Orlov
2be805ce29
kalman.py was broken totally
...
1. Following condition is True on each iteration becuase -1 % 0xFF is 255 not -1
code = cv2.waitKey(100) % 0x100
if code != -1:
break
this were resetting point position on each cycle not on key press as intended
2. Previous small bug were masking serious bug with matrix operation on matrices of incorrect size.
As the result on 2nd iteration of internal cycle program has crushed.
I have fixed it too, matrix operation was taken from examples/cpp/kalman.cpp where it looks like
randn( processNoise, Scalar(0), Scalar::all(sqrt(KF.processNoiseCov.at<float>(0, 0))));
which is something totally different from previous code here.
Example behave as it should now, i.e. point moving by circle trajectory as in C++ example.
2016-03-29 18:27:35 +03:00
Vitaly Tuzov
64f02aa72d
Backport of setRNGSeed implementation and python test randomness fix
2016-03-29 18:05:28 +03:00
Alexander Alekhin
ff0d115800
Merge pull request #6332 from sovrasov:python_rng_seed
2016-03-29 14:23:26 +00:00
Alexander Alekhin
12a8f5486d
Merge pull request #6341 from SpecLad:destroy-leak
2016-03-29 12:36:51 +00:00
Roman Donchenko
97ac59cb73
Fix a memory leak indirectly caused by cvDestroyWindow
2016-03-29 14:06:05 +03:00
Eugene Khvedchenya
ee92a36123
Added parallel implementation of compute_gradient method.
2016-03-29 11:09:54 +03:00
Vladislav Sovrasov
72ed4173df
Change setRNGSeed implementaion
2016-03-29 10:54:42 +03:00
Evan Heidtmann
0712bccf52
Fix epsilon comparison when splitting
2016-03-28 14:16:32 -07:00
themightyoarfish
68d97502fe
Error message for wrong kernel size was insufficient.
...
When setting a wrong kernel size, the error message only tells the user that it
must be odd, however the conditions for rejection include values > 7 which must
be communicated. Without that, the message would be incorrect and confusing if
the user is unaware that only values 3, 5, 7 are accepted.
2016-03-28 14:06:55 +02:00
Vadim Pisarevsky
1e1dc1429f
Merge pull request #6321 from mshabunin:hal_cmake
2016-03-27 08:06:24 +00:00
Vadim Pisarevsky
481473eb12
Merge pull request #6326 from sovrasov:python_samples_update
2016-03-27 08:03:28 +00:00
Alexander Alekhin
ee123b8a9e
Merge pull request #6311 from peters:master
2016-03-26 19:55:17 +00:00
Vladislav Sovrasov
362d52a3cb
Fix doxygen warnings
2016-03-25 16:34:45 +03:00
Vladislav Sovrasov
a490b64e9b
Add function setRNGSeed and seed setup in python tests
2016-03-25 16:17:58 +03:00
Alexander Alekhin
05384f05cc
Merge pull request #6313 from amannababanana:master
2016-03-25 11:31:17 +00:00
Maksim Shabunin
50edaae06c
Merge pull request #6322 from berak:fix_linux_eclipse_tutorial
2016-03-25 07:39:19 +00:00
Pavel Rojtberg
0ac31a0bd7
highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings
2016-03-24 23:58:47 +01:00
Alexander Smorkalov
762965897a
Merge pull request #6320 from terfendail:vt/pytestarm64
2016-03-24 17:16:52 +00:00
Vladislav Sovrasov
1f8fd5382c
Replace of some synthetic scenes in python samples
2016-03-24 20:05:26 +03:00
berak
0b389b24f6
fix changed libraries in eclipse tutorial
2016-03-24 16:09:14 +01:00
Maksim Shabunin
79ffaa8ce9
Fixed cutom_hal.hpp file generation
2016-03-24 17:39:16 +03:00
Maksim Shabunin
727743809e
Using find_package to import custom HAL library
2016-03-24 17:05:54 +03:00
Vitaly Tuzov
ea3746bd15
Made texture flow python test less strict to fix it on AARCH64
2016-03-23 20:07:42 +03:00
Pavel Rojtberg
9dc14b3efc
cap_gst: inspect sink instead of videoconvert to find out properties
...
videoconvert might not be present on a manual pipeline, but appsink must
be.
2016-03-23 16:24:10 +01:00