opencv

Commit Graph

Author	SHA1	Message	Date
Roman Donchenko	aaf97c4548	Merge pull request #1863 from nevion:master	11 years ago
Roman Donchenko	e7339ac11a	Merge pull request #1818 from GregoryMorse:patch-2	11 years ago
Roman Donchenko	e20f7014cf	Merge pull request #1835 from SpecLad:windows-xadd	11 years ago
Roman Donchenko	05e22ee8c9	Merge pull request #1859 from SpecLad:string-plus-equals	11 years ago
GregoryMorse	e4793e3d5e	Update system.cpp Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++ Update system.cpp Cleaned up whitespace, removed redundant code and added edge cases for string cleanup Update system.cpp Fixed compiler warning over comma operator clause Update system.cpp NULL initialization Update system.cpp Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer Update system.cpp Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference. Update system.cpp Fixed conditional compilation around include and library Update system.cpp Fixed trailing space Update system.cpp Cleaned up whitespace, removed redundant code and added edge cases for string cleanup Update system.cpp Fixed compiler warning over comma operator clause Update system.cpp NULL initialization Update system.cpp Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer Update system.cpp Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference. Update system.cpp Fixed conditional compilation around include and library Update system.cpp Fixed trailing space	11 years ago
Roman Donchenko	684ff70308	Merge pull request #1864 from berak:mouse_and_match	11 years ago
Roman Donchenko	52e810ed33	Merge pull request #1850 from ilya-lavrenov:pthread_mutex	11 years ago
berak	10639d63f5	mouse_and_match.py missing import cv2	11 years ago
Jason Newton	88b2fe9dbb	correct upper bound for maximum number of labels for 8-way connectivity	11 years ago
Andrey Pavlenko	3ab47300ce	Merge pull request #1862 from alalek:ocl_disable_tests	11 years ago
Alexander Alekhin	fd4a7e7d1f	ocl: disable tests	11 years ago
Andrey Pavlenko	b157cc17e9	Merge pull request #1857 from alalek:ocl_ta_tests_infra	11 years ago
Andrey Pavlenko	b82c55de12	Merge pull request #1861 from ilya-lavrenov:ocl_args_fix	11 years ago
Ilya Lavrenov	1af95ea12c	fixed error in setting kernel arguments	11 years ago
Alexander Alekhin	881e837520	ocl/core: added prototype for tests	11 years ago
Roman Donchenko	dd817857b4	Replaced most of the instances of "s = s +" with "s +=". This resynchronizes master code with 2.4. I say "most", because I might have missed some due to different spacing; I'll deal with those instances later if I find them.	11 years ago
Roman Donchenko	fc49d33c8d	Gave cv::String appropriate += operators. Note that since String is a reference to an immutable string, this doesn't actually change the string; it just replaces *this with a reference to the concatenated string.	11 years ago
Ilya Lavrenov	c8abb6124f	recursive mutex for linux	11 years ago
Andrey Pavlenko	c1f59c4c76	Merge pull request #1852 from ilya-lavrenov:ocl_retina	11 years ago
Ilya Lavrenov	8834d5e57b	changed eps in Retina_OCL test	11 years ago
Andrey Pavlenko	c33cb94d66	Merge pull request #1847 from ilya-lavrenov:ocl_imgproc_fix	11 years ago
Andrey Pavlenko	ca8c129c57	Merge pull request #1848 from ilya-lavrenov:warn	11 years ago
Ilya Lavrenov	650f92f9cc	eliminated warning C4267	11 years ago
Ilya Lavrenov	561a7f5782	fixed kernel compilation in imgproc module	11 years ago
Andrey Pavlenko	9bf2516eb1	Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation	11 years ago
Ilya Lavrenov	65b7e2018c	fixed kernel compilation	11 years ago
Andrey Pavlenko	8d1a8df1a9	Merge pull request #1824 from vpisarev:ocl_experiments5	11 years ago
Roman Donchenko	3703c7040a	Merge pull request #1828 from SpecLad:merge-2.4	11 years ago
Roman Donchenko	4cfbee70bd	Simplified the Windows implementation of CV_XADD. _InterlockedExchangeAdd is a Visual Studio intrinsic that's available for all architectures and in all VS versions that we care about. It's also faster than the underscore-less function, since it's an intrinsic. We also don't need to declare it ourselves. It is, however, a Visual Studio-specific intrinsic, so I changed the preprocessing condition accordingly. Fixes <http://code.opencv.org/issues/3365>.	11 years ago
Roman Donchenko	95006af170	Merge pull request #1816 from SpecLad:no-more-epoch	11 years ago
Roman Donchenko	63b3db53d7	Merge pull request #1830 from SpecLad:config-includes	11 years ago
Vadim Pisarevsky	ae8b2cbd68	fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)	11 years ago
Vadim Pisarevsky	677c7f27cb	fixed failure in Tonemap test	11 years ago
Roman Donchenko	ef27ac3782	In the example in OpenCVConfig.cmake.in, explicitly add the include paths. After #1801, the include directories are no longer added automatically, so we should show the user how to do that.	11 years ago
Roman Donchenko	7f935717cb	In OpenCVConfig.cmake.in, lowercased the commands in the example. This is the preferred style nowadays, and more consistent with the rest of the code.	11 years ago
Roman Donchenko	aacf188e83	Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts: modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/arithm.cpp modules/ocl/src/build_warps.cpp modules/ocl/src/color.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/split_merge.cpp modules/ocl/test/test_color.cpp samples/cpp/3calibration.cpp samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp samples/cpp/Qt_sample/main.cpp samples/cpp/camshiftdemo.cpp samples/cpp/descriptor_extractor_matcher.cpp samples/cpp/distrans.cpp samples/cpp/generic_descriptor_match.cpp samples/cpp/grabcut.cpp samples/cpp/morphology2.cpp samples/cpp/segment_objects.cpp samples/cpp/stereo_calib.cpp samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp samples/cpp/tutorial_code/introduction/display_image/display_image.cpp samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp samples/cpp/tutorial_code/objectDetection/objectDetection.cpp samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp samples/cpp/video_dmtx.cpp	11 years ago
Vadim Pisarevsky	d0b3c7a518	added some diagnostic into Tonemap test	11 years ago
Vadim Pisarevsky	8c44995ea6	another attempt to fix compile errors	11 years ago
Vadim Pisarevsky	241002384c	fixed some more compile errors	11 years ago
Vadim Pisarevsky	e2bbe7597b	fixed few compile errors and doc build errors	11 years ago
Vadim Pisarevsky	8762ee3f6f	removed unnecessary opencl kernels	11 years ago
Vadim Pisarevsky	d914f20a4c	updated patch to bring in the first functions with "transparent API"	11 years ago
Roman Donchenko	bb4bf7a1f9	Merge pull request #1811 from Nerei:fixed_some_build_errors	11 years ago
Roman Donchenko	7703b63cae	Merge pull request #1722 from StevenPuttemans:feature_1631_second	11 years ago
Roman Donchenko	4fd1960425	Merge pull request #1807 from KonstantinMatskevich:intel_bug	11 years ago
Roman Donchenko	3f927abb4d	Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn	11 years ago
Konstantin Matskevich	327d9f274b	fixed Split for device version equals 78712	11 years ago
Konstantin Matskevich	0e1717c14c	fixing bugs for Intel platform CPU device	11 years ago
Roman Donchenko	f5ded41016	Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz	11 years ago
StevenPuttemans	2b106db02f	Applied all fixes related to translating C to C++ code Also fixed some typos and code alignment Also adapted tutorial CPP samples Fixed some identation problems	11 years ago

1 2 3 4 5 ...

11133 Commits (aaf97c454848178857833075d996e6d56fa7d926) All Branches Search

11133 Commits (aaf97c454848178857833075d996e6d56fa7d926)

All Branches