Maksim Shabunin [Mon, 6 Apr 2015 13:12:00 +0000 (16:12 +0300)]
Fix generating of android.mk
Vadim Pisarevsky [Sun, 5 Apr 2015 18:01:17 +0000 (18:01 +0000)]
Merge pull request #3903 from SeninAndrew:master
Vadim Pisarevsky [Sun, 5 Apr 2015 17:57:51 +0000 (17:57 +0000)]
Merge pull request #3729 from bitstars:AsyncServiceHelper.java-Android-5-hotfix
Vadim Pisarevsky [Sun, 5 Apr 2015 17:57:11 +0000 (17:57 +0000)]
Merge pull request #3694 from Ashod:jp2
Ashod Nakashian [Sat, 4 Apr 2015 00:59:13 +0000 (20:59 -0400)]
Jpeg2k color to greyscale conversion on non-Windows is done post decoding because system libjasper segfaults when decoding color images as greyscale.
Ashod Nakashian [Sun, 29 Mar 2015 20:49:47 +0000 (16:49 -0400)]
Simplified temp filename generation.
Ashod Nakashian [Thu, 12 Feb 2015 02:28:44 +0000 (21:28 -0500)]
Jasper unit-tests and removed a superfluous assertion.
Ashod Nakashian [Wed, 11 Feb 2015 22:49:19 +0000 (17:49 -0500)]
Fix for decoding large Jp2 images on Windows.
On Windows, the tmpnam function returns a temp filename in the current directory, which has a prepended backslash '\\'.
This subsequently fails the open function.
This patch creates a proper temp filename in the temp folder and makes unlike work by opening the file as short-lived.
Andrew Senin [Fri, 3 Apr 2015 19:49:50 +0000 (22:49 +0300)]
Ximea camera fix (see issue #4235)
Vadim Pisarevsky [Fri, 3 Apr 2015 13:26:22 +0000 (13:26 +0000)]
Merge pull request #3902 from apavlenko:doc_fix_imwrite_master
Vadim Pisarevsky [Fri, 3 Apr 2015 13:24:47 +0000 (13:24 +0000)]
Merge pull request #3901 from StevenPuttemans:add_breakrule_cascade_accuracy
Andrey Pavlenko [Fri, 3 Apr 2015 11:03:09 +0000 (14:03 +0300)]
fixing confusing variable naming in a sample code
StevenPuttemans [Fri, 3 Apr 2015 10:54:05 +0000 (12:54 +0200)]
fixing wrong equation in accuracy break rule
Vadim Pisarevsky [Fri, 3 Apr 2015 10:19:03 +0000 (10:19 +0000)]
Merge pull request #3798 from StevenPuttemans:add_breakrule_cascade_accuracy
Vadim Pisarevsky [Fri, 3 Apr 2015 10:16:29 +0000 (10:16 +0000)]
Merge pull request #3813 from hahne:iss1915
StevenPuttemans [Fri, 6 Mar 2015 10:52:26 +0000 (11:52 +0100)]
allowing people to manually define how sharp a cascade classifier model should be trained
Vadim Pisarevsky [Thu, 2 Apr 2015 11:53:55 +0000 (11:53 +0000)]
Merge pull request #3892 from MSOpenTech:imgcodecs-contrib
Vadim Pisarevsky [Thu, 2 Apr 2015 11:48:43 +0000 (11:48 +0000)]
Merge pull request #3869 from Dikay900:remove_unused_variable
Vadim Pisarevsky [Thu, 2 Apr 2015 11:45:20 +0000 (11:45 +0000)]
Merge pull request #3889 from nitsch:fix-mingw-cmake
Vadim Pisarevsky [Thu, 2 Apr 2015 11:44:32 +0000 (11:44 +0000)]
Merge pull request #3897 from sanchom:bugfix_4030
Simon Heinen [Thu, 2 Apr 2015 07:05:56 +0000 (09:05 +0200)]
Update android+AsyncServiceHelper.java
small formatting fixes
Simon Heinen [Thu, 2 Apr 2015 06:42:19 +0000 (08:42 +0200)]
Update android+AsyncServiceHelper.java
changed tabs in last commit to spaces
Sancho McCann [Wed, 1 Apr 2015 19:00:39 +0000 (19:00 +0000)]
Bugfix: #4030 SVM auto-training.
Dikay900 [Wed, 1 Apr 2015 18:22:27 +0000 (20:22 +0200)]
initialize tiltedOffset variable at correct location
do not use this variable if it is not an tilted feature
Vadim Pisarevsky [Wed, 1 Apr 2015 11:13:04 +0000 (11:13 +0000)]
Merge pull request #3874 from paroj:calib_sample
Vadim Pisarevsky [Wed, 1 Apr 2015 11:05:56 +0000 (11:05 +0000)]
Merge pull request #3887 from MSOpenTech:update_py_script
Vadim Pisarevsky [Wed, 1 Apr 2015 10:49:52 +0000 (10:49 +0000)]
Merge pull request #3891 from mshabunin:fix-v4l2-link
Evgeny Agafonchikov [Fri, 27 Mar 2015 13:50:18 +0000 (16:50 +0300)]
Functionality for relocation of tests
This allows to start run.py with --move_tests parameter to place tests
to another location and keep them runnable from there
Evgeny Agafonchikov [Tue, 24 Mar 2015 12:52:49 +0000 (15:52 +0300)]
Fixing help messages
--help message and starting run.py w/o parameters generate different messages
E. g. w/ and w/o build_path in the end
build_path is required, removing square brackets
Maxim Kostin [Tue, 31 Mar 2015 14:09:09 +0000 (17:09 +0300)]
Added sample imgcodecs logic to winrt sample app
- Made use imread() in OcvImageProcessing sample.
- Added test/sample logic to verify file creation via imgcodecs.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Pavel Rojtberg [Wed, 25 Mar 2015 15:11:53 +0000 (16:11 +0100)]
- update documentation
* correct the part about fixed aspect
* improve formatting
* add snippet markers to source
* replace inline code by @snippet
- do not run calibration twice when using a imageList
- make output consistent in itself (CamelCase vs no_camel_case) as well as with old camera calibrate sample
- respect write extrinsic/ points flags
- set the aspectRatio value when specified
- fix writing of calibration settings. also update grammar.
- fix intendation and remove some size_t -> int casts by using size_t
Maxim Kostin [Tue, 31 Mar 2015 13:31:37 +0000 (16:31 +0300)]
Added support for 'imgcodecs' module:
- Resolved GET_ENV and input type incompatibility
- Made libjpeg compile for WINRT. So does imgcodecs module.
- Updated .gitignore (log, tlog)
Roman Donchenko [Wed, 9 Jul 2014 12:55:40 +0000 (16:55 +0400)]
cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
How this worked before, I do not know.
Alexander Nitsch [Mon, 30 Mar 2015 21:38:43 +0000 (23:38 +0200)]
Fix static/shared lib detection
The check for BUILD_SHARED_LIBS had its logic backwards. If this
variable is not defined we must assume a build of static libs.
Alexander Nitsch [Tue, 17 Mar 2015 12:52:59 +0000 (13:52 +0100)]
Remove local variables from CMAKE namespace
Alexander Nitsch [Sat, 7 Mar 2015 14:49:48 +0000 (15:49 +0100)]
Fix MinGW detection on x86
Make detection of x64 using the gcc's target triplet identical
to the one used in cmake/OpenCVDetectCXXCompiler.cmake.
Otherwise, MinGW-w64 setups will always be treated as x64 since
they contain "w64" as vendor key.
Alexander Nitsch [Sat, 7 Mar 2015 14:37:21 +0000 (15:37 +0100)]
Fix MinGW architecture detection
Fix typo that would always lead to detection of x86 for MinGW
builds in the OpenCVConfig.cmake file.
Alexander Nitsch [Mon, 23 Feb 2015 14:01:00 +0000 (15:01 +0100)]
Fix MinGW detection on x86
MinGW-w64 always uses "w64" as vendor key which the previously
used check for "64" anywhere in the target triplet matched. This
would lead to MinGW-w64 setups always being treated as x64.
Turns out we do not even need this additional check since the
architecture has been correctly determined earlier in this file.
No need to do it again.
Vadim Pisarevsky [Mon, 30 Mar 2015 17:20:39 +0000 (17:20 +0000)]
Merge pull request #3873 from Dmitry-Me:reduceVariableScope10
Alexander Alekhin [Mon, 30 Mar 2015 15:52:05 +0000 (15:52 +0000)]
Merge pull request #3888 from alalek:fix_build
Alexander Alekhin [Mon, 30 Mar 2015 13:28:53 +0000 (16:28 +0300)]
fix build (related to PR #3814)
Vadim Pisarevsky [Mon, 30 Mar 2015 09:38:18 +0000 (09:38 +0000)]
Merge pull request #3883 from kmsquire:python_cmake_fix
Vadim Pisarevsky [Mon, 30 Mar 2015 09:27:10 +0000 (09:27 +0000)]
Merge pull request #3876 from vpisarev:mjpeg_codec
Vadim Pisarevsky [Mon, 30 Mar 2015 09:13:26 +0000 (09:13 +0000)]
Merge pull request #3872 from mshabunin:add-rst-link
Alexander Alekhin [Fri, 27 Mar 2015 18:03:37 +0000 (18:03 +0000)]
Merge pull request #3884 from mshabunin:fix-vc10-build
Vadim Pisarevsky [Fri, 27 Mar 2015 12:15:59 +0000 (15:15 +0300)]
added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder
Maksim Shabunin [Fri, 27 Mar 2015 11:36:27 +0000 (14:36 +0300)]
Commented unused constants in the RHO algorithm
Maksim Shabunin [Fri, 27 Mar 2015 09:15:26 +0000 (12:15 +0300)]
Fix build for VC10
Kevin Squire [Fri, 16 Jan 2015 02:13:06 +0000 (18:13 -0800)]
Allow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden
Vadim Pisarevsky [Thu, 26 Mar 2015 16:56:49 +0000 (16:56 +0000)]
Merge pull request #3847 from mshabunin:android-build
Vadim Pisarevsky [Thu, 26 Mar 2015 16:40:17 +0000 (16:40 +0000)]
Merge pull request #3880 from vpisarev:fix_emd
Vadim Pisarevsky [Thu, 26 Mar 2015 13:35:35 +0000 (13:35 +0000)]
Merge pull request #3871 from potpath:patch-1
Vadim Pisarevsky [Thu, 26 Mar 2015 13:35:12 +0000 (13:35 +0000)]
Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc
Vadim Pisarevsky [Thu, 26 Mar 2015 13:26:41 +0000 (16:26 +0300)]
initialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report)
Vadim Pisarevsky [Thu, 26 Mar 2015 13:09:01 +0000 (13:09 +0000)]
Merge pull request #3875 from alalek:fix_build
Vadim Pisarevsky [Thu, 26 Mar 2015 12:59:49 +0000 (15:59 +0300)]
fixed warnings; transpose qtab to make it compatible with neon branch
Vadim Pisarevsky [Thu, 26 Mar 2015 10:22:11 +0000 (10:22 +0000)]
Merge pull request #3878 from mshabunin:fix-python
Maksim Shabunin [Thu, 26 Mar 2015 08:43:49 +0000 (11:43 +0300)]
Add python test for inheritance structure generation
Maksim Shabunin [Thu, 26 Mar 2015 08:22:52 +0000 (11:22 +0300)]
Fix python submodules inheritance detection
Vadim Pisarevsky [Wed, 25 Mar 2015 21:39:29 +0000 (00:39 +0300)]
added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG"
Alexander Alekhin [Wed, 25 Mar 2015 16:09:53 +0000 (19:09 +0300)]
fix build (related to PR #3814)
Dmitry-Me [Wed, 25 Mar 2015 14:17:06 +0000 (17:17 +0300)]
Reduce variables scope
Vadim Pisarevsky [Wed, 25 Mar 2015 13:32:33 +0000 (13:32 +0000)]
Merge pull request #3870 from Dmitry-Me:reduceVariableScope9
Maksim Shabunin [Wed, 25 Mar 2015 13:27:35 +0000 (16:27 +0300)]
Add link to old documentation format
Dikay900 [Sat, 21 Mar 2015 18:18:54 +0000 (19:18 +0100)]
disable cuda::OpticalFlowNeedleMap if configured without cudaimgproc
disable cuda::FastOpticalFlowBM if configured without cudaarithm
potpath [Wed, 25 Mar 2015 11:07:01 +0000 (18:07 +0700)]
Fix a typo in template_matching.markdown
Fix a typo in first equation under method=CV_TM_CCOEFF.
Vadim Pisarevsky [Wed, 25 Mar 2015 10:10:04 +0000 (10:10 +0000)]
Merge pull request #3670 from obilaniu:master
Vadim Pisarevsky [Wed, 25 Mar 2015 09:51:20 +0000 (09:51 +0000)]
Merge pull request #3866 from tdsmith:python-linkage
Dmitry-Me [Wed, 25 Mar 2015 07:35:11 +0000 (10:35 +0300)]
Reduce variable scope
Vadim Pisarevsky [Tue, 24 Mar 2015 16:10:19 +0000 (16:10 +0000)]
Merge pull request #3634 from mshabunin:transition-guide
Maksim Shabunin [Tue, 24 Mar 2015 15:57:29 +0000 (18:57 +0300)]
Changed Android Manager version to 3.0
Vadim Pisarevsky [Tue, 24 Mar 2015 15:23:58 +0000 (15:23 +0000)]
Merge pull request #3814 from erikrk:denoising-16bit-master
Vadim Pisarevsky [Tue, 24 Mar 2015 15:19:55 +0000 (15:19 +0000)]
Merge pull request #3835 from StevenPuttemans:upgrade_traincascade_memory_master
Vadim Pisarevsky [Tue, 24 Mar 2015 15:19:13 +0000 (15:19 +0000)]
Merge pull request #3849 from Dikay900:fix_tilted_features_crash
Vadim Pisarevsky [Tue, 24 Mar 2015 15:13:34 +0000 (15:13 +0000)]
Merge pull request #3854 from Dmitry-Me:reduceVariableScope8
Vadim Pisarevsky [Tue, 24 Mar 2015 15:09:53 +0000 (15:09 +0000)]
Merge pull request #3858 from MSOpenTech:fix-ml-test
Vadim Pisarevsky [Tue, 24 Mar 2015 15:08:03 +0000 (15:08 +0000)]
Merge pull request #3859 from NewProggie:fix-doc-typo
Vadim Pisarevsky [Tue, 24 Mar 2015 15:07:34 +0000 (15:07 +0000)]
Merge pull request #3860 from theodr:document_hconcat_vconcat
Vadim Pisarevsky [Tue, 24 Mar 2015 15:07:12 +0000 (15:07 +0000)]
Merge pull request #3861 from wangyan42164:cascade_optimizing
Vadim Pisarevsky [Tue, 24 Mar 2015 15:05:43 +0000 (15:05 +0000)]
Merge pull request #3863 from MSOpenTech:fix_winrt_linker
Vadim Pisarevsky [Tue, 24 Mar 2015 15:05:15 +0000 (15:05 +0000)]
Merge pull request #3864 from MSOpenTech:removed-unused-winrttest
Vadim Pisarevsky [Tue, 24 Mar 2015 15:04:45 +0000 (15:04 +0000)]
Merge pull request #3867 from RafaRuiz:patch-1
theodore [Mon, 23 Mar 2015 00:44:10 +0000 (01:44 +0100)]
documentation for the hconcat and vconcat functions
RafaRuiz [Tue, 24 Mar 2015 09:06:55 +0000 (09:06 +0000)]
Update lkdemo.cpp because of memory leak
In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250
Tim D. Smith [Tue, 24 Mar 2015 06:36:46 +0000 (23:36 -0700)]
Don't explicitly link Python on OS X
Explicitly linking to a Python framework on OS X prevents modules from
being built against one Python (i.e. system python) and imported from
another (i.e. Homebrew python); the interpreter segfaults if there's a
linkage to a foreign Python. Building the module with `-undefined
dynamic_lookup` instead of an explicit link allows the symbols to be
resolved at load time from a compatible python.
Erik Karlsson [Tue, 24 Mar 2015 01:01:31 +0000 (02:01 +0100)]
Added normType parameter to fastNlMeansDenoisingMulti
Erik Karlsson [Tue, 24 Mar 2015 00:16:17 +0000 (01:16 +0100)]
Added test cases
Erik Karlsson [Mon, 23 Mar 2015 23:47:11 +0000 (00:47 +0100)]
Added parameter normType to fastNlMeansDenoising
Erik Karlsson [Mon, 23 Mar 2015 22:23:35 +0000 (23:23 +0100)]
Removed fastNlMeansDenoisingColored[Multi]Abs
Evgeny Agafonchikov [Fri, 20 Mar 2015 15:19:18 +0000 (18:19 +0300)]
Do not link vfw32 library for WinRT
HAVE_VFW flag is defined by CMake try_compile check.
Check fails for WINRT as vfw.h begins with
and contains empty set of functions for Store apps.
So we can safely remove vfw32.lib for WINRT in general
(independently of availability for specific configuration)
Evgeny Agafonchikov [Mon, 23 Mar 2015 13:55:47 +0000 (16:55 +0300)]
Removing unused winrttest.cpp file
Maksim Shabunin [Mon, 23 Mar 2015 13:26:46 +0000 (13:26 +0000)]
Merge pull request #3862 from mshabunin:abi-contrib-disable
Maksim Shabunin [Mon, 23 Mar 2015 10:10:18 +0000 (13:10 +0300)]
Do not compare extra modules in ABI check
Yan Wang [Mon, 23 Mar 2015 09:47:40 +0000 (17:47 +0800)]
Optimize the performance of cascade OpenCL kernel.
1. Use built-in mad() instead of += and *.
2. For stump stages, if weight.z == 0, avoid unnecessary calculation
because some features only have 2 rectangles..
It could improve
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*
about 10% mean values.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Vadim Pisarevsky [Mon, 23 Mar 2015 08:10:21 +0000 (08:10 +0000)]
Merge pull request #3853 from alalek:ocl_fix_bufferpool_cleanup
Vadim Pisarevsky [Mon, 23 Mar 2015 08:04:41 +0000 (08:04 +0000)]
Merge pull request #3848 from yxiong:fix-4125
Vadim Pisarevsky [Mon, 23 Mar 2015 08:01:25 +0000 (08:01 +0000)]
Merge pull request #3846 from mshabunin:fix-headers
Kai Wolf [Sun, 22 Mar 2015 09:55:54 +0000 (10:55 +0100)]
Fix typo in types_c.h
Evgeny Agafonchikov [Fri, 20 Mar 2015 07:10:32 +0000 (10:10 +0300)]
Fixing invalid opencv_test_ml calls
Dikay900 [Fri, 20 Mar 2015 12:26:13 +0000 (13:26 +0100)]
add resetting the offset variable after setting a new image