opencv

Commit Graph

Author	SHA1	Message	Date
Tony	bd12d64641	Merge branch 'gtk3' of https://github.com/Exocoder/opencv into gtk3 resyncing gtk3 with remote.	11 years ago
Tony	fd5e180657	Rebase branch gtk3	11 years ago
Tony	265148b974	Correction to enable compilation on platform with only GTK2 libs modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake	11 years ago
Tony	cb4fffc72a	Fix logic error in OpenCVFindLibsGUI.cmake When with_gtk is selected but GTK3 is not present the current logic fails to check for GTK2. This edit corrects this.	11 years ago
Tony	c0dbc083ea	Correct error with GTK3 not found selection When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum version requirements) is present. Selection logic for printing 'GTK: No' when the libraries are not found has also been removed so the message is printed when GTK is not found or selected in common with other libraries. Changes committed: modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake	11 years ago
Tony	65f63421fa	Change quotes around GTK headers for angle brackets The linux buildbots have started to fail compilation due to not finding the gtk headers. The quotes have been changed to angle brackets to indicate to the compiler that these are system includes.	11 years ago
Tony	a28ad40c2a	Fix bug in GTK+3 logic introduced by previous merge During merging of conflicting versions of this file, I erroneously deleted several lines in the GUI reporting section. This is repaired in this commit.	11 years ago
Tony	f318b5bc9d	Improve GTK+ library selection logic. The new logic will select GTK+3 by default if WITH_GTK is selected. If the GTK+3 libraries are not found, then GTK+2 libraries will be selected if found. This can be overridden by using WITH_GTK_2_X to force selection of GTK+2 (if found).	11 years ago
Tony	1638341270	Use GTK_VERSION_MAJOR to switch between GTK+ version two and three specific code. As a result of this, HAVE_GTK3 no longer needs to be exposed. The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the method used by HAVE_QT and HAVE_QT5. On branch gtk3 Changes to be committed: modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake modified: cmake/templates/cvconfig.h.in modified: modules/highgui/src/window.cpp modified: modules/highgui/src/window_gtk.cpp	11 years ago
Tony	befdef9685	Merge remote-tracking branch 'upstream/master' Rebase to lates upstream	11 years ago
Tony	512cb4fced	Correction to enable compilation on platform with only GTK2 libs modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake	11 years ago
Andrey Pavlenko	f104d5be8c	Merge pull request #2600 from ilya-lavrenov:ipp_calc_hist	11 years ago
Andrey Pavlenko	fd90efc9dd	Merge pull request #2593 from arkunze:pullreq/140319-color	11 years ago
Andrey Pavlenko	6bfbcf02cb	Merge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate	11 years ago
Andrey Pavlenko	f7f4593936	Merge pull request #2581 from vbystricky:ipp_moments	11 years ago
Andrey Pavlenko	7ae547a208	Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero	11 years ago
Andrey Pavlenko	b56dce3965	Merge pull request #2604 from alalek:binary_package_fix	11 years ago
Tony	8fd11f477b	Fix logic error in OpenCVFindLibsGUI.cmake When with_gtk is selected but GTK3 is not present the current logic fails to check for GTK2. This edit corrects this.	11 years ago
Tony	47d4f8cd61	Merge remote-tracking branch 'upstream/master' into gtk3 Conflicts: CMakeLists.txt	11 years ago
Ilya Lavrenov	b970ec7dae	parallel version	11 years ago
Elena Gvozdeva	43c29a6751	fixed	11 years ago
Vadim Pisarevsky	f417c79d16	Merge pull request #1932 from seth-planet:master	11 years ago
Vadim Pisarevsky	604a64b206	Merge pull request #2390 from nicolasmartin3d:master_bug3546	11 years ago
Vadim Pisarevsky	a0bf7f82ba	Merge pull request #2067 from pemmanuelviel:groupWiseCenterChooser	11 years ago
Vadim Pisarevsky	b5755b1228	Merge pull request #2588 from vpisarev:fix_samples_n_unused	11 years ago
Ilya Lavrenov	b2379b51b5	cv::countNonZero	11 years ago
Tony	34984328fd	Merge remote-tracking branch 'upstream/master' Conflicts: CMakeLists.txt	11 years ago
Tony	2f9dad5ce8	Correct error with GTK3 not found selection When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum version requirements) is present. Selection logic for printing 'GTK: No' when the libraries are not found has also been removed so the message is printed when GTK is not found or selected in common with other libraries. Changes committed: modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake	11 years ago
Ilya Lavrenov	18ef25ec30	cv::calcHist	11 years ago
Aaron Kunze	785acc1834	Fixes global size issue, adds #pragma unroll to loops	11 years ago
Alexander Alekhin	03773cb117	remove ippasync samples from build without IPP-A	11 years ago
Andrey Pavlenko	7b366df822	Merge pull request #2589 from alalek:icv_update	11 years ago
Andrey Pavlenko	cd02a7002b	Merge pull request #2596 from ilya-lavrenov:tapi_setto	11 years ago
Alexander Alekhin	ab691a4a24	ipp: some functions are not available in the ICV package #2	11 years ago
Alexander Alekhin	0d477ffea1	ipp: some functions are not available in the ICV package	11 years ago
Alexander Alekhin	1461ab41bc	ipp: added support for updated ICV package	11 years ago
vbystricky	b6d58d1d3b	Fix ipp ifdef	11 years ago
vbystricky	d9013a85f1	Fix IPP version ifdef	11 years ago
vbystricky	8899ec1586	Add IPP version of Moments calculattion of image	11 years ago
Andrey Pavlenko	ced81b9121	Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b	11 years ago
Andrey Pavlenko	e9bc737485	Merge pull request #2584 from akarsakov:ipp_threshold	11 years ago
Andrey Pavlenko	e6d6a3a85b	Merge pull request #2586 from ilya-lavrenov:ipp_disable	11 years ago
Ilya Lavrenov	bcd7151867	added UMat::setTo accuracy test	11 years ago
Andrey Pavlenko	e013f04669	Merge pull request #2583 from ilya-lavrenov:ippicv	11 years ago
Andrey Pavlenko	96484e1ad7	Merge pull request #2592 from ilya-lavrenov:tests	11 years ago
Ilya Lavrenov	4a63b3dd90	cv2cvtest part2	11 years ago
Alexander Karsakov	35494f81ef	Added ippiThreshold to cv::threshold	11 years ago
Elena Gvozdeva	6119ae0ea9	fixed	11 years ago
Aaron Kunze	629ddf0bf8	Resolves bug #3450 (Improperly cleaning up resources in DllMain)	11 years ago
Aaron Kunze	bea2515f0e	Optimizations for OpenCL color conversion.	11 years ago

1 2 3 4 5 ...

13130 Commits (bd12d646416ff32934c6723e4b56f92c7c6eee51) All Branches Search

13130 Commits (bd12d646416ff32934c6723e4b56f92c7c6eee51)

All Branches