platform/upstream/opencv.git
9 years agoUpdate MatchTemplate_Demo.cpp
侯骥 [Wed, 11 Jun 2014 08:29:30 +0000 (10:29 +0200)]
Update MatchTemplate_Demo.cpp

9 years agoFix typo
Jay Bosamiya [Sat, 17 Jan 2015 17:23:30 +0000 (22:53 +0530)]
Fix typo

9 years agoUpdate lkdemo.cpp because of memory leak
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

9 years agoFixed typo
Pastafarianist [Sun, 21 Apr 2013 19:04:54 +0000 (23:04 +0400)]
Fixed typo

9 years agouse constant instead of value backported from #785
Dikay900 [Fri, 24 Apr 2015 17:52:28 +0000 (19:52 +0200)]
use constant instead of value backported from #785

9 years agofilename correction from #3217
Dikay900 [Fri, 24 Apr 2015 17:07:57 +0000 (19:07 +0200)]
filename correction from #3217

9 years agosquashed #823
Kevin Hughes [Wed, 17 Apr 2013 17:20:32 +0000 (13:20 -0400)]
squashed #823
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface

Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp

starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error

starter_video.cpp hid local functions

9 years agoFix typo in error for extrinsic parameters
Maximilien Cuony [Wed, 17 Sep 2014 07:32:19 +0000 (09:32 +0200)]
Fix typo in error for extrinsic parameters

9 years agoupdate openni sample comments referring #81
Dikay900 [Fri, 24 Apr 2015 16:15:50 +0000 (18:15 +0200)]
update openni sample comments referring #81

9 years agoMerge pull request #3956 from ilya-lavrenov:cuda_aarch64
Vadim Pisarevsky [Thu, 23 Apr 2015 13:49:33 +0000 (13:49 +0000)]
Merge pull request #3956 from ilya-lavrenov:cuda_aarch64

9 years agoMerge pull request #3953 from ilya-lavrenov:cuda_unused
Vadim Pisarevsky [Thu, 23 Apr 2015 12:26:07 +0000 (12:26 +0000)]
Merge pull request #3953 from ilya-lavrenov:cuda_unused

9 years agofixed find cuda for aarch64
Ilya Lavrenov [Thu, 23 Apr 2015 11:29:37 +0000 (14:29 +0300)]
fixed find cuda for aarch64

9 years agormeoved unused functions
Ilya Lavrenov [Thu, 23 Apr 2015 09:48:31 +0000 (12:48 +0300)]
rmeoved unused functions

9 years agoMerge pull request #3949 from ilya-lavrenov:clobbered_warning
Vadim Pisarevsky [Wed, 22 Apr 2015 19:07:46 +0000 (19:07 +0000)]
Merge pull request #3949 from ilya-lavrenov:clobbered_warning

9 years agosuppress -Wclobbered warning
Ilya Lavrenov [Wed, 22 Apr 2015 13:42:03 +0000 (16:42 +0300)]
suppress -Wclobbered warning

9 years agoMerge pull request #3940 from sergarrido:fix-gen_pattern.py-2.4
Vadim Pisarevsky [Mon, 20 Apr 2015 19:47:55 +0000 (19:47 +0000)]
Merge pull request #3940 from sergarrido:fix-gen_pattern.py-2.4

9 years agoMerge pull request #3924 from jet47:gpu-fixes
Alexander Smorkalov [Sun, 19 Apr 2015 11:04:54 +0000 (11:04 +0000)]
Merge pull request #3924 from jet47:gpu-fixes

9 years agocompleting and fixing gen_pattern.py for 2.4 branch
S. Garrido [Sat, 18 Apr 2015 20:13:22 +0000 (22:13 +0200)]
completing and fixing gen_pattern.py for 2.4 branch

9 years agoincrease epsilons for some sanity tests
Vladislav Vinogradov [Tue, 14 Apr 2015 07:12:56 +0000 (10:12 +0300)]
increase epsilons for some sanity tests

9 years agoMerge pull request #3923 from ilya-lavrenov:typo
Alexander Alekhin [Mon, 13 Apr 2015 16:57:12 +0000 (16:57 +0000)]
Merge pull request #3923 from ilya-lavrenov:typo

9 years agofix BruteForceMatcher resource distribution
Vladislav Vinogradov [Mon, 13 Apr 2015 14:12:04 +0000 (17:12 +0300)]
fix BruteForceMatcher resource distribution

added launch bounds attributes for all CUDA kernels

9 years agomake NVIDIA tests verbose by default
Vladislav Vinogradov [Mon, 13 Apr 2015 14:11:19 +0000 (17:11 +0300)]
make NVIDIA tests verbose by default

9 years agofixed a bug in scanRows CUDA kernel (part of nppStIntegral)
Vladislav Vinogradov [Mon, 13 Apr 2015 14:09:59 +0000 (17:09 +0300)]
fixed a bug in scanRows CUDA kernel (part of nppStIntegral)

uninitialized value

9 years agoMerge pull request #3908 from jet47:gpu-wrap-border-mode
Vadim Pisarevsky [Tue, 7 Apr 2015 11:44:51 +0000 (11:44 +0000)]
Merge pull request #3908 from jet47:gpu-wrap-border-mode

9 years agofix GPU WARP border mode in CUDA 7.0 and Maxwell architecture
Vladislav Vinogradov [Tue, 7 Apr 2015 10:04:31 +0000 (13:04 +0300)]
fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture

9 years agoMerge pull request #3898 from greensea:2.4
Vadim Pisarevsky [Tue, 7 Apr 2015 09:31:36 +0000 (09:31 +0000)]
Merge pull request #3898 from greensea:2.4

9 years agotypo
Ilya Lavrenov [Tue, 7 Apr 2015 08:08:21 +0000 (11:08 +0300)]
typo

9 years agoFix a segment fault issue in cascade classfier
greensea [Thu, 2 Apr 2015 03:20:57 +0000 (11:20 +0800)]
Fix a segment fault issue in cascade classfier

9 years agoMerge pull request #3904 from SeninAndrew:2.4
Vadim Pisarevsky [Sun, 5 Apr 2015 18:00:29 +0000 (18:00 +0000)]
Merge pull request #3904 from SeninAndrew:2.4

9 years agoXimea camera fix (see issue #4235)
Andrew Senin [Fri, 3 Apr 2015 19:50:05 +0000 (22:50 +0300)]
Ximea camera fix (see issue #4235)

9 years agoMerge pull request #3900 from apavlenko:doc_fix_imwrite
Vadim Pisarevsky [Fri, 3 Apr 2015 13:25:59 +0000 (13:25 +0000)]
Merge pull request #3900 from apavlenko:doc_fix_imwrite

9 years agoMerge pull request #3899 from StevenPuttemans:add_breakrule_traincascade_2.4
Vadim Pisarevsky [Fri, 3 Apr 2015 11:44:55 +0000 (11:44 +0000)]
Merge pull request #3899 from StevenPuttemans:add_breakrule_traincascade_2.4

9 years agofixing confusing variable naming in a sample code
Andrey Pavlenko [Fri, 3 Apr 2015 10:54:49 +0000 (13:54 +0300)]
fixing confusing variable naming in a sample code

9 years agoadd the possibility to add traincascade accuracy
StevenPuttemans [Fri, 3 Apr 2015 07:39:23 +0000 (09:39 +0200)]
add the possibility to add traincascade accuracy

9 years agoMerge pull request #3770 from jet47:gpu-hog-tests
Vadim Pisarevsky [Fri, 3 Apr 2015 10:32:59 +0000 (10:32 +0000)]
Merge pull request #3770 from jet47:gpu-hog-tests

9 years agoMerge pull request #3893 from SpecLad:cuda-imported-targets
Alexander Smorkalov [Thu, 2 Apr 2015 13:56:31 +0000 (13:56 +0000)]
Merge pull request #3893 from SpecLad:cuda-imported-targets

9 years agoMerge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives
Vadim Pisarevsky [Wed, 1 Apr 2015 13:56:29 +0000 (13:56 +0000)]
Merge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives

9 years agoMerge pull request #3852 from renko:multithread_cl_not_studio_generator
Vadim Pisarevsky [Wed, 1 Apr 2015 13:25:39 +0000 (13:25 +0000)]
Merge pull request #3852 from renko:multithread_cl_not_studio_generator

9 years agoNot block PDB file in multithreaded build on Windows.
Vladimir Kolesnikov [Wed, 1 Apr 2015 10:52:07 +0000 (13:52 +0300)]
Not block PDB file in multithreaded build on Windows.

If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.

9 years agoUse imported targets for linking to CUDA
Roman Donchenko [Mon, 30 Mar 2015 12:16:32 +0000 (15:16 +0300)]
Use imported targets for linking to CUDA

This retains the desirable quality of not including paths to CUDA libraries
from the build system into the config files, and has two major advantages:

* It removes the need to use link_directories, which doesn't guarantee that
  the libraries from the supplied directory will be used (there may be
  libraries with the same names earlier in the search path).

* It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable
  is used with target_link_libraries, where such entries are treated as linker
  flags, so doing this is unportable. I remove the support for -L entries
  from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the
  future.

9 years agoMove the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop
Roman Donchenko [Mon, 30 Mar 2015 12:04:27 +0000 (15:04 +0300)]
Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop

There's no reason to do it twice.

9 years agoTurn ocv_convert_to_lib_name into a function
Roman Donchenko [Mon, 30 Mar 2015 11:58:37 +0000 (14:58 +0300)]
Turn ocv_convert_to_lib_name into a function

9 years agoMerge pull request #3886 from beahacker:2.4
Vadim Pisarevsky [Mon, 30 Mar 2015 09:09:31 +0000 (09:09 +0000)]
Merge pull request #3886 from beahacker:2.4

9 years agofix bug 4269
howtobeahacker [Sun, 29 Mar 2015 16:01:20 +0000 (00:01 +0800)]
fix bug 4269

9 years agoMerge pull request #3855 from polarfuchs99:2.4
Vadim Pisarevsky [Thu, 26 Mar 2015 16:55:29 +0000 (16:55 +0000)]
Merge pull request #3855 from polarfuchs99:2.4

9 years ago Changes to be committed:
Prof. Dr. Rudolf Haussmann [Wed, 25 Mar 2015 14:45:20 +0000 (15:45 +0100)]
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

modified:   highgui/include/opencv2/highgui/highgui_c.h
modified:   highgui/src/cap_dshow.cpp
modified:   java/generator/gen_java.py

The correction of the orthographic error in the enumeration constant
CAP_PROP_MONOCROME has been undone.

9 years agoMerge remote-tracking branch 'upstream/2.4' into 2.4
Prof. Dr. Rudolf Haussmann [Wed, 25 Mar 2015 12:38:49 +0000 (13:38 +0100)]
Merge remote-tracking branch 'upstream/2.4' into 2.4

9 years agoMerge pull request #3805 from nitsch:fix-mingw-cmake-config
Vadim Pisarevsky [Wed, 25 Mar 2015 09:53:35 +0000 (09:53 +0000)]
Merge pull request #3805 from nitsch:fix-mingw-cmake-config

9 years agoMerge pull request #3865 from tdsmith:2.4-python-linkage
Vadim Pisarevsky [Wed, 25 Mar 2015 09:52:52 +0000 (09:52 +0000)]
Merge pull request #3865 from tdsmith:2.4-python-linkage

9 years agoRemove local variables from CMAKE namespace
Alexander Nitsch [Tue, 17 Mar 2015 12:52:59 +0000 (13:52 +0100)]
Remove local variables from CMAKE namespace

9 years agoDon't explicitly link Python on OS X
Tim D. Smith [Tue, 24 Mar 2015 06:09:57 +0000 (23:09 -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.

9 years agoMerge pull request #3850 from piponazo:2.4
Vadim Pisarevsky [Mon, 23 Mar 2015 08:03:49 +0000 (08:03 +0000)]
Merge pull request #3850 from piponazo:2.4

9 years agoMerge pull request #3834 from asmorkalov:retina_docs_fix
Vadim Pisarevsky [Fri, 20 Mar 2015 10:14:29 +0000 (10:14 +0000)]
Merge pull request #3834 from asmorkalov:retina_docs_fix

9 years agoMerge pull request #3792 from laomaiweng:cuda-pkg-config-Ldir
Vadim Pisarevsky [Fri, 20 Mar 2015 10:13:46 +0000 (10:13 +0000)]
Merge pull request #3792 from laomaiweng:cuda-pkg-config-Ldir

9 years agoMerge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq
Vadim Pisarevsky [Fri, 20 Mar 2015 09:37:49 +0000 (09:37 +0000)]
Merge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq

9 years agoMerge remote-tracking branch 'upstream/2.4' into 2.4
Prof. Dr. Rudolf Haussmann [Fri, 20 Mar 2015 00:44:29 +0000 (01:44 +0100)]
Merge remote-tracking branch 'upstream/2.4' into 2.4

9 years ago Changes to be committed:
Prof. Dr. Rudolf Haussmann [Fri, 20 Mar 2015 00:42:16 +0000 (01:42 +0100)]
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

modified:   modules/highgui/include/opencv2/highgui/highgui_c.h
modified:   modules/highgui/src/cap_dshow.cpp
modified:   modules/highgui/src/cap_pvapi.cpp
modified:   modules/java/generator/gen_java.py

Änderungen in der PvAPI hinzugefügt.

9 years agoFix a bug that impede to set the trackbar pos using the Qt control panel
Luis Díaz Más [Thu, 19 Mar 2015 20:25:10 +0000 (21:25 +0100)]
Fix a bug that impede to set the trackbar pos using the Qt control panel

9 years agoFix a bad free space check in icvGrowSeq.
Boris Daskalov [Tue, 17 Mar 2015 14:23:03 +0000 (16:23 +0200)]
Fix a bad free space check in icvGrowSeq.

A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.

9 years agoMerge pull request #3843 from piponazo:BugFix4244
Vadim Pisarevsky [Thu, 19 Mar 2015 12:15:41 +0000 (12:15 +0000)]
Merge pull request #3843 from piponazo:BugFix4244

9 years agoFixing the bug #4244 that I just reported in code.opencv.org
Luis Díaz Más [Wed, 18 Mar 2015 19:07:08 +0000 (20:07 +0100)]
Fixing the bug #4244 that I just reported in code.opencv.org

9 years agoDocumentation update after iOS warnings fix in contrib/retina header.
Alexander Smorkalov [Tue, 17 Mar 2015 03:43:54 +0000 (06:43 +0300)]
Documentation update after iOS warnings fix in contrib/retina header.

9 years agoMerge pull request #3824 from Milania1:tutorial_hough_lines_fix
Vadim Pisarevsky [Tue, 17 Mar 2015 11:14:13 +0000 (11:14 +0000)]
Merge pull request #3824 from Milania1:tutorial_hough_lines_fix

9 years agoMerge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory
Vadim Pisarevsky [Mon, 16 Mar 2015 10:02:06 +0000 (10:02 +0000)]
Merge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory

9 years agofixed error in hough lines tutorial (the point (9,4) is not on the lines, but the...
Milania1 [Thu, 12 Mar 2015 15:46:25 +0000 (16:46 +0100)]
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)

9 years agoMerge pull request #3815 from StevenPuttemans:add_camera_IP_regulations
Vadim Pisarevsky [Thu, 12 Mar 2015 14:39:48 +0000 (14:39 +0000)]
Merge pull request #3815 from StevenPuttemans:add_camera_IP_regulations

9 years agoMerge pull request #3800 from StevenPuttemans:add_parameter_info_annotation
Vadim Pisarevsky [Thu, 12 Mar 2015 14:29:03 +0000 (14:29 +0000)]
Merge pull request #3800 from StevenPuttemans:add_parameter_info_annotation

9 years agoextra camera specific information for IP settings
StevenPuttemans [Tue, 10 Mar 2015 08:28:37 +0000 (09:28 +0100)]
extra camera specific information for IP settings

9 years agoupgrade traincascade default memory
StevenPuttemans [Mon, 9 Mar 2015 09:43:14 +0000 (10:43 +0100)]
upgrade traincascade default memory

9 years agoFix MinGW detection on x86
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.

9 years agoFix MinGW architecture detection
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.

9 years agoMerge pull request #3789 from StevenPuttemans:fix_cmakelist_annotation
Alexander Alekhin [Fri, 6 Mar 2015 14:53:42 +0000 (14:53 +0000)]
Merge pull request #3789 from StevenPuttemans:fix_cmakelist_annotation

9 years agoadding usage information
StevenPuttemans [Fri, 6 Mar 2015 12:47:43 +0000 (13:47 +0100)]
adding usage information

9 years agoupdate cmakelists of annotation tool
StevenPuttemans [Thu, 5 Mar 2015 13:22:43 +0000 (14:22 +0100)]
update cmakelists of annotation tool

9 years agoAdd -L for CUDA libs path to pkg-config
quentin [Thu, 5 Mar 2015 13:37:21 +0000 (14:37 +0100)]
Add -L for CUDA libs path to pkg-config

Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.

9 years agofixing undesired behaviour
StevenPuttemans [Wed, 4 Mar 2015 10:54:08 +0000 (11:54 +0100)]
fixing undesired behaviour

9 years agoMerge pull request #3774 from JoeHowse:2.4
Vadim Pisarevsky [Tue, 3 Mar 2015 12:31:29 +0000 (12:31 +0000)]
Merge pull request #3774 from JoeHowse:2.4

9 years agoCat face detection cascades
Joe Howse [Mon, 2 Mar 2015 15:58:08 +0000 (11:58 -0400)]
Cat face detection cascades

9 years agoMerge pull request #3761 from StevenPuttemans:fix_smile_model
Vadim Pisarevsky [Mon, 2 Mar 2015 11:49:41 +0000 (11:49 +0000)]
Merge pull request #3761 from StevenPuttemans:fix_smile_model

9 years agoMerge pull request #3754 from eliteraspberries:unsigned-mask
Vadim Pisarevsky [Mon, 2 Mar 2015 11:34:43 +0000 (11:34 +0000)]
Merge pull request #3754 from eliteraspberries:unsigned-mask

9 years agoMerge pull request #3755 from eliteraspberries:mat-size-sign
Vadim Pisarevsky [Mon, 2 Mar 2015 11:34:09 +0000 (11:34 +0000)]
Merge pull request #3755 from eliteraspberries:mat-size-sign

9 years agoMerge pull request #3745 from nitsch:fix-mingw-detection
Vadim Pisarevsky [Mon, 2 Mar 2015 10:55:00 +0000 (10:55 +0000)]
Merge pull request #3745 from nitsch:fix-mingw-detection

9 years agoMerge pull request #3756 from eliteraspberries:cast-double
Vadim Pisarevsky [Mon, 2 Mar 2015 10:52:28 +0000 (10:52 +0000)]
Merge pull request #3756 from eliteraspberries:cast-double

9 years agoMerge pull request #3766 from StevenPuttemans:add_GPU_old_models
Vadim Pisarevsky [Mon, 2 Mar 2015 10:49:38 +0000 (10:49 +0000)]
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models

9 years agoMerge pull request #3765 from jet47:gpu-hog-fix
Vadim Pisarevsky [Mon, 2 Mar 2015 10:34:51 +0000 (10:34 +0000)]
Merge pull request #3765 from jet47:gpu-hog-fix

9 years agoMerge pull request #3768 from jet47:gpumat-set-to
Vadim Pisarevsky [Mon, 2 Mar 2015 10:33:44 +0000 (10:33 +0000)]
Merge pull request #3768 from jet47:gpumat-set-to

9 years agofix tests for gpu HOG
Vladislav Vinogradov [Mon, 2 Mar 2015 08:02:47 +0000 (11:02 +0300)]
fix tests for gpu HOG

initialize HOG after CUDA device switch

9 years agofix GpuMat::setTo implementation
Vladislav Vinogradov [Fri, 27 Feb 2015 13:28:06 +0000 (16:28 +0300)]
fix GpuMat::setTo implementation

previous implementation was not thread/stream safe, since it used constant
memory

new implementation doesn't use any global objects, so it is thread/stream safe

9 years agoAdd GPU models in seperate folder, only old models are supported and they were replac...
StevenPuttemans [Fri, 27 Feb 2015 12:18:38 +0000 (13:18 +0100)]
Add GPU models in seperate folder, only old models are supported and they were replaced to make the CPU interface work.
This solves the undesired consequence of breaking the GPU interface.

9 years agofix gpu HOG implementation:
Vladislav Vinogradov [Fri, 27 Feb 2015 11:28:12 +0000 (14:28 +0300)]
fix gpu HOG implementation:

move hog::set_up_constants from constructor to compute method

if user changed CUDA device between constructor and computation,
some variables were uninitialized

9 years agofixing model size, typo in previous PR
StevenPuttemans [Thu, 26 Feb 2015 14:53:00 +0000 (15:53 +0100)]
fixing model size, typo in previous PR

9 years agoMerge pull request #3747 from StevenPuttemans:fix_annotationtool_extras
Vadim Pisarevsky [Wed, 25 Feb 2015 12:10:31 +0000 (12:10 +0000)]
Merge pull request #3747 from StevenPuttemans:fix_annotationtool_extras

9 years agoMerge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
Alexander Smorkalov [Wed, 25 Feb 2015 11:54:44 +0000 (11:54 +0000)]
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon

9 years agofix annotation tool, add auto make of tool
StevenPuttemans [Tue, 24 Feb 2015 15:02:15 +0000 (16:02 +0100)]
fix annotation tool, add auto make of tool

9 years agoset epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
Vladislav Vinogradov [Wed, 25 Feb 2015 10:16:36 +0000 (13:16 +0300)]
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic

9 years agoFix setting of architecture for MinGW builds
Alexander Nitsch [Tue, 24 Feb 2015 22:13:27 +0000 (23:13 +0100)]
Fix setting of architecture for MinGW builds

The architecture has been correctly determined earlier in this
file. No need to do it again.

9 years agoCast a long integer to double explicitly.
Mansour Moufid [Tue, 24 Feb 2015 22:04:28 +0000 (17:04 -0500)]
Cast a long integer to double explicitly.

9 years agoCast some image coordinates and sizes to double.
Mansour Moufid [Tue, 24 Feb 2015 17:21:34 +0000 (12:21 -0500)]
Cast some image coordinates and sizes to double.

9 years agoMerge pull request #3677 from ilya-lavrenov:cuda_backport
Alexander Smorkalov [Tue, 24 Feb 2015 15:06:15 +0000 (15:06 +0000)]
Merge pull request #3677 from ilya-lavrenov:cuda_backport

9 years agoMerge pull request #3653 from StevenPuttemans:add_annotationtool
Vadim Pisarevsky [Tue, 24 Feb 2015 13:50:39 +0000 (13:50 +0000)]
Merge pull request #3653 from StevenPuttemans:add_annotationtool