platform/upstream/opencv.git
6 years agocore: replace raw intrinsics with universal intrinsics in copy.cpp
Sayed Adel [Sat, 23 Dec 2017 06:59:24 +0000 (08:59 +0200)]
core: replace raw intrinsics with universal intrinsics in copy.cpp

- use universal intrinsic instead of raw intrinsic
- add performance check for Mat::copyTo/setTo with mask

6 years agoMerge pull request #10374 from tomoaki0705:removeGstreamerTest
Alexander Alekhin [Thu, 21 Dec 2017 19:02:13 +0000 (19:02 +0000)]
Merge pull request #10374 from tomoaki0705:removeGstreamerTest

6 years agoMerge pull request #10316 from terfendail:bitexact_c234
Vadim Pisarevsky [Thu, 21 Dec 2017 18:56:53 +0000 (18:56 +0000)]
Merge pull request #10316 from terfendail:bitexact_c234

6 years agoMerge pull request #10369 from alalek:issue_10351
Vadim Pisarevsky [Thu, 21 Dec 2017 18:48:38 +0000 (18:48 +0000)]
Merge pull request #10369 from alalek:issue_10351

6 years agoMerge pull request #10370 from pengli:dnn
Alexander Alekhin [Thu, 21 Dec 2017 15:36:23 +0000 (15:36 +0000)]
Merge pull request #10370 from pengli:dnn

6 years agoavoid the test which is too strict
Tomoaki Teshima [Thu, 21 Dec 2017 15:14:10 +0000 (00:14 +0900)]
avoid the test which is too strict
  * confirmed test failure on Jetson TX1 and TX2
  * show the performance but not bit exact result

6 years agocleanup unnecessary macros in convolution ocl kernel
Li Peng [Thu, 21 Dec 2017 14:01:44 +0000 (22:01 +0800)]
cleanup unnecessary macros in convolution ocl kernel

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agorefactor candidate generation of convolution auto-tuning
Li Peng [Tue, 19 Dec 2017 14:28:18 +0000 (22:28 +0800)]
refactor candidate generation of convolution auto-tuning

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoMerge pull request #10366 from alalek:ocl_fix_cvtcolor_read
Vadim Pisarevsky [Thu, 21 Dec 2017 08:33:58 +0000 (08:33 +0000)]
Merge pull request #10366 from alalek:ocl_fix_cvtcolor_read

6 years agoMerge pull request #10340 from alalek:log_level_option
Vadim Pisarevsky [Thu, 21 Dec 2017 08:33:18 +0000 (08:33 +0000)]
Merge pull request #10340 from alalek:log_level_option

6 years agoimgcodecs(pxm): fix memcpy size
Alexander Alekhin [Thu, 21 Dec 2017 01:10:24 +0000 (01:10 +0000)]
imgcodecs(pxm): fix memcpy size

6 years agoMerge pull request #10331 from arrybn:python_dnn_net
Vadim Pisarevsky [Wed, 20 Dec 2017 14:30:26 +0000 (14:30 +0000)]
Merge pull request #10331 from arrybn:python_dnn_net

6 years agoMerge pull request #10354 from catree:add_python_sample_show_extrinsics
Vadim Pisarevsky [Wed, 20 Dec 2017 14:23:01 +0000 (14:23 +0000)]
Merge pull request #10354 from catree:add_python_sample_show_extrinsics

6 years agoCalcerror uses now weighted samples (#10346)
LaurentBerger [Wed, 20 Dec 2017 14:24:46 +0000 (15:24 +0100)]
Calcerror uses now weighted samples (#10346)

* Calcerror uses now sample weights

* catree comment in #10319

6 years agoimgproc(ocl): fix RGB2RGBA kernel out of range access
Alexander Alekhin [Wed, 20 Dec 2017 14:19:46 +0000 (14:19 +0000)]
imgproc(ocl): fix RGB2RGBA kernel out of range access

6 years agoMerge pull request #10356 from dkurt:dnn_rfcn
Vadim Pisarevsky [Wed, 20 Dec 2017 14:19:46 +0000 (14:19 +0000)]
Merge pull request #10356 from dkurt:dnn_rfcn

6 years agoMerge pull request #10360 from sturkmen72:update_links
Vadim Pisarevsky [Wed, 20 Dec 2017 14:19:17 +0000 (14:19 +0000)]
Merge pull request #10360 from sturkmen72:update_links

6 years agoMerge pull request #10358 from catree:add_tutorial_homography_panorama_stitching
Vadim Pisarevsky [Wed, 20 Dec 2017 14:18:41 +0000 (14:18 +0000)]
Merge pull request #10358 from catree:add_tutorial_homography_panorama_stitching

6 years agoAdded universal intrinsics based implementations for CV_8UC2, CV_8UC3, CV_8UC4 bit...
Vitaly Tuzov [Thu, 7 Dec 2017 17:27:58 +0000 (20:27 +0300)]
Added universal intrinsics based implementations for CV_8UC2, CV_8UC3, CV_8UC4 bit-exact resizes.

6 years agoUpdate left_intrinsics.yml file with chessboard square_size=0.025 and with extrinsic...
catree [Tue, 19 Dec 2017 16:03:00 +0000 (17:03 +0100)]
Update left_intrinsics.yml file with chessboard square_size=0.025 and with extrinsic parameters. Add camera_calibration_show_extrinsics.py, a Python sample that allows to display the extrinsics saved during the camera calibration process (cpp-example-calibration).

6 years agoR-FCN models support
Dmitry Kurtaev [Tue, 19 Dec 2017 16:43:49 +0000 (19:43 +0300)]
R-FCN models support

6 years agoUpdate links
Suleyman TURKMEN [Tue, 19 Dec 2017 23:25:16 +0000 (02:25 +0300)]
Update links

6 years agocore(logger): add log level configuration option
Alexander Alekhin [Sun, 17 Dec 2017 22:28:33 +0000 (22:28 +0000)]
core(logger): add log level configuration option

6 years agoAdd Demo 5: Basic panorama stitching from a rotating camera in the homography tutorial.
catree [Tue, 19 Dec 2017 21:45:35 +0000 (22:45 +0100)]
Add Demo 5: Basic panorama stitching from a rotating camera in the homography tutorial.

6 years agoMerge pull request #10341 from pengli:dnn
Alexander Alekhin [Tue, 19 Dec 2017 14:04:55 +0000 (14:04 +0000)]
Merge pull request #10341 from pengli:dnn

6 years agoMerge pull request #10348 from ElenaGvozdeva:Canny_HAL
Alexander Alekhin [Tue, 19 Dec 2017 13:07:59 +0000 (13:07 +0000)]
Merge pull request #10348 from ElenaGvozdeva:Canny_HAL

6 years agoMerge pull request #10347 from dkurt:dnn_remove_deprecated_importer
Vadim Pisarevsky [Tue, 19 Dec 2017 11:03:06 +0000 (11:03 +0000)]
Merge pull request #10347 from dkurt:dnn_remove_deprecated_importer

6 years agoadd ocl accuracy test for tf mobilenet ssd
Li Peng [Tue, 19 Dec 2017 08:59:46 +0000 (16:59 +0800)]
add ocl accuracy test for tf mobilenet ssd

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoadd depthwise convolution kernel
Li Peng [Tue, 19 Dec 2017 09:59:13 +0000 (17:59 +0800)]
add depthwise convolution kernel

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoprior box layer ocl implementation
Li Peng [Tue, 5 Dec 2017 15:17:34 +0000 (23:17 +0800)]
prior box layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoHAL for canny
elenagvo [Thu, 30 Nov 2017 13:56:13 +0000 (16:56 +0300)]
HAL for canny

6 years agoMerge pull request #10344 from tomoaki0705:fixBuildLibtiff
Alexander Alekhin [Mon, 18 Dec 2017 17:00:45 +0000 (17:00 +0000)]
Merge pull request #10344 from tomoaki0705:fixBuildLibtiff

6 years agoRemove cv::dnn::Importer
Dmitry Kurtaev [Mon, 18 Dec 2017 14:22:57 +0000 (17:22 +0300)]
Remove cv::dnn::Importer

6 years agoChanged wrapping mode for cv::dnn::Net::forward
Alexander Rybnikov [Sat, 16 Dec 2017 09:21:12 +0000 (12:21 +0300)]
Changed wrapping mode for cv::dnn::Net::forward

6 years agofix compilation error on Visual Studio 2013 and earlier
Tomoaki Teshima [Mon, 18 Dec 2017 12:51:33 +0000 (21:51 +0900)]
fix compilation error on Visual Studio 2013 and earlier
  - fix compilation error about "inline"
  - fix linker error about "_TIFF_snprintf_f"

6 years agoMerge pull request #10343 from tomoaki0705:suppressWarningEncoding
Vadim Pisarevsky [Mon, 18 Dec 2017 10:53:24 +0000 (10:53 +0000)]
Merge pull request #10343 from tomoaki0705:suppressWarningEncoding

6 years agoUpdate samples (#10333)
Suleyman TURKMEN [Mon, 18 Dec 2017 10:44:11 +0000 (12:44 +0200)]
Update samples (#10333)

* Update samples

* Update calib3d.hpp

* Update calib3d.hpp

* Update calib3d.hpp

* Update calib3d.hpp

6 years agoMerge pull request #10339 from catree:add_doc_solvepnp_figure_desc
Vadim Pisarevsky [Mon, 18 Dec 2017 09:13:06 +0000 (09:13 +0000)]
Merge pull request #10339 from catree:add_doc_solvepnp_figure_desc

6 years agoMerge pull request #10337 from dkurt:fix_pooling_layer
Vadim Pisarevsky [Mon, 18 Dec 2017 09:11:54 +0000 (09:11 +0000)]
Merge pull request #10337 from dkurt:fix_pooling_layer

6 years agoMerge pull request #10338 from hrnr:fix-build
Alexander Alekhin [Mon, 18 Dec 2017 06:52:08 +0000 (06:52 +0000)]
Merge pull request #10338 from hrnr:fix-build

6 years agosuppress warning on Visual Studio
Tomoaki Teshima [Mon, 18 Dec 2017 06:32:06 +0000 (15:32 +0900)]
suppress warning on Visual Studio
  * remove non ASCII character from the comment

6 years agoAdd a figure and some formulas to illustrate the PnP pose estimation principle.
catree [Sun, 17 Dec 2017 20:38:22 +0000 (21:38 +0100)]
Add a figure and some formulas to illustrate the PnP pose estimation principle.

6 years agofix build with intrinsics enabled
Jiri Horner [Sun, 17 Dec 2017 19:23:15 +0000 (20:23 +0100)]
fix build with intrinsics enabled

* since #10231 opencv with instrumentation does not build

6 years agoFix default pooling layer type
Dmitry Kurtaev [Sun, 17 Dec 2017 11:36:38 +0000 (14:36 +0300)]
Fix default pooling layer type

6 years agoOpenCV version++
Alexander Alekhin [Fri, 15 Dec 2017 22:30:43 +0000 (01:30 +0300)]
OpenCV version++

OpenCV 3.4.0-rc

6 years agoexperimental version++
Alexander Alekhin [Fri, 15 Dec 2017 11:05:57 +0000 (14:05 +0300)]
experimental version++

6 years agoMerge pull request #10326 from alalek:cmake_fixes
Alexander Alekhin [Fri, 15 Dec 2017 22:26:00 +0000 (22:26 +0000)]
Merge pull request #10326 from alalek:cmake_fixes

6 years agocmake: fix opencv_world build with contrib
Alexander Alekhin [Fri, 15 Dec 2017 21:36:22 +0000 (21:36 +0000)]
cmake: fix opencv_world build with contrib

6 years agocmake: fix ocv_target_compile_definitions() for world builds
Alexander Alekhin [Fri, 15 Dec 2017 19:21:51 +0000 (22:21 +0300)]
cmake: fix ocv_target_compile_definitions() for world builds

fixes CUDA build

6 years agocmake: fix missed include in libtiff
Alexander Alekhin [Fri, 15 Dec 2017 20:28:09 +0000 (23:28 +0300)]
cmake: fix missed include in libtiff

6 years agoMerge pull request #10319 from catree:move_SimulatedAnnealingSolver_Impl_cpp
Alexander Alekhin [Fri, 15 Dec 2017 20:06:48 +0000 (23:06 +0300)]
Merge pull request #10319 from catree:move_SimulatedAnnealingSolver_Impl_cpp

Move SimulatedAnnealingSolver::Impl in cpp file

6 years agoMerge pull request #10258 from savuor:fix/kmeans_channels
Rostislav Vasilikhin [Fri, 15 Dec 2017 18:48:48 +0000 (21:48 +0300)]
Merge pull request #10258 from savuor:fix/kmeans_channels

* kmeans: number of channels in _centers fixed

* fixedType() is checked now

6 years agoml: fix SimulatedAnnealingSolver interface
Alexander Alekhin [Fri, 15 Dec 2017 14:40:08 +0000 (17:40 +0300)]
ml: fix SimulatedAnnealingSolver interface

6 years agoMerge pull request #10313 from alalek:rename_fix
Alexander Alekhin [Fri, 15 Dec 2017 18:40:22 +0000 (21:40 +0300)]
Merge pull request #10313 from alalek:rename_fix

Fix file names

6 years agoMerge pull request #10320 from mshabunin:static-analysis-1
Alexander Alekhin [Fri, 15 Dec 2017 16:53:34 +0000 (16:53 +0000)]
Merge pull request #10320 from mshabunin:static-analysis-1

6 years agoMerge pull request #10317 from alalek:cmake_pic_configure
Alexander Alekhin [Fri, 15 Dec 2017 16:12:12 +0000 (16:12 +0000)]
Merge pull request #10317 from alalek:cmake_pic_configure

6 years agoFixed 3 issues found by static analysis
Maksim Shabunin [Fri, 15 Dec 2017 14:28:38 +0000 (17:28 +0300)]
Fixed 3 issues found by static analysis

6 years agoMove SimulatedAnnealingSolver::Impl in cpp file. Fix some typos.
catree [Fri, 15 Dec 2017 13:09:59 +0000 (14:09 +0100)]
Move SimulatedAnnealingSolver::Impl in cpp file. Fix some typos.

6 years agocmake: update CMAKE_POSITION_INDEPENDENT_CODE
Alexander Alekhin [Fri, 15 Dec 2017 12:27:06 +0000 (15:27 +0300)]
cmake: update CMAKE_POSITION_INDEPENDENT_CODE

6 years agoMerge pull request #10306 from dkurt:faster_rcnn
Vadim Pisarevsky [Fri, 15 Dec 2017 12:23:53 +0000 (12:23 +0000)]
Merge pull request #10306 from dkurt:faster_rcnn

6 years agoMerge pull request #10287 from sturkmen72:update_createsamples_cpp
Suleyman TURKMEN [Fri, 15 Dec 2017 12:05:18 +0000 (14:05 +0200)]
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

6 years agoMerge pull request #10315 from alalek:issue_10147_debug
Alexander Alekhin [Fri, 15 Dec 2017 12:01:12 +0000 (15:01 +0300)]
Merge pull request #10315 from alalek:issue_10147_debug

dnn: more debug information

6 years agofix file names
Alexander Alekhin [Fri, 15 Dec 2017 11:18:59 +0000 (14:18 +0300)]
fix file names

6 years agocore:ppc Fix several issues for VSX (#10303)
Sayed Adel [Fri, 15 Dec 2017 11:03:46 +0000 (13:03 +0200)]
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

6 years agoSimulated Annealing for ANN_MLP training method (#10213)
LaurentBerger [Fri, 15 Dec 2017 10:57:39 +0000 (11:57 +0100)]
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

6 years agoMerge pull request #10283 from zhijackchen:exr_export
zhijackchen [Fri, 15 Dec 2017 09:23:44 +0000 (01:23 -0800)]
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

6 years agoFaster-RCNN models support
Dmitry Kurtaev [Wed, 13 Dec 2017 16:06:30 +0000 (19:06 +0300)]
Faster-RCNN models support

6 years agoMerge pull request #10304 from catree:add_tutorial_homography
Alexander Alekhin [Fri, 15 Dec 2017 08:53:34 +0000 (08:53 +0000)]
Merge pull request #10304 from catree:add_tutorial_homography

6 years agoMerge pull request #10309 from seiko2plus:issue10308
Alexander Alekhin [Fri, 15 Dec 2017 08:43:10 +0000 (08:43 +0000)]
Merge pull request #10309 from seiko2plus:issue10308

6 years ago3rdparty:libpng[1.6.34] Add missing support for PowerPC/VSX
Sayed Adel [Fri, 15 Dec 2017 02:47:52 +0000 (02:47 +0000)]
3rdparty:libpng[1.6.34] Add missing support for PowerPC/VSX

6 years agoMerge pull request #10307 from savuor:fix/expect_softfloat
Vadim Pisarevsky [Thu, 14 Dec 2017 21:00:46 +0000 (21:00 +0000)]
Merge pull request #10307 from savuor:fix/expect_softfloat

6 years agocore: remove raw SSE2/NEON implementation from convert.cpp (#9831)
Tomoaki Teshima [Thu, 14 Dec 2017 21:00:35 +0000 (06:00 +0900)]
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)

6 years agoSoftFloat tests: assert => expect
Rostislav Vasilikhin [Thu, 14 Dec 2017 18:03:25 +0000 (21:03 +0300)]
SoftFloat tests: assert => expect

6 years agodnn: more debug information
Alexander Alekhin [Thu, 14 Dec 2017 16:20:30 +0000 (19:20 +0300)]
dnn: more debug information

6 years agoMerge pull request #10274 from alalek:update_3rdparty
Alexander Alekhin [Thu, 14 Dec 2017 15:10:31 +0000 (15:10 +0000)]
Merge pull request #10274 from alalek:update_3rdparty

6 years agoAdd tutorial and codes for the homography tutorial.
catree [Wed, 13 Dec 2017 20:41:40 +0000 (21:41 +0100)]
Add tutorial and codes for the homography tutorial.

6 years ago3rdparty: update libwebp 0.6.1
Alexander Alekhin [Fri, 8 Dec 2017 15:19:30 +0000 (18:19 +0300)]
3rdparty: update libwebp 0.6.1

6 years ago3rdparty: update libtiff 4.0.9
Alexander Alekhin [Fri, 8 Dec 2017 12:47:54 +0000 (15:47 +0300)]
3rdparty: update libtiff 4.0.9

6 years ago3rdparty: eliminate jasper build warning
Alexander Alekhin [Fri, 8 Dec 2017 15:47:47 +0000 (18:47 +0300)]
3rdparty: eliminate jasper build warning

6 years agocmake(3rdparty): BUILD_ options before WITH_ options
Alexander Alekhin [Thu, 7 Dec 2017 15:30:33 +0000 (18:30 +0300)]
cmake(3rdparty): BUILD_ options before WITH_ options

6 years ago3rdparty: update libjpeg 9b
Suleyman TURKMEN [Sun, 22 Oct 2017 10:06:42 +0000 (13:06 +0300)]
3rdparty: update libjpeg 9b

6 years ago3rdparty: libpng patch
Alexander Alekhin [Thu, 7 Dec 2017 16:16:11 +0000 (19:16 +0300)]
3rdparty: libpng patch

6 years ago3rdparty: update libpng 1.6.34
Suleyman TURKMEN [Thu, 5 Oct 2017 17:36:38 +0000 (20:36 +0300)]
3rdparty: update libpng 1.6.34

6 years ago3rdparty: update zlib 1.2.11
Suleyman TURKMEN [Thu, 5 Oct 2017 16:54:13 +0000 (19:54 +0300)]
3rdparty: update zlib 1.2.11

6 years agoMerge pull request #10294 from alalek:fix_copyToMask_dst_initialization
Vadim Pisarevsky [Thu, 14 Dec 2017 11:05:09 +0000 (11:05 +0000)]
Merge pull request #10294 from alalek:fix_copyToMask_dst_initialization

6 years agoMerge pull request #10299 from alalek:cmake_imported_configuration_remap
Vadim Pisarevsky [Thu, 14 Dec 2017 11:01:02 +0000 (11:01 +0000)]
Merge pull request #10299 from alalek:cmake_imported_configuration_remap

6 years agoMerge pull request #10302 from alalek:issue_10254
Vadim Pisarevsky [Wed, 13 Dec 2017 17:31:40 +0000 (17:31 +0000)]
Merge pull request #10302 from alalek:issue_10254

6 years agoMerge pull request #10293 from alalek:fix_persistence_with_deprecated_traits
Vadim Pisarevsky [Wed, 13 Dec 2017 17:30:23 +0000 (17:30 +0000)]
Merge pull request #10293 from alalek:fix_persistence_with_deprecated_traits

6 years agoMerge pull request #10290 from tomoaki0705:fixVS2012Round
Alexander Alekhin [Wed, 13 Dec 2017 15:30:21 +0000 (15:30 +0000)]
Merge pull request #10290 from tomoaki0705:fixVS2012Round

6 years agocore(test): avoid filename duplicates in tests
Alexander Alekhin [Wed, 13 Dec 2017 15:21:55 +0000 (18:21 +0300)]
core(test): avoid filename duplicates in tests

6 years agofix build error on Visual Studio 2012
Tomoaki Teshima [Tue, 12 Dec 2017 12:27:46 +0000 (21:27 +0900)]
fix build error on Visual Studio 2012
  * round doesn't exists in standard library of Visual Studio 2012
  * apply the correct computation of ROI

6 years agoMerge pull request #10295 from alalek:cmake_workaround_download_log_issue
Alexander Alekhin [Wed, 13 Dec 2017 13:52:31 +0000 (13:52 +0000)]
Merge pull request #10295 from alalek:cmake_workaround_download_log_issue

6 years agoMerge pull request #10300 from alalek:cmake_timestamp_update
Alexander Alekhin [Wed, 13 Dec 2017 13:51:09 +0000 (13:51 +0000)]
Merge pull request #10300 from alalek:cmake_timestamp_update

6 years agoMerge pull request #10282 from alalek:cmake_tbb_version
Alexander Alekhin [Wed, 13 Dec 2017 13:50:24 +0000 (13:50 +0000)]
Merge pull request #10282 from alalek:cmake_tbb_version

6 years agocmake: update timestamp status
Alexander Alekhin [Wed, 13 Dec 2017 12:16:03 +0000 (15:16 +0300)]
cmake: update timestamp status

- avoid unnecessary rebuilding of OpenCV libraries
- use timestamp of the first launch of CMake
- to return to previous behavior use `-UOPENCV_TIMESTAMP` CMake option

6 years agoImplementation of bit-exact resize. Internal calls to linear resize updated to use...
Vitaly Tuzov [Wed, 13 Dec 2017 12:00:38 +0000 (15:00 +0300)]
Implementation of bit-exact resize. Internal calls to linear resize updated to use bit-exact version. (#9468)

6 years agocmake: rework MAP_IMPORTED_CONFIG to prevent unintended build failures
Alexander Alekhin [Wed, 13 Dec 2017 11:14:28 +0000 (14:14 +0300)]
cmake: rework MAP_IMPORTED_CONFIG to prevent unintended build failures

Introduce CMake variable OPENCV_MAP_IMPORTED_CONFIG which controls this behaviour
Added defaults for MSVS targets

6 years agoMerge pull request #10297 from tomoaki0705:suppressOclWarning
Vadim Pisarevsky [Wed, 13 Dec 2017 07:56:34 +0000 (07:56 +0000)]
Merge pull request #10297 from tomoaki0705:suppressOclWarning

6 years agosuppress warnings on OpenCL build
Tomoaki Teshima [Wed, 13 Dec 2017 06:07:51 +0000 (15:07 +0900)]
suppress warnings on OpenCL build
  * stop re-enabling the warning C4127
  * disabling is done in CMakeLists.txt

6 years agocmake: add option to workaround issue observed with old CMake
Alexander Alekhin [Tue, 12 Dec 2017 15:56:09 +0000 (18:56 +0300)]
cmake: add option to workaround issue observed with old CMake

CMake message contains this: "Invalid escape sequence \"