490b327be9
Merge pull request #5365 from sturkmen72:patch-2
2015-10-22 12:25:48 +00:00
ff35726fc3
Merge pull request #5432 from sturkmen72:patch-11
2015-10-22 12:24:47 +00:00
b34f0d99bb
Merge pull request #5539 from sturkmen72:patch-14
2015-10-21 11:54:52 +00:00
66f2000548
Merge pull request #5532 from grundman:patch-2
2015-10-21 11:54:30 +00:00
91e9e6489b
Merge pull request #5542 from renatoGarcia:matx_constructors
2015-10-21 11:46:27 +00:00
f820df2ea0
Merge pull request #5543 from aman11dhanpat:master
2015-10-21 11:44:35 +00:00
a91dcb015d
Merge pull request #5548 from berak:patch-2
2015-10-21 11:41:25 +00:00
781931a671
update python features2d tutorials
2015-10-21 08:22:22 +02:00
fd4761ba31
Update face detection samples
2015-10-20 19:09:21 +03:00
3119f0a61b
Merge pull request #5519 from hyunkim9123:camshift_py
2015-10-20 14:43:33 +00:00
1648e9292c
Merge pull request #5431 from MiguelAlgaba:em_one_cluster
2015-10-19 15:27:35 +00:00
d5e314e728
Fixing compilation errors in windows and mac
2015-10-19 10:58:43 +00:00
b0209ad7f7
Fix for #5495 : add setTrackbarMin
2015-10-19 08:44:06 +00:00
f5b98bea41
Fix behavior of Matx 12 and 16 args constructors.
...
The 12 and 16 arguments Matx constructors differs from all others,
leaving values initialized and requiring the argument number to be equal
to the channels number.
2015-10-18 23:16:21 -02:00
51e687f7a9
Update imgproc.hpp
2015-10-18 15:53:15 +03:00
f260b13a6f
Fix racy modification of ForThread::m_state during invocation of stop()
2015-10-16 11:19:27 -07:00
d5d16bb3b1
Fix the issue in mouse click event
2015-10-15 11:09:31 +09:00
37ce3b8cfe
Merge pull request #5478 from alalek:fix_android_pack_build
2015-10-14 13:05:18 +00:00
885ce6b348
Merge pull request #5507 from rodrigob:patch-1
2015-10-14 09:14:43 +00:00
dcca0b499c
Merge pull request #5509 from spmallick:master
2015-10-14 09:14:10 +00:00
d8c352d20d
Merge pull request #5504 from aman11dhanpat:master
2015-10-14 09:10:30 +00:00
c1545c6f2a
Merge pull request #5502 from AlexanderStohr:file-handle-volatile-fix
2015-10-14 09:09:30 +00:00
066c775321
Update window_QT.h
...
QPushButton was included twice.
2015-10-13 15:51:43 -07:00
d8e470fc30
CommandLineParser missing gpu option
...
As is it was not possible to use CUDA.
2015-10-13 19:04:06 +02:00
466a98f7c3
Merge pull request #5493 from lupustr3:pvlasov/ipp9_fixes
2015-10-13 14:24:09 +00:00
0098c4b571
fix VS2010 error with type mismatch due to volatile qualifier
2015-10-13 16:15:49 +02:00
7e3d7677ae
not only print file-not-found as a warning but also print the name of the problematic file and the uri used for the open attempt
2015-10-13 16:15:48 +02:00
40b2dfae09
Fix for filter2D and IPP < 900
2015-10-13 14:10:32 +03:00
0d791189ee
Merge pull request #5486 from amroamroamro:fix_ml_randMVNormal
2015-10-12 17:44:02 +00:00
411be4fde8
Fix for #5481 , removing repeated/useless assignment in contours.cpp
2015-10-12 16:16:27 +00:00
ddd91bcebf
android: add targetSdkVersion="21"
2015-10-12 18:12:34 +03:00
a21be6706d
android: force OpenCV library target to "android-21"
2015-10-12 14:27:05 +03:00
89eee6ca99
Fixes for IPP integration:
...
dotProd_16s - disabled for IPP 9.0.0;
filter2D - fixed kernel preparation;
morphology - conditions fix and disabled FilterMin and FilterMax for IPP 9.0.0;
GaussianBlur - disabled for CV_8UC1 due to buffer overflow;
integral - disabled for IPP 9.0.0;
IppAutoBuffer class was added;
2015-10-12 10:51:28 +03:00
13a0a37e63
fix randMVNormal in ML ( #5469 )
...
Fix the failed assertion by replacing the GEMM call.
Also random numbers are generated from normal distribution ~N(0,1),
instead of uniform distribution ~U(0,1).
2015-10-11 01:54:11 +03:00
dbcc55a196
cleanup <build>/src|gen folders to remove stalled/unused Java files
2015-10-09 17:28:50 +03:00
0f1fdd885d
Merge pull request #5471 from StevenPuttemans:add_images_python_tutorials
2015-10-09 11:31:32 +00:00
441eeef319
Merge pull request #5470 from apavlenko:android_camera_gl_view
2015-10-08 13:31:51 +00:00
a8d0c18248
Merge pull request #5468 from AVshokurov:master
2015-10-08 12:37:57 +00:00
bbe007159a
The latest version (5.1.1) of the gnu compiler returns just its major version ("5") when given the "-dumpversion" argument. Gnu compiler developers don't consider this to be an error. A workaround for this case has been made.
2015-10-08 07:22:20 -04:00
24ca6aaada
fix build with CMake
...
now it builds by the command:
`cmake.exe -Wno-dev -GNinja -DCMAKE_MAKE_PROGRAM="path\to\ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE=../opencv3/platforms/android/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a with NEON" -DANDROID_SDK_TARGET=21 -DANDROID_NATIVE_API_LEVEL=14 -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DBUILD_ANDROID_EXAMPLES=ON -DINSTALL_ANDROID_EXAMPLES=ON -DWITH_OPENCL=YES -DANDROID_OPENCL_SDK=path\to\OpenCL ../opencv`
2015-10-08 13:48:46 +03:00
913c266b4a
adding missing images from python tutorials, like chessboard.png, simple.jpg, home.jpg, fly.png, ...
2015-10-08 11:59:54 +02:00
23fea91e84
minor fixes
2015-10-08 12:37:59 +03:00
a041105491
refactoring Tutorial-4 using new OpenCV CameraGLSurfaceView
2015-10-08 01:26:54 +03:00
484c68cbb8
Merge pull request #5460 from sergiud:highgui-autosize-gtk3
2015-10-07 14:47:16 +00:00
56e8827ce0
Merge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size
2015-10-07 14:42:29 +00:00
ea535abd50
Merge pull request #5462 from alalek:fix_x86_detection
2015-10-07 14:41:44 +00:00
15db8243ef
refactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable new stuff if target API < 21
2015-10-07 15:01:32 +03:00
fe00689757
workaround for 32-bit OS on 64-bit x86 CPU
2015-10-06 20:42:21 +03:00
706b8a6266
Merge pull request #5459 from aman11dhanpat:master
2015-10-06 17:12:03 +00:00
559b538be8
Merge pull request #5458 from berak:fix_putText
2015-10-06 17:11:47 +00:00
Maksim Shabunin
Vadim Pisarevsky
berak
Suleyman TURKMEN
Alexander Alekhin
Aman Verma
Renato Florentino Garcia
grundman
paul.kim
spmallick
Rodrigo Benenson
AlexanderStohr
Pavel Vlasov
Amro
Anton V. Shokurov
Andrey Pavlenko
StevenPuttemans