Vadim Pisarevsky
20aaa8fe77
Merge pull request #2560 from akarsakov:gaussianblur_integer
2014-04-15 13:21:25 +04:00
Aaron Kunze
ebbac3c66d
Optimizes OpenCL resize and optical flow to use image extension.
2014-04-14 16:09:17 -07:00
Andrey Pavlenko
8176e893c0
Merge pull request #2609 from alalek:tests_fixes
2014-04-14 18:54:01 +04:00
Ilya Lavrenov
2a051a124f
cvtColor
2014-04-14 14:29:36 +04:00
unknown
06df383675
Indent fixes
2014-04-11 19:14:01 -07:00
Alexander Alekhin
3a1a3da782
fix tests
2014-04-11 16:11:05 +04:00
unknown
e032b5f5d5
Resolving conflicts after rebasing from public
2014-04-10 12:28:37 -07:00
Aaron Kunze
b59c517f98
Optimizations to OpenCL bilateral filter.
2014-04-10 12:15:13 -07:00
Andrey Pavlenko
e6d6a3a85b
Merge pull request #2586 from ilya-lavrenov:ipp_disable
2014-04-09 14:16:25 +04:00
Ilya Lavrenov
e090aa07db
disabled some IPP funcs
2014-04-08 22:30:18 +04:00
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
2014-04-08 14:49:20 +04:00
Andrey Pavlenko
def4f5e2a3
Merge pull request #2499 from mlyashko:back_proj_fix1
2014-04-07 10:57:21 +04:00
Alexander Karsakov
a3825acee4
Small refactoring
2014-04-02 16:38:32 +04:00
Andrey Pavlenko
6ef94b52ad
Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear
2014-04-01 12:54:07 +04:00
Ilya Lavrenov
31f864a22b
integer cv::resize (INTER_LINEAR && CV_8UC(cn))
2014-03-31 20:25:53 +04:00
Alexander Karsakov
10a52220f0
Added integer arithmetic to sepFilter2D
2014-03-31 16:45:15 +04:00
mlyashko
5acd178790
copyright fix
2014-03-31 14:57:03 +04:00
Ilya Lavrenov
e1efed1914
added support of ksize >= 5 to cv::Laplacian
2014-03-31 13:17:58 +04:00
mlyashko
4c5de04efb
bug fix
2014-03-31 10:58:15 +04:00
Alexander Karsakov
d17142b83d
Prototype OCL version of gaussian blur with integer arithmetic
2014-03-28 21:46:03 +04:00
mlyashko
4b71921526
both tests by picture and rand mat
2014-03-27 17:08:05 +04:00
Andrey Pavlenko
d63a8ba018
Merge pull request #2523 from ilya-lavrenov:tapi_filters
2014-03-25 16:23:02 +04:00
Aaron Kunze
ede6d4482b
Optimizations to OpenCL bilateral filter.
2014-03-24 13:35:56 -07:00
Andrey Pavlenko
9e1124d24a
Merge pull request #2525 from ilya-lavrenov:tapi_sep
2014-03-24 22:43:34 +04:00
Ilya Lavrenov
061a25447e
eliminated restriction delta == 0 from cv::sepFilter2D
2014-03-24 17:39:07 +04:00
Ilya Lavrenov
e2c6ab0166
refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0
2014-03-24 14:42:51 +04:00
Ilya Lavrenov
b6833fdde7
added 3-channels support to cv::medianBlur
2014-03-24 14:32:31 +04:00
Ilya Lavrenov
a51ab99a79
added 3-channels support to cv::filter2D, cv::Laplacian
2014-03-24 14:32:31 +04:00
Ilya Lavrenov
e19c42dded
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
2014-03-24 14:31:42 +04:00
Ilya Lavrenov
8f5fd44fb2
added 3 channels support to cv::bilateralFilter
...
Conflicts:
modules/imgproc/test/ocl/test_filters.cpp
2014-03-24 14:31:41 +04:00
Ilya Lavrenov
6ba60a1e22
added 3-channels support to cv::Canny
2014-03-24 13:02:54 +04:00
Andrey Pavlenko
d8c018289a
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
2014-03-24 10:37:15 +04:00
Ilya Lavrenov
2875ce60ea
added 3-channels support to optimized version
2014-03-21 16:02:47 +04:00
Andrey Pavlenko
bdfd29a0b8
Merge pull request #2496 from ilya-lavrenov:tapi_imgproc
2014-03-20 19:20:15 +04:00
Ilya Lavrenov
63d8a61b9b
enabled 3-channels support for cv::createSuperResolution_BTVL1
2014-03-20 13:31:20 +04:00
Ilya Lavrenov
291458a859
generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support
2014-03-19 18:56:16 +04:00
Ilya Lavrenov
b449b0bf71
simplified cv::sepFilter2D OpenCL part
2014-03-19 15:59:00 +04:00
Ilya Lavrenov
b73490f86c
eliminated restriction src[i].channels() == 1 in cv::merge
2014-03-19 13:56:31 +04:00
Ilya Lavrenov
d1cfcfcafd
added 3-channels support to morphology operations
2014-03-18 20:15:11 +04:00
Alexander Alekhin
dca401d4cc
ocl: pyrUp/pyrDown 3-channel
2014-03-12 14:39:55 +04:00
Alexander Alekhin
e7475bff68
TAPI: remap 3-channel
2014-03-10 20:35:10 +04:00
Andrey Pavlenko
451be9ed53
Merge pull request #2444 from ilya-lavrenov:tapi_gftt
2014-03-07 13:53:43 +04:00
Ilya Lavrenov
86a3ed4162
improved performance of GFTT
2014-03-06 09:19:40 +04:00
Andrey Pavlenko
c9d8025fab
Merge pull request #2391 from ilya-lavrenov:tapi_match_template
2014-03-04 18:50:14 +04:00
Roman Donchenko
bd5d8404c9
Merge pull request #2393 from ilya-lavrenov:coverity
2014-02-26 12:16:36 +04:00
Roman Donchenko
48432502b6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
Ilya Lavrenov
32eb38ec98
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
Ilya Lavrenov
0ef16125ae
improved cv::matchTemplate OpenCL part
2014-02-22 14:30:19 +04:00
Alexander Smorkalov
4c1ed13846
Warning fixes for GCC 4.8.
2014-02-18 23:53:35 +04:00
Ilya Lavrenov
8150c1b7e4
added [s|l]rgb <-> lab conversion
2014-02-14 18:45:56 +04:00
Alexander Alekhin
ce992c8269
ocl: update gftt
2014-02-07 14:51:59 +04:00
Andrey Pavlenko
4b31b9cb8c
Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter
2014-02-07 11:33:49 +04:00
Ilya Lavrenov
412468e0ae
added cv::sqrBoxFilter to T-API
2014-02-06 19:19:18 +04:00
Roman Donchenko
652a0bd5ce
Merge pull request #2262 from SpecLad:merge-2.4
2014-02-03 15:33:41 +04:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Ilya Lavrenov
e844c08203
some fixes and improvements in cv::matchTemplate
2014-02-02 19:20:37 +04:00
Andrey Pavlenko
82bab2b03b
Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter
2014-01-31 19:04:49 +04:00
Ilya Lavrenov
68f5dd4170
simplified cv::boxFilter OpenCL impl
2014-01-31 01:53:38 +04:00
Andrey Pavlenko
77bbd65fa6
Merge pull request #2220 from ilya-lavrenov:tapi_accumulate
2014-01-30 17:33:06 +04:00
Ilya Lavrenov
384a28622d
added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)
2014-01-29 20:19:15 +04:00
Ilya Lavrenov
7c96d98a24
implemented OpenCL version of cv::accumulate****
2014-01-29 11:42:46 +04:00
Seunghoon Park
eb9d7c4dd5
fixing bug #3345 . use norm to make sure two matrices are the same.
2014-01-27 20:57:40 -05:00
Seunghoon Park
73389b2b9c
Merge branch '2.4' into blur_border_isolated
2014-01-27 20:44:03 -05:00
Elena Gvozdeva
4d86804f11
Fixed merge conflicts
2014-01-23 15:31:32 +04:00
Elena Gvozdeva
b4652e2cb3
Added perf test for ocl_matchTemplate
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
47b572f99f
fixed
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
da4d33ec26
Fixed test_match_template
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
86636dc265
Added ocl_matchTemplate( without dft)
2014-01-23 14:50:28 +04:00
Ilya Lavrenov
d2ffd8ed21
implemented OpenCL version of cv::preCornerDetect
2014-01-22 13:46:26 +04:00
Andrey Pavlenko
069bb9a929
Merge pull request #2185 from ilya-lavrenov:tapi_corners
2014-01-22 10:25:41 +04:00
Andrey Pavlenko
99942e8043
Merge pull request #2166 from ilya-lavrenov:tapi_gftt
2014-01-21 22:29:41 +04:00
Ilya Lavrenov
3177a683e9
ported corners to T-API
2014-01-21 20:13:55 +04:00
Ilya Lavrenov
bfa382cf9d
fixed copying UMat -> std::vector
2014-01-21 14:37:22 +04:00
Ilya Lavrenov
e5130cf83f
enabled tests
2014-01-20 18:09:43 +04:00
Ilya Lavrenov
52ed6d0d27
ported cv::goodFeaturesToTrack to T-API
2014-01-20 13:57:53 +04:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Roman Donchenko
79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +04:00
Ilya Lavrenov
93a818684c
ported cv::Canny to T-API
2014-01-17 11:13:28 +04:00
Seunghoon Park
2272a58769
fixing bug #3345 . don't use BORDER_ISOLATED alone. it should be combined with some border type
2014-01-14 20:47:23 -05:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Seunghoon Park
b036fc756a
fixing bug #3345
2013-12-30 21:10:06 -05:00
Andrey Pavlenko
0913dd7ffa
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
2013-12-27 22:38:08 +04:00
vbystricky
26d53c7435
Change threshold from 2.0 to 1.0 in the test
2013-12-27 16:26:34 +04:00
vbystricky
b719ed79c2
Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR
2013-12-27 16:21:32 +04:00
Andrey Pavlenko
5c25d821b1
Merge pull request #2063 from vpisarev:ocl_moments
2013-12-27 15:44:12 +04:00
Vadim Pisarevsky
e97dd57dc7
hopefully fixed test failures and complains from the doc builder
2013-12-26 22:00:29 +04:00
Andrey Pavlenko
4644a864a5
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
2013-12-26 20:37:34 +04:00
Ilya Lavrenov
b23edc34e9
added cv::calcBackProject for 2-dimensional histograms
2013-12-26 19:17:32 +04:00
Ilya Lavrenov
d64bea00b2
ported cv::calcBackProject to T-API
2013-12-26 14:58:50 +04:00
Vadim Pisarevsky
a760c454dd
tuned the speed for OpenCL-based moments (still slower than the single-thread SSE2 CPU code :( )
2013-12-26 13:25:00 +04:00
Konstantin Matskevich
f55c85fed3
morphology
2013-12-26 09:55:17 +04:00
Vadim Pisarevsky
83f749afd2
moments work now and work more or less fast
2013-12-26 02:57:08 +04:00
Vadim Pisarevsky
6035925f41
experimental moments implementation (does not work yet)
2013-12-25 21:09:23 +04:00
vbystricky
35dc26e0b9
Add ocl implementation of the sepFilter2D into img_proc module.
2013-12-25 16:48:32 +04:00
Alexander Karsakov
febe528363
Added ocl::pyrUp to T-API
2013-12-19 17:21:50 +04:00
Alexander Karsakov
ac230cd2ae
Added ocl::pyrDown to T-API
2013-12-19 13:56:42 +04:00
Andrey Pavlenko
6a0fb2c7da
Merge pull request #1992 from ElenaGvozdeva:ocl_medianFilter
2013-12-17 16:42:16 +04:00
Roman Donchenko
6d77cbee7e
Merge pull request #1934 from vbystricky:ocl_boxFilter
2013-12-17 14:11:51 +04:00
Elena Gvozdeva
125d67130b
Fixed medianFilter
2013-12-17 11:04:54 +04:00
Elena Gvozdeva
b2d8b491c0
Added ocl_medianFilter using Transparent API
2013-12-16 13:20:05 +04:00
Ilya Lavrenov
5c0dabf1ea
added cv::equalizeHist to T-API
2013-12-13 19:46:20 +04:00
Andrey Pavlenko
f3e2bfea79
Merge pull request #1970 from ilya-lavrenov:tapi_checks
2013-12-11 21:37:10 +04:00
Andrey Pavlenko
eeb16a5d01
Merge pull request #1971 from ilya-lavrenov:tapi_laplacian
2013-12-11 21:25:54 +04:00
Vladimir Bystricky
268d814d18
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
2013-12-11 16:57:47 +04:00
Andrey Pavlenko
129b715e3d
Merge pull request #1958 from vbystricky:ocl_filter2D
2013-12-11 16:41:12 +04:00
Vladimir Bystricky
f76bf8b425
Fix error in test
2013-12-11 14:33:22 +04:00
Vladimir Bystricky
e7227d3e4b
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
2013-12-11 14:26:33 +04:00
Ilya Lavrenov
8fa8b36b42
added cv::Laplacian, cv::Sobel, cv::Scharr, cv::GaussianBlur to T-API
2013-12-10 23:20:28 +04:00
Ilya Lavrenov
5566d31468
more strict checks outside ROI
2013-12-10 19:30:14 +04:00
Ilya Lavrenov
c9e6ed7a29
added cv::blendLinear
2013-12-10 13:07:52 +04:00
Ilya Lavrenov
93c6fe66ce
added cv::bilateralFilter to T-API
2013-12-09 16:03:25 +04:00
Vladimir Bystricky
8d8f5665f1
Fix build errors on Linux system
2013-12-09 11:31:55 +04:00
Vladimir Bystricky
29ba7730ed
Add ocl version of filter2D to the module img_proc
2013-12-09 10:45:23 +04:00
Ilya Lavrenov
3eaa8f149b
added cv::intergal to T-API
2013-12-06 13:18:25 +04:00
Vladimir Bystricky
968a898a1b
Add ocl version of boxFilter to the module img_proc
2013-12-05 11:47:17 +04:00
Ilya Lavrenov
e2b99a32b2
added cv::threshold to T-API
2013-12-04 13:45:44 +04:00
Ilya Lavrenov
474fc887a6
added cv::copyMakeBorder to T-API
2013-12-04 13:41:35 +04:00
Ilya Lavrenov
5b5f5878ce
added tests to imgproc
2013-12-04 13:41:34 +04:00
Andrey Pavlenko
f9190cc662
Merge pull request #1909 from alalek:ocl_tapi_perf
2013-12-04 11:35:11 +04:00
Ilya Lavrenov
803672feea
added cv::remap to T-API
2013-12-04 00:43:43 +04:00
Ilya Lavrenov
55af7857b9
added cv::warpPerspective to T-API
2013-12-04 00:43:42 +04:00
Alexander Alekhin
7d9150460a
core/ocl: added perf test infra + "Add" perf test
2013-12-03 18:43:50 +04:00
Roman Donchenko
b27d7d2a61
Merge pull request #1886 from ilya-lavrenov:tapi_lut
2013-12-02 12:28:18 +04:00
Ilya Lavrenov
09795e3265
added cv::resize INTER_AREA to T-API
2013-11-29 17:57:37 +04:00
Ilya Lavrenov
4eba74ee19
added cv::LUT to T-API
2013-11-28 12:31:04 +04:00
Ilya Lavrenov
d2e1318341
RGBA <-> mRGBA
2013-11-27 23:42:10 +04:00
Ilya Lavrenov
f771a0ba81
RGB[A] <-> HLS
2013-11-27 23:37:58 +04:00
Ilya Lavrenov
0b900b54e5
RGB[A] <-> HSV
2013-11-27 23:30:29 +04:00
Ilya Lavrenov
727a5e6df4
BGR5x5 <-> Gray
2013-11-27 22:19:44 +04:00
Ilya Lavrenov
8a23646897
RGB[A] <- RGB5x5
2013-11-27 20:00:35 +04:00
Ilya Lavrenov
81b9c9c104
RGB[A] -> RGB5x5
2013-11-27 19:52:42 +04:00
Ilya Lavrenov
af367c4f85
RGB[A] <-> BGR[A]
2013-11-27 19:44:37 +04:00
Ilya Lavrenov
ab9b883c69
RGB[A] <-> XYZ
2013-11-27 19:37:27 +04:00
Ilya Lavrenov
506c19616d
YCrCb -> RGB[A]
2013-11-27 19:24:27 +04:00
Andrey Pavlenko
41ae5d5f66
Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
2013-11-27 18:08:11 +04:00
Ilya Lavrenov
90d62cacc9
fixed cv::cvtColor
2013-11-27 16:43:31 +04:00
Ilya Lavrenov
6679aed61e
fixed ocl::resize (INTER_LINEAR) and added an accuracy test
2013-11-27 02:52:02 +04:00
Ilya Lavrenov
16a3067afc
cp test_colot.cpp to imgproc ocl tests
2013-11-25 19:19:17 +04:00
Vadim Pisarevsky
8762ee3f6f
removed unnecessary opencl kernels
2013-11-18 12:02:10 -05:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Alexander Alekhin
723af15228
ocl: fix warnings from GCC 4.8, update Haar
2013-10-11 18:42:17 +04:00
Roman Donchenko
685eceb68a
Merge pull request #1567 from ilya-lavrenov:warn_fix
2013-10-08 13:50:49 +04:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Roman Donchenko
cca2e5d8b1
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
2013-10-04 16:36:44 +04:00
Alexander Smorkalov
1aaeb52a4c
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:36:12 +04:00
Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:23:50 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Nghia Ho
61f5176bad
Removed trailing whitespace
2013-10-01 21:03:54 +10:00
Alexander Mordvintsev
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Nghia Ho
357e5d55f6
Removed trailing whitespaces
2013-09-26 19:14:59 +10:00
Ovidiu Parvu
e324446c70
Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly.
2013-09-19 16:22:30 +01:00
Nghia Ho
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10:00
Ovidiu Parvu
0117d77cd1
Added the tests for the minEnclosingTriangle function in the existing test_convhull.cpp file.
2013-09-15 22:25:58 +01:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Nghia Ho
0e06465a23
Merge remote-tracking branch 'upstream/master'
2013-09-09 23:23:12 +10:00
Roman Donchenko
4f109d1292
Fixed a memory access error in CV_Remap_Test::generate_test_data.
...
begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.
2013-09-06 16:02:41 +04:00
Roman Donchenko
2de8487e58
Fixed a few tests that use uninitialized inputs.
2013-09-06 15:53:42 +04:00
Roman Donchenko
254d4ae429
Boring changes - imgproc.
2013-09-05 18:26:43 +04:00
Nghia Ho
cc15898353
Merged with HEAD and removed C interface to rotatedRectangleIntersection
2013-09-04 20:45:10 +10:00
Roman Donchenko
757e7f842b
Merge pull request #1300 from kdrobnyh:FilterBilateral
2013-09-02 17:01:38 +04:00
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
2013-08-28 13:41:41 +04:00
Roman Donchenko
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
2013-08-28 11:44:41 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
kdrobnyh
c1de14c27a
Fix bilateralFilter function
2013-08-19 15:52:34 +04:00
Nghia Ho
723bc3cae9
Merge https://github.com/Itseez/opencv
2013-08-13 19:50:43 +10:00
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
2013-08-12 13:51:52 +04:00
StevenPuttemans
1a42dd905c
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
2013-08-12 10:04:15 +02:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
Nghia Ho
bc3dd2452f
Added test cpp
2013-07-31 23:59:23 +10:00
Daniel Angelov
6fa4834f31
Update on the class. Edited tests and samples.
2013-07-22 00:55:29 +03:00
Daniel Angelov
6f3d6ded47
Test case to strict, as overlapping lines (based on random places) may occur.
2013-07-21 10:39:24 +03:00
Daniel Angelov
965b3759b1
Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups.
2013-07-21 01:31:51 +03:00
Daniel Angelov
d35601209e
Added define guard for ln10. Fixed some warnings.
2013-07-14 14:29:56 +03:00
Daniel Angelov
22c8010b2d
Added needed header, changed macro name.
2013-07-14 12:56:22 +03:00
Daniel Angelov
3350533f48
Fixed ambiguouty error, signess compare.
2013-07-13 05:08:15 +03:00
Daniel Angelov
e51e00ac5f
Added LSD accuracy tests.
2013-07-13 04:09:28 +03:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Andrey Kamaev
969a7133a9
Implementation of cv::Matx and cv::Vec is almost moved to matx.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
5e7ab8baf3
Move cv::Scalar_ to types.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
7e50d3e571
Fixed MSVC warnings
2013-03-13 11:34:04 +04:00
Andrey Kamaev
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Daniil Osokin
d8f538d67b
Added tests for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
Vadim Pisarevsky
944588e732
converted houghlines to C++
2013-02-12 23:16:06 +04:00
Vadim Pisarevsky
05ea571b08
almost finished distance transform conversion (discrete voronoi diagram mode is not ready yet)
2013-02-12 18:56:22 +04:00
Vadim Pisarevsky
9124a76ae7
converted moments function to C++
2013-02-12 18:07:22 +04:00
Vadim Pisarevsky
06f4a56469
converted flood fill, getrectsubpix & cornersubpix to C++
2013-02-11 23:49:10 +04:00