shimat
5bf7f09ac1
Merge pull request #11035 from shimat:refactoring_decolor
...
Refactor decolor (#11035 )
* decolor: modernize deprecated headers (math.h -> cmath)
* refactor contrast_preserve.cpp
* refactor contrast_preserve.hpp (add static/const)
* refactor contrast_preserve.hpp (join assignment and declaration)
* refactor contrast_preserve.hpp (format)
* refactor test_decolor.cpp (indent)
* refactor contrast_preserve.hpp (const)
* contrast_preserve.hpp : optimize by minMaxLoc
* fix trailing-whitespace
* fix warning C4267 on VC++ x64
(conversion from 'size_t' to 'int', possible loss of data)
* use cvRound instead of round_num
* decrease indentation of test_decolor.cpp
* remove pow() to optimize
* remove redundant Mat initialization
2018-03-12 17:22:06 +03:00
Alexander Alekhin
2244f1722c
Merge pull request #11052 from adamrankin:patch-1
2018-03-12 14:06:35 +00:00
Adam Rankin
d810c73396
Update precomp.hpp
...
Enabling build of visualization module when using VTK 9 (current HEAD of d5bbb9e99bbc6d11d2196c48bfd8f33508554551)
2018-03-11 22:28:18 -04:00
Alexander Alekhin
5b868ccd82
Merge pull request #10992 from dkurt:dnn_opencl_tests
2018-03-09 10:06:40 +00:00
Alexander Alekhin
687394fa07
Merge pull request #11030 from jchazalon:patch-1
2018-03-08 17:54:14 +00:00
Alexander Alekhin
5b6ee79cd6
Merge pull request #11033 from adamrankin:patch-1
2018-03-08 17:49:10 +00:00
Alexander Alekhin
8bb787cdf8
Merge pull request #11027 from tomoaki0705:fixImgprocPerfFailureVS2013
2018-03-08 14:28:14 +00:00
Adam Rankin
f8061ba3c8
Enabling build of stitching when CUDA is available
...
Without proposed change, module throws build error regarding missing `opencv2/cudaimgproc.hpp`
2018-03-07 20:07:48 -05:00
jchazalon
bf5f7380cf
Update OpenCVDownload.cmake to fix log crash
...
This suppresses the interpretation of string literals by switching the ocv_download_log from a macro to a function.
This avoid crashes when the string to log contains escape characters.
More details about the problem this PR fixes are available at: https://github.com/opencv/opencv_contrib/issues/1131
2018-03-07 15:35:37 +01:00
Dmitry Kurtaev
0f01b40dd5
Reset OpenCL kernels if batch size changes
2018-03-07 17:06:59 +03:00
Alexander Alekhin
8edc2e5aaf
Merge pull request #10928 from Mehanik:fix_timeout
2018-03-07 12:34:09 +00:00
shimat
21d9c47bd0
Optimize decolor in photo ( #10997 )
...
* optimized cv::decolor by removing vector.push_back
* restored CV_INSTRUMENT_REGION() and original indent
* fix build warnings in contrast_preserve.hpp
* undo refactoring contrast_preserve.cpp/hpp
2018-03-07 14:20:45 +03:00
Eugene Mikhantiev
c790299906
Fix return code in case of timeout
2018-03-07 17:26:34 +07:00
Alexander Alekhin
514f4193db
Merge pull request #10959 from alalek:cmake_ocl4dnn
2018-03-07 10:26:14 +00:00
Dmitry Kurtaev
0a61ebdd66
Replace DNNTarget and DNNBackend in tests
2018-03-07 12:59:38 +03:00
Tomoaki Teshima
640d77be25
let the performance tests of WarpPerspective pass
...
* avoid misuse of vzeroupper on Visual Studio 2013 Update 5
* add ifdef to avoid unattended optimization
2018-03-07 18:55:27 +09:00
Maksim Shabunin
49dd0305f2
Merge pull request #10946 from mshabunin:add-license-install
2018-03-07 07:15:50 +00:00
Alexander Alekhin
1393fd9e8e
Merge pull request #10989 from tomoaki0705:fixOldGstreamerTest
2018-03-06 16:26:08 +00:00
Alexander Alekhin
3202062e77
Merge pull request #11005 from tomoaki0705:fixOclTestFailureVS2012
2018-03-06 15:49:08 +00:00
Maksim Shabunin
7bbe002a2f
Add install component for 3rdparty libraries licenses
2018-03-06 16:32:30 +03:00
Maksim Shabunin
09f0ecdf7a
Merge pull request #10999 from mshabunin:do-more-samples
2018-03-06 13:31:34 +00:00
Maksim Shabunin
1ae02c0cc4
Minor refactoring in several C++ samples:
...
- bgfg_segm
- peopledetect
- opencv_version
- dnn/colorization
- tapi/opencl_custom_kernel
- tapi/dense_optical_flow (renamed tvl1_optical_flow)
2018-03-06 14:23:20 +03:00
Tomoaki Teshima
9079d9ce17
let the test OCL_Filter/Bilateral pass
...
* avoid aggressive optimization on Visual Studio 2012 Update 5
* add code branch to avoid unattended optimization (keep the old code)
2018-03-06 19:48:04 +09:00
native-api
dc1d9ae973
Include error code description into the message ( #10982 )
2018-03-06 09:58:19 +03:00
Namgoo Lee
c219f97f48
SSE2 : use _mm_cvtpd_epi32 when converting from CV_64F to CV_32S ( #10987 )
...
* SSE2 : use _mm_cvtpd_epi32 when converting from CV_64F to CV_32S
* No need to define a new universal intrinsic
2018-03-06 09:50:53 +03:00
Dmitry Kurtaev
e1c3237532
Parametric OpenCL deep learning tests
2018-03-05 20:53:18 +03:00
Alexander Alekhin
ee180d5b41
Merge pull request #10980 from sturkmen72:update_doc
2018-03-05 15:41:05 +00:00
Tomoaki Teshima
a9f3a7de39
add workaround of old gstreamer
2018-03-05 19:27:49 +09:00
Suleyman TURKMEN
5e1a656bbb
Update core.hpp
2018-03-04 23:02:47 +03:00
cDc
667f5b655a
Merge pull request #10933 from cdcseacave:clean_npr
...
* clean npr functions of useless initializations (speed-up)
* photo: remove unnecessary code
2018-03-02 14:42:28 +03:00
Alexander Alekhin
0d2cee45e8
Merge pull request #10971 from alalek:ocl_error_code_string
2018-03-02 11:41:01 +00:00
Alexander Alekhin
d1cecb0f0f
Merge pull request #10968 from sergiomb2:master
2018-03-02 11:39:54 +00:00
Alexander Alekhin
f2ec7eeb37
Merge pull request #10966 from alalek:verbose_features2d_test
2018-03-02 11:39:14 +00:00
Alexander Alekhin
e869bb6b05
Merge pull request #10964 from alalek:fix_10956
2018-03-02 11:38:52 +00:00
Alexander Alekhin
fe97dc67dc
Merge pull request #10962 from alalek:dnn_precomp_hpp
2018-03-02 11:38:16 +00:00
Alexander Alekhin
560ca8c5aa
Merge pull request #10961 from alalek:fix_clang_avx512
2018-03-02 11:36:57 +00:00
Alexander Alekhin
d59a520c9a
Merge pull request #10960 from alalek:fix_protobuf_readme
2018-03-02 11:36:39 +00:00
Alexander Alekhin
97c1f09961
Merge pull request #10955 from pengli:dnn
2018-03-02 11:35:59 +00:00
Alexander Alekhin
ec0bb66e5e
Merge pull request #10954 from whizzzkid:master
2018-03-02 11:35:41 +00:00
Alexander Alekhin
fda7bb95d0
Merge pull request #10938 from mshabunin:fix-static-issues-9
2018-03-02 11:34:53 +00:00
Alexander Alekhin
546f1d9f15
Merge pull request #10936 from mshabunin:fix-mingw-avx512
2018-03-02 11:34:00 +00:00
Alexander Alekhin
90ff900387
Merge pull request #10926 from tomoaki0705:fixTinkerBoardOpenCL
2018-03-02 11:32:51 +00:00
Alexander Alekhin
b1fc7d46a5
ocl: update getOpenCLErrorString() code
2018-03-01 13:52:43 +03:00
Alexander Alekhin
a9ebc61f2a
dnn(workaround): switch to CPU target if compiled without OpenCL
2018-03-01 12:12:40 +03:00
Alexander Alekhin
1b83bc48a1
dnn: make OpenCL DNN code optional
2018-03-01 12:12:40 +03:00
whizzzkid
5c66ce7f29
cuda: fixes gpu samples build (issue 10953)
2018-02-28 13:22:58 -07:00
Alexander Alekhin
da6dc6774b
features2d: add verbose messages into tests
...
To investigate sporadic failures of Features2d_FLANN_Auto.regression test.
2018-02-28 19:47:16 +00:00
Sérgio M. Basto
20f5fa8e3e
Fix build with VA
...
This commit readd ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES}
that was missed in commit 2200e13c71
diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt
- ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
+ ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
2018-02-28 19:26:54 +00:00
Alexander Alekhin
76c40e8f0d
java: fix copy_java_files() in gen_java.py
...
- missing 'module'
- fixed '\r\n' EOL handling (blocked by '$' regex)
2018-02-28 17:58:31 +03:00
Alexander Alekhin
a838a97092
dnn: fix precomp.hpp usage
2018-02-28 17:06:26 +03:00