peng xiao [Tue, 3 Sep 2013 01:31:13 +0000 (09:31 +0800)]
Modify according to @alalek.
peng xiao [Mon, 2 Sep 2013 02:06:01 +0000 (10:06 +0800)]
Let clAmdBlas library initialize once during program lifetime.
Roman Donchenko [Fri, 30 Aug 2013 13:56:06 +0000 (17:56 +0400)]
Merge pull request #1371 from HapeMask:fix-png-warnings
Roman Donchenko [Fri, 30 Aug 2013 13:55:07 +0000 (17:55 +0400)]
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
Gabe Schwartz [Thu, 29 Aug 2013 18:32:50 +0000 (14:32 -0400)]
Added interlace handling to PNG decoder.
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
Gabe Schwartz [Tue, 27 Aug 2013 20:28:10 +0000 (16:28 -0400)]
Removed incorrect iCCP chunks from GUI resources.
Also removed malformed tEXt chunk from a logo PNG.
Roman Donchenko [Fri, 30 Aug 2013 13:28:51 +0000 (17:28 +0400)]
Merge pull request #1374 from zacstewart:2.4
Roman Donchenko [Fri, 30 Aug 2013 13:26:20 +0000 (17:26 +0400)]
Merge pull request #1266 from kdrobnyh:core_stat_functions
Roman Donchenko [Fri, 30 Aug 2013 13:25:06 +0000 (17:25 +0400)]
Merge pull request #1236 from pengx17:2.4_fix_retina_color_param
Zac Stewart [Fri, 30 Aug 2013 10:34:47 +0000 (06:34 -0400)]
Correct name of eye function
Zac Stewart [Fri, 30 Aug 2013 10:34:23 +0000 (06:34 -0400)]
Remove extraneous colon before ':basicstructures:'
Roman Donchenko [Fri, 30 Aug 2013 08:24:24 +0000 (12:24 +0400)]
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
Roman Donchenko [Fri, 30 Aug 2013 08:21:26 +0000 (12:21 +0400)]
Merge pull request #1370 from ilya-lavrenov:ocl_decor
kdrobnyh [Thu, 29 Aug 2013 17:05:35 +0000 (21:05 +0400)]
Add IPP support in meanStdDev, minMaxIdx, norm functions
kdrobnyh [Thu, 29 Aug 2013 14:53:46 +0000 (07:53 -0700)]
Merge pull request #5 from Itseez/2.4
Some changes in OpenCV
ilya-lavrenov [Wed, 28 Aug 2013 07:25:54 +0000 (11:25 +0400)]
enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal
ilya-lavrenov [Thu, 29 Aug 2013 11:55:53 +0000 (15:55 +0400)]
gpu -> ocl
Roman Donchenko [Thu, 29 Aug 2013 14:09:06 +0000 (18:09 +0400)]
Merge pull request #1361 from asmorkalov:winrt_api_container
Roman Donchenko [Thu, 29 Aug 2013 14:07:57 +0000 (18:07 +0400)]
Merge pull request #1359 from asmorkalov:winrt_tiff_api_fix
Vadim Pisarevsky [Wed, 28 Aug 2013 15:53:40 +0000 (19:53 +0400)]
fixed bugs in rectangular morphology case
Alexander Smorkalov [Wed, 28 Aug 2013 15:36:57 +0000 (08:36 -0700)]
/apicontainer added to linker flags on WinRT to fix api test issues.
Roman Donchenko [Wed, 28 Aug 2013 15:02:08 +0000 (19:02 +0400)]
Merge pull request #1338 from asmorkalov:android_tegra_detector
Roman Donchenko [Wed, 28 Aug 2013 15:01:15 +0000 (19:01 +0400)]
Merge pull request #1343 from asmorkalov:android_img_manipulations_fix
Alexander Smorkalov [Wed, 28 Aug 2013 14:31:46 +0000 (07:31 -0700)]
LibTIFF Win32 API back-end disabled for Windows RT.
Vadim Pisarevsky [Wed, 28 Aug 2013 13:00:26 +0000 (17:00 +0400)]
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
Alexander Smorkalov [Fri, 23 Aug 2013 13:37:43 +0000 (17:37 +0400)]
New Tegra detector with Android 4.3 support added. Manager version++.
Alexander Smorkalov [Mon, 26 Aug 2013 13:35:20 +0000 (17:35 +0400)]
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
Roman Donchenko [Wed, 28 Aug 2013 10:52:28 +0000 (14:52 +0400)]
Merge pull request #1357 from SpecLad:less-precomps
Roman Donchenko [Wed, 28 Aug 2013 09:31:08 +0000 (13:31 +0400)]
Merge pull request #1213 from kdrobnyh:color
Roman Donchenko [Wed, 28 Aug 2013 09:23:50 +0000 (13:23 +0400)]
Deleted the now-empty ocl perf_precomp.cpp.
See pull request #1241 for why.
Roman Donchenko [Wed, 28 Aug 2013 08:46:01 +0000 (12:46 +0400)]
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
ilya-lavrenov [Tue, 27 Aug 2013 14:46:30 +0000 (18:46 +0400)]
appended ocl::finish to test_cycle defines
Roman Donchenko [Tue, 27 Aug 2013 10:38:52 +0000 (14:38 +0400)]
Restored one executable bit that was lost during the war on whitespace.
Roman Donchenko [Tue, 27 Aug 2013 08:36:44 +0000 (12:36 +0400)]
Merge pull request #1346 from jet47:gpu-tvl1-optimization
Vladislav Vinogradov [Tue, 27 Aug 2013 07:21:41 +0000 (11:21 +0400)]
gpu TVL1 Optical Flow optimization:
do not calculate sum of error in every round of iteration;
instead the error will be summed every 2nd times or more,
if the previous sum of error is too far away from threshold.
Roman Donchenko [Mon, 26 Aug 2013 12:59:44 +0000 (16:59 +0400)]
Merge pull request #1311 from leszekhanusz:png_palette_alpha
Roman Donchenko [Mon, 26 Aug 2013 12:54:59 +0000 (16:54 +0400)]
Merge pull request #1326 from ilya-lavrenov:perf_ocl
Roman Donchenko [Mon, 26 Aug 2013 12:40:50 +0000 (16:40 +0400)]
Merge pull request #1336 from jet47:gpu-resize
ilya-lavrenov [Fri, 23 Aug 2013 14:38:31 +0000 (18:38 +0400)]
the code was refactored and old test system code was removed
ilya-lavrenov [Thu, 22 Aug 2013 14:03:05 +0000 (18:03 +0400)]
most of the performance tests was rewritten in google-test manner
Vladislav Vinogradov [Fri, 23 Aug 2013 09:46:29 +0000 (13:46 +0400)]
used global memory access for up-scaling
Roman Donchenko [Fri, 23 Aug 2013 12:54:48 +0000 (16:54 +0400)]
Merge pull request #1335 from alekcac:ios-build-fix
Roman Donchenko [Fri, 23 Aug 2013 12:49:51 +0000 (16:49 +0400)]
Merge pull request #1334 from MarkBelmont:bugfix_1
Alexander Shishkov [Fri, 23 Aug 2013 12:09:41 +0000 (16:09 +0400)]
fix CMake changes
Roman Donchenko [Fri, 23 Aug 2013 11:56:10 +0000 (15:56 +0400)]
Merge pull request #1333 from kirill-kornyakov:bugfix-for-3231
Roman Donchenko [Fri, 23 Aug 2013 11:43:07 +0000 (15:43 +0400)]
Merge pull request #1234 from SpecLad:ios-plist
Roman Donchenko [Fri, 23 Aug 2013 10:47:48 +0000 (14:47 +0400)]
Merge pull request #1332 from pengx17:2.4_fix_parallel
Vladislav Vinogradov [Thu, 22 Aug 2013 08:50:30 +0000 (12:50 +0400)]
improved texture usage:
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
Vladislav Vinogradov [Thu, 22 Aug 2013 08:31:10 +0000 (12:31 +0400)]
added custom implementation for nearest and linear interpolation
Vladislav Vinogradov [Thu, 22 Aug 2013 08:03:17 +0000 (12:03 +0400)]
reorganize code for further modifiction
Alexander Shishkov [Fri, 23 Aug 2013 09:41:19 +0000 (13:41 +0400)]
fixed problems with building iOS version
Alexander Shishkov [Fri, 23 Aug 2013 08:51:50 +0000 (12:51 +0400)]
Update build_framework.py
MarkBelmont [Fri, 23 Aug 2013 08:39:39 +0000 (16:39 +0800)]
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."
Kirill Kornyakov [Fri, 23 Aug 2013 08:34:35 +0000 (12:34 +0400)]
bugfix-for-3231
Vladislav Vinogradov [Thu, 22 Aug 2013 07:46:09 +0000 (11:46 +0400)]
removed NPP implementation
Roman Donchenko [Fri, 23 Aug 2013 08:06:56 +0000 (12:06 +0400)]
Merge pull request #1324 from SpecLad:try-compile
Roman Donchenko [Fri, 23 Aug 2013 08:04:32 +0000 (12:04 +0400)]
Merge pull request #1329 from SpecLad:msvc-werror
peng xiao [Fri, 23 Aug 2013 07:35:55 +0000 (15:35 +0800)]
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
Roman Donchenko [Thu, 22 Aug 2013 14:25:38 +0000 (18:25 +0400)]
Added warnings-as-errors support for MSVC.
Ilya Lavrenov [Thu, 22 Aug 2013 13:38:55 +0000 (17:38 +0400)]
fixer error with incorrect condition
Ilya Lavrenov [Thu, 22 Aug 2013 13:37:48 +0000 (17:37 +0400)]
added a test for ocl::norm
Roman Donchenko [Thu, 22 Aug 2013 11:46:13 +0000 (15:46 +0400)]
Fix errors in usages of try_compile
* There's no OPENCV_BINARY_DIR variable;
* No need to append CMakeFiles/CMakeTmp, as CMake does it for you;
* Output variables are unused;
* Wrong usage of CMAKE_FLAGS;
* Small quoting and style issues.
Roman Donchenko [Thu, 22 Aug 2013 08:46:00 +0000 (12:46 +0400)]
Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix
Roman Donchenko [Thu, 22 Aug 2013 07:55:24 +0000 (11:55 +0400)]
Merge pull request #1317 from jet47:gpu-tvl1-optimization
Roman Donchenko [Thu, 22 Aug 2013 07:49:43 +0000 (11:49 +0400)]
Merge pull request #1318 from SpecLad:wow
Alexander Smorkalov [Thu, 22 Aug 2013 06:59:27 +0000 (23:59 -0700)]
WindowsRT mode build warning fix.
Roman Donchenko [Wed, 21 Aug 2013 15:24:25 +0000 (19:24 +0400)]
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
Roman Donchenko [Wed, 21 Aug 2013 14:52:15 +0000 (18:52 +0400)]
Converted tabs to spaces.
Roman Donchenko [Wed, 21 Aug 2013 13:26:54 +0000 (17:26 +0400)]
Normalized file endings.
Roman Donchenko [Wed, 21 Aug 2013 12:44:09 +0000 (16:44 +0400)]
Deleted all trailing whitespace.
Roman Donchenko [Tue, 20 Aug 2013 15:33:23 +0000 (19:33 +0400)]
Disabled whitespace checking for 3rdparty.
Roman Donchenko [Mon, 22 Jul 2013 13:14:08 +0000 (17:14 +0400)]
Added more text/binary/whitespace attributes for files we have.
Roman Donchenko [Wed, 21 Aug 2013 14:34:47 +0000 (18:34 +0400)]
Merge pull request #1305 from SpecLad:perf-precomp
Roman Donchenko [Wed, 21 Aug 2013 14:28:35 +0000 (18:28 +0400)]
Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix
Alexander Smorkalov [Wed, 21 Aug 2013 10:38:20 +0000 (03:38 -0700)]
C4447 warning about main function format suppressed.
Alexander Smorkalov [Mon, 19 Aug 2013 08:25:53 +0000 (01:25 -0700)]
Invalid usage of cv::Ptr for arrays fixed.
Vladislav Vinogradov [Wed, 21 Aug 2013 14:17:45 +0000 (18:17 +0400)]
minor gpu TVL1 optical flow optimization:
don't calc diff term if it is not used for epsilon criterion
Roman Donchenko [Wed, 21 Aug 2013 12:18:31 +0000 (16:18 +0400)]
Merge pull request #1306 from jet47:gpu-bitwize-fix
Hanusz Leszek [Wed, 21 Aug 2013 10:33:51 +0000 (12:33 +0200)]
using unsigned char instead of uint8_t to compile under windows
Roman Donchenko [Wed, 21 Aug 2013 09:32:27 +0000 (13:32 +0400)]
Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script
Roman Donchenko [Wed, 21 Aug 2013 09:25:26 +0000 (13:25 +0400)]
Merge pull request #1215 from jet47:cuda-5.5-sanity
kdrobnyh [Wed, 14 Aug 2013 09:33:17 +0000 (13:33 +0400)]
Add IPP 8.0 support in FindIPP script
Roman Donchenko [Wed, 21 Aug 2013 07:56:29 +0000 (11:56 +0400)]
Merge pull request #1314 from jet47:ts-gpu-fix
Vladislav Vinogradov [Wed, 21 Aug 2013 06:12:44 +0000 (10:12 +0400)]
record cuda gpu name to output report
Vladislav Vinogradov [Wed, 21 Aug 2013 06:00:40 +0000 (10:00 +0400)]
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
Hanusz Leszek [Mon, 19 Aug 2013 17:05:37 +0000 (19:05 +0200)]
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
Vladislav Vinogradov [Tue, 20 Aug 2013 12:28:45 +0000 (16:28 +0400)]
fixed gpu bitwize operation:
incorrect types for template instantiation
Roman Donchenko [Tue, 20 Aug 2013 08:51:33 +0000 (12:51 +0400)]
Fix the name of perf tests' precompiled header.
(cherry picked from commit
aa96d8d053c3d0c367da7c1c1f9c73ed376b3bfa)
Roman Donchenko [Tue, 20 Aug 2013 08:12:22 +0000 (12:12 +0400)]
Merge pull request #1301 from asmorkalov:java_video_capture_fix
Alexander Smorkalov [Mon, 19 Aug 2013 12:27:06 +0000 (16:27 +0400)]
Typo in Java generator fixed.
Typo breaks debug build for Android platform.
Roman Donchenko [Mon, 19 Aug 2013 11:00:36 +0000 (15:00 +0400)]
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
Roman Donchenko [Mon, 19 Aug 2013 10:14:22 +0000 (14:14 +0400)]
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
Roman Donchenko [Mon, 19 Aug 2013 08:04:24 +0000 (12:04 +0400)]
Merge pull request #1288 from nghiaho12:haar
Vladislav Vinogradov [Mon, 19 Aug 2013 07:56:58 +0000 (11:56 +0400)]
fixed gpu cvtColor for BGR <-> YUV
kdrobnyh [Tue, 13 Aug 2013 10:49:32 +0000 (14:49 +0400)]
macros -> template in IPP support cvtColor
Nghia Ho [Sat, 17 Aug 2013 10:32:13 +0000 (20:32 +1000)]
Buffer is accessed out of bounds.
Roman Donchenko [Fri, 16 Aug 2013 15:59:26 +0000 (19:59 +0400)]
Merge pull request #1286 from SpecLad:optflow-sf-init
Roman Donchenko [Fri, 16 Aug 2013 15:59:12 +0000 (19:59 +0400)]
Merge pull request #1277 from NCBee:2.4
Bahram Dahi [Fri, 16 Aug 2013 15:14:32 +0000 (08:14 -0700)]
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
Roman Donchenko [Fri, 16 Aug 2013 15:03:45 +0000 (19:03 +0400)]
Merge pull request #1280 from asmorkalov:winrt_detect_fix