Jiri Horner
3dbf392d48
fix build with intrinsics enabled
...
* since #10231 opencv with instrumentation does not build
2017-12-17 20:23:15 +01:00
Dmitry Kurtaev
2b43d4f477
Fix default pooling layer type
2017-12-17 16:46:40 +03:00
Alexander Alekhin
cac4a7e5b5
OpenCV version++
...
OpenCV 3.4.0-rc
2017-12-16 01:30:43 +03:00
Alexander Alekhin
3fddce67c6
experimental version++
2017-12-16 01:30:36 +03:00
Alexander Alekhin
a5c04baec1
Merge pull request #10326 from alalek:cmake_fixes
2017-12-15 22:26:00 +00:00
Alexander Alekhin
361bb1197f
cmake: fix opencv_world build with contrib
2017-12-15 21:36:22 +00:00
Alexander Alekhin
0b33eb0929
cmake: fix ocv_target_compile_definitions() for world builds
...
fixes CUDA build
2017-12-15 23:30:53 +03:00
Alexander Alekhin
8ed1a274e1
cmake: fix missed include in libtiff
2017-12-15 23:28:09 +03:00
Alexander Alekhin
70e1b4ddf0
Merge pull request #10319 from catree:move_SimulatedAnnealingSolver_Impl_cpp
...
Move SimulatedAnnealingSolver::Impl in cpp file
2017-12-15 23:06:48 +03:00
Rostislav Vasilikhin
bab86d65cb
Merge pull request #10258 from savuor:fix/kmeans_channels
...
* kmeans: number of channels in _centers fixed
* fixedType() is checked now
2017-12-15 21:48:48 +03:00
Alexander Alekhin
aef3019152
ml: fix SimulatedAnnealingSolver interface
2017-12-15 21:44:32 +03:00
Alexander Alekhin
28b19d6e3e
Merge pull request #10313 from alalek:rename_fix
...
Fix file names
2017-12-15 21:40:22 +03:00
Alexander Alekhin
e728ffd5bf
Merge pull request #10320 from mshabunin:static-analysis-1
2017-12-15 16:53:34 +00:00
Alexander Alekhin
4b1455579f
Merge pull request #10317 from alalek:cmake_pic_configure
2017-12-15 16:12:13 +00:00
Maksim Shabunin
1033f2b1bd
Fixed 3 issues found by static analysis
2017-12-15 17:29:26 +03:00
catree
0a439570a0
Move SimulatedAnnealingSolver::Impl in cpp file. Fix some typos.
2017-12-15 14:09:59 +01:00
Alexander Alekhin
50365b7741
cmake: update CMAKE_POSITION_INDEPENDENT_CODE
2017-12-15 15:56:19 +03:00
Vadim Pisarevsky
62359f70ff
Merge pull request #10306 from dkurt:faster_rcnn
2017-12-15 12:23:53 +00:00
Suleyman TURKMEN
c5ed507737
Merge pull request #10287 from sturkmen72:update_createsamples_cpp
...
* update createsamples
adds command-line option -rngseed
replaces rand() -> theRNG()
* Update utility.cpp
* apps(createsamples): fix warpPerspective pixels access bug
2017-12-15 15:05:18 +03:00
Alexander Alekhin
7d4a67f2a8
Merge pull request #10315 from alalek:issue_10147_debug
...
dnn: more debug information
2017-12-15 15:01:12 +03:00
Alexander Alekhin
d5f152494b
fix file names
2017-12-15 14:59:35 +03:00
Sayed Adel
1b8acd662f
core:ppc Fix several issues for VSX ( #10303 )
...
- fix conversion intrinsics compatibility with xlc
- implement odd-elements 2 to 4 conversion intrinsics
- improve implementation of universal intrinsic v_popcount
- rename FORCE_INLINE to VSX_FINLINE in vsx_utils.hpp
2017-12-15 14:03:46 +03:00
LaurentBerger
7ad308ea47
Simulated Annealing for ANN_MLP training method ( #10213 )
...
* Simulated Annealing for ANN_MLP training method
* EXPECT_LT
* just to test new data
* manage RNG
* Try again
* Just run buildbot with new data
* try to understand
* Test layer
* New data- new test
* Force RNG in backprop
* Use Impl to avoid virtual method
* reset all weights
* try to solve ABI
* retry
* ABI solved?
* till problem with dynamic_cast
* Something is wrong
* Solved?
* disable backprop test
* remove ANN_MLP_ANNEALImpl
* Disable weight in varmap
* Add example for SimulatedAnnealing
2017-12-15 13:57:39 +03:00
zhijackchen
6df8ac0342
Merge pull request #10283 from zhijackchen:exr_export
...
* Fix issue #10114
Convert table change
From:
CV_8U -> HALF
CV_8S -> HALF
CV_16U -> UINT
CV_16S -> UINT
CV_32S -> UINT
CV_32F -> FLOAT
To:
CV_8U -> HALF
CV_8S -> HALF
CV_16U -> UINT
CV_16S -> FLOAT
CV_32S -> FLOAT loss precision
CV_32F -> FLOAT
Signed integer can't be presented well with UINT. Even adjust bias, CV16S and CV32S will be confused when load from exr file.
Also fix CV_8S negative value incorrect bug
* EXR import and export
imread() from EXR returns CV_32F only
imwrite() accepts CV_32 cv::Mat only and stores FLOAT images by default. Add imwrite() flag to store in HALF format.
* fix compiling error
* clean up
* fix EXR import issues
2017-12-15 12:23:44 +03:00
Dmitry Kurtaev
08112f3821
Faster-RCNN models support
2017-12-15 12:16:21 +03:00
Alexander Alekhin
18ff806d5b
Merge pull request #10304 from catree:add_tutorial_homography
2017-12-15 08:53:35 +00:00
Alexander Alekhin
d0684ac139
Merge pull request #10309 from seiko2plus:issue10308
2017-12-15 08:43:10 +00:00
Sayed Adel
a8ae9cab08
3rdparty:libpng[1.6.34] Add missing support for PowerPC/VSX
2017-12-15 03:00:07 +00:00
Vadim Pisarevsky
84535a60f2
Merge pull request #10307 from savuor:fix/expect_softfloat
2017-12-14 21:00:46 +00:00
Tomoaki Teshima
ca1a0a1108
core: remove raw SSE2/NEON implementation from convert.cpp ( #9831 )
...
* remove raw SSE2/NEON implementation from convert.cpp
* remove raw implementation from Cvt_SIMD
* remove raw implementation from cvtScale_SIMD
* remove raw implementation from cvtScaleAbs_SIMD
* remove duplicated implementation cvt_<float, short>
* remove duplicated implementation cvtScale_<short, short, float>
* add "from double" version of Cvt_SIMD
* modify the condition of test ConvertScaleAbs
* Update convert.cpp
fixed crash in cvtScaleAbs(8s=>8u)
* fixed compile error on Win32
* fixed several test failures because of accuracy loss in cvtScale(int=>int)
* fixed NEON implementation of v_cvt_f64(int=>double) intrinsic
* another attempt to fix test failures
* keep trying to fix the test failures and just introduced compile warnings
* fixed one remaining test (subtractScalar)
2017-12-15 00:00:35 +03:00
Rostislav Vasilikhin
7d18f49a49
SoftFloat tests: assert => expect
2017-12-14 21:03:25 +03:00
Alexander Alekhin
0da947e6b3
dnn: more debug information
2017-12-14 19:21:17 +03:00
Alexander Alekhin
6cedc82799
Merge pull request #10274 from alalek:update_3rdparty
2017-12-14 15:10:32 +00:00
catree
b417fb0939
Add tutorial and codes for the homography tutorial.
2017-12-14 15:40:10 +01:00
Alexander Alekhin
cd4176104d
3rdparty: update libwebp 0.6.1
2017-12-14 14:49:31 +03:00
Alexander Alekhin
5c709f4aaa
3rdparty: update libtiff 4.0.9
2017-12-14 14:49:31 +03:00
Alexander Alekhin
ae5e1f8ece
3rdparty: eliminate jasper build warning
2017-12-14 14:49:31 +03:00
Alexander Alekhin
a9de6900e5
cmake(3rdparty): BUILD_ options before WITH_ options
2017-12-14 14:49:31 +03:00
Suleyman TURKMEN
83b5b86f7d
3rdparty: update libjpeg 9b
2017-12-14 14:49:31 +03:00
Alexander Alekhin
ca46171246
3rdparty: libpng patch
2017-12-14 14:49:31 +03:00
Suleyman TURKMEN
d4e2e6279c
3rdparty: update libpng 1.6.34
2017-12-14 14:49:30 +03:00
Suleyman TURKMEN
197078e331
3rdparty: update zlib 1.2.11
2017-12-14 14:49:30 +03:00
Vadim Pisarevsky
d0d2faf551
Merge pull request #10294 from alalek:fix_copyToMask_dst_initialization
2017-12-14 11:05:09 +00:00
Vadim Pisarevsky
a4b5eabccf
Merge pull request #10299 from alalek:cmake_imported_configuration_remap
2017-12-14 11:01:02 +00:00
Vadim Pisarevsky
7b701fee60
Merge pull request #10302 from alalek:issue_10254
2017-12-13 17:31:40 +00:00
Vadim Pisarevsky
99183e98d3
Merge pull request #10293 from alalek:fix_persistence_with_deprecated_traits
2017-12-13 17:30:23 +00:00
Alexander Alekhin
c231472ad6
Merge pull request #10290 from tomoaki0705:fixVS2012Round
2017-12-13 15:30:21 +00:00
Alexander Alekhin
9930076dc5
core(test): avoid filename duplicates in tests
2017-12-13 18:21:55 +03:00
Tomoaki Teshima
ecb6bcf2e0
fix build error on Visual Studio 2012
...
* round doesn't exists in standard library of Visual Studio 2012
* apply the correct computation of ROI
2017-12-13 17:40:07 +03:00
Alexander Alekhin
74f1295756
Merge pull request #10295 from alalek:cmake_workaround_download_log_issue
2017-12-13 13:52:31 +00:00