Alexander Alekhin
80bd67c36b
Merge pull request #4125 from ruslo:interface.include.dirs
2015-06-17 16:04:46 +00:00
Ruslan Baratov
83b882039e
Update samples/cpp/example_cmake: no need to use include_directories
2015-06-17 17:53:05 +02:00
Maksim Shabunin
a816a4b964
Updated android manager readme file
2015-06-17 18:10:29 +03:00
Maksim Shabunin
bfa77ff5a4
Increase android samples versions
2015-06-17 18:10:28 +03:00
Maksim Shabunin
c79ad45fce
Added interface libraries for android opencv_java
2015-06-17 18:10:28 +03:00
Maksim Shabunin
48cc53bf2e
Updated android toolchain
2015-06-17 18:10:28 +03:00
Maksim Shabunin
f63dde2f43
Separate OpenCV.mk files for different ABIs
2015-06-17 18:10:28 +03:00
Maksim Shabunin
7bfd070864
Merge pull request #4095 from alalek:hal_unresolved_symbols
2015-06-17 14:35:40 +00:00
Alexander Alekhin
1ce0ef9d41
fix build without IPP (and empty 3rdparty)
2015-06-17 17:24:35 +03:00
Ruslan Baratov
f30bf39bd4
Add OpenCV_INCLUDE_DIRS to INTERFACE_INCLUDE_DIRECTORIES target property
...
With this fix there is no need to add includes by using
`include_directories(${OpenCV_INCLUDE_DIRS})`. Directory will be added by
command `target_link_libraries(... ${OpenCV_LIBS})` automatically.
2015-06-17 16:03:21 +02:00
Vadim Pisarevsky
bf8434770f
Merge pull request #4115 from themightyoarfish:MatToUIImage_transparency
2015-06-17 11:59:33 +00:00
Vadim Pisarevsky
e055128d0d
Merge pull request #4099 from sash-kan:fix.2822
2015-06-17 11:58:40 +00:00
Vadim Pisarevsky
66216ea2be
Merge pull request #4093 from mshabunin:python-bases
2015-06-17 11:55:07 +00:00
Vadim Pisarevsky
d882797fbd
Merge pull request #4100 from alalek:fix_ffmpeg
2015-06-17 11:29:33 +00:00
Vadim Pisarevsky
220bb14d10
Merge pull request #4114 from alalek:ocl_generator_error_processing
2015-06-17 11:26:53 +00:00
Vadim Pisarevsky
0824ed595b
Merge pull request #4090 from MSOpenTech:highgui_winrt
2015-06-17 11:22:41 +00:00
Vadim Pisarevsky
fd225469bc
Merge pull request #4122 from alalek:fix_issue_3891
2015-06-17 11:13:27 +00:00
Alexander Alekhin
12e6efc6e4
Merge pull request #4123 from rajithr:patch-1
2015-06-17 10:11:50 +00:00
Ruslan Baratov
0fcc5face3
Fix `cmake -E touch classes.jar' step
...
`-E touch` command doesn't create intermediate directories. We have to do it
manually using `file(MAKE_DIRECTORY ...)` command.
2015-06-17 12:11:11 +02:00
themightyoarfish
125782c061
fixed copy-paste errors
2015-06-17 12:08:34 +02:00
Maksim Shabunin
fef7509eed
NumpyAllocator: check reference count before actual release, revert flann changes
2015-06-17 12:07:57 +03:00
rajithr
510dec4927
Fixing resource leaks
2015-06-17 11:07:49 +05:30
Alexander Alekhin
9394486147
fix issue 3891
2015-06-16 18:53:58 +03:00
Vadim Pisarevsky
01c3ed6157
Merge pull request #4108 from Reen:patch-1
2015-06-16 13:26:47 +00:00
Vadim Pisarevsky
a003d1d758
Merge pull request #4109 from alalek:fix_build_dbt_bindings
2015-06-16 13:06:36 +00:00
Vadim Pisarevsky
f824db4803
Merge pull request #4119 from D-Alex:master
2015-06-16 12:29:44 +00:00
Vadim Pisarevsky
0c67c6c136
Merge pull request #4112 from sturkmen72:patch-1
2015-06-16 12:18:13 +00:00
Vadim Pisarevsky
f846bb2b49
Merge pull request #4121 from sbokov:addingAloeGT
2015-06-16 12:15:27 +00:00
Vadim Pisarevsky
e79c184b2d
Merge pull request #4116 from alalek:fix-pthread-pf
2015-06-16 12:08:42 +00:00
Maxim Kostin
6724a0b8cd
Added dummy highgui WinRT implementation
2015-06-15 15:59:16 +03:00
sbokov
5123c3e52e
Added ground-truth disparity map for 'aloe'
2015-06-14 23:59:48 +03:00
Alexander Duda
def2256609
cv::stereoRectify: fix segfault in case of empty distCoeffs
...
cvStereoRectify assumes that NULL is provided in case of no distCoeffs
2015-06-12 13:50:43 +02:00
Jaime Fernandez
c613ee2da4
BUG: ndarray to Mat conversion with NPY_RELAXED_STRIDES set
...
Add logic to avoid nonsense strides when dimension size is 1 and
NumPy is built with NPY_RELAXED_STRIDES from tripping OpenCV.
2015-06-11 09:41:12 -07:00
Alexander Alekhin
a482dcce46
fix support for pthreads parallel_for
2015-06-11 16:53:07 +03:00
themightyoarfish
d647261de2
Fixed alpha preservation when converting 4-channel Mat to UIImage
2015-06-11 14:59:57 +02:00
Alexander Alekhin
b7cfd5a7da
ocl: added errors processing in OpenCL code generator, resolve space issue
2015-06-11 15:36:29 +03:00
Suleyman TURKMEN
caa0058d5b
Update imgproc.hpp
2015-06-11 11:46:42 +03:00
Suleyman TURKMEN
dac715ad1f
Update imgproc.hpp
2015-06-11 11:03:14 +03:00
Suleyman TURKMEN
061131a5ee
Update imgproc.hpp
2015-06-10 13:18:40 +03:00
Maksim Shabunin
26d9a7cd40
Trying to fix flann python wrapper issue
2015-06-10 13:00:36 +03:00
Alexander Alekhin
caaf60ba00
remove bindings generation for DetectionBasedTracker
2015-06-09 19:01:04 +03:00
René
3e2515d735
Fix bug in distanceATS_L1_8u and typos.
...
The inner loop of the backward scan got the wrong initial "a".
2015-06-09 17:23:22 +02:00
Alexander Alekhin
3f2666778a
videoio: fix some issues in ffmpeg error processing
2015-06-09 16:30:57 +03:00
Alexander Alekhin
959d575292
videoio: update ffmpeg backend
...
- fix compilation for old libraries
- update codec/tag selection logic
- add documentation note about MP4 container tags
2015-06-09 16:30:57 +03:00
Maksim Shabunin
1f983ec39c
Fixed compilation of pthread-based parallel_for with gcc 4.4.3
2015-06-09 13:59:48 +03:00
jayceelock
a345d16cc1
Changed to allow for ISO page size selection, checkerboard pattern now centres itself properly in middle of the page
2015-06-09 11:35:48 +02:00
alexander barakin (aka sash-kan)
0d821f04fd
fix icvCloseCAM_V4L wrong order of code blocks
...
this patch fixes bug http://code.opencv.org/issues/2822 .
based on disussion (in russian):
http://ru.stackoverflow.com/a/428398/178576
Signed-off-by: alexander barakin (aka sash-kan) <alex@barak.in>
2015-06-06 14:41:00 +03:00
Alexander Alekhin
8184e57dd6
fix tests build (win,shared,world)
2015-06-05 16:30:36 +03:00
Maksim Shabunin
78ddc567f9
Python generator: moved base class handling to the generate step
2015-06-05 12:41:23 +03:00
Maksim Shabunin
424c2bddb3
Merge tag '3.0.0'
...
OpenCV 3.0.0
* tag '3.0.0':
Version for 3.0.0 release
2015-06-04 14:54:50 +03:00