495 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Max Ehrlich	81f36f9321	Merge remote-tracking branch 'upstream/master'	2015-02-13 12:19:51 -05:00
Max Ehrlich	c1686749bd	Merge remote-tracking branch 'upstream/master'	2015-02-13 12:19:00 -05:00
Peter Braden	e7604cda59	missing comma v3.0.0	2015-02-11 21:49:05 +01:00
Peter Braden	94dcfda3c2	Bump the version. 3.0.0	2015-02-11 21:47:31 +01:00
Peter Braden	6725545e33	Merge branch 'test-examples' ... Conflicts: package.json	2015-02-11 21:44:20 +01:00
Peter Braden	efb9bf5356	disable broken example	2015-02-11 21:38:49 +01:00
Peter Braden	2c6ec42ffd	Don't fail the build if package upload fails	2015-02-11 21:24:59 +01:00
Peter Braden	efc2f6a881	Missed a character... [publish binary]	2015-02-11 21:17:30 +01:00
Peter Braden	f485906bc0	[publish binary] Lets test this	2015-02-11 20:52:56 +01:00
Peter Braden	bd6629de47	Appveyor keys	2015-02-11 20:46:15 +01:00
Peter Braden	2eaf099b35	New Travis keys	2015-02-11 20:38:39 +01:00
Peter Braden	1baad7b364	Merge branch 'master' into hybridgroup-master ... Conflicts: .travis.yml	2015-02-11 20:34:09 +01:00
Peter Braden	7af5707be1	Update Car Detection cascade for example ... re http://code.opencv.org/issues/2387	2015-02-11 20:24:17 +01:00
Peter Braden	0c72d55ec4	Fix example paths	2015-02-11 20:15:01 +01:00
Peter Braden	091447b573	Merge branch 'master' into test-examples ... Conflicts: src/Matrix.cc	2015-02-11 19:59:30 +01:00
Peter Braden	081ca6056f	Much overdue release. 2.0.0	2015-02-11 19:52:50 +01:00
Peter Braden	9e4f904da7	Keep changelog up to date	2015-02-11 19:52:11 +01:00
Peter Braden	4618b15880	Travis test 0.12	2015-02-11 19:45:13 +01:00
Peter Braden	ae5887c4cd	Use Nan for rest of the method	2015-02-11 19:44:38 +01:00
Peter Braden	03ce7973bf	Use Nan for template matches	2015-02-11 19:20:19 +01:00
Peter Braden	c5bd3e89bd	Merge branch 'master' into oskardahlberg-templateMatches	2015-02-11 18:47:04 +01:00
Peter Braden	373fa339f7	Remove unused 'sleep_for' variable to suppress compile warning	2015-02-11 18:46:23 +01:00
Peter Braden	aa8ee12587	Merge branch 'templateMatches' of https://github.com/oskardahlberg/node-opencv into oskardahlberg-templateMatches ... Conflicts: src/Matrix.cc	2015-02-11 18:46:13 +01:00
Peter Braden	cfc6c16721	Remove unused 'sleep_for' variable to suppress compile warning	2015-02-11 18:35:00 +01:00
Peter Braden	c36350ade8	Move smoke test into makefile	2015-02-11 18:32:25 +01:00
Peter Braden	1418336348	Merge pull request #221 from Queuecumber/master ... Removed unused code to avoid compile warning	2015-02-10 08:26:14 +01:00
edgarsilva	3558be3d50	Always build from source in appveyor.	2015-02-06 15:40:25 -06:00
Edgar O Silva	c776475f3a	Merge pull request #10 from hybridgroup/custom-os-cflags ... Custom os cflags, fixes pre compiled binaries	2015-02-06 13:24:52 -06:00
edgarsilva	44695e0c61	Test install from pre compiled binaries	2015-02-06 11:26:46 -06:00
edgarsilva	055c7a2405	Bring back node-pre-gyp info to investigate why branch passes but not master.	2015-02-05 18:31:13 -06:00
edgarsilva	a04ba455dd	Remove node-pre-gyp info call, since it is failing on windows.	2015-02-05 17:48:44 -06:00
edgarsilva	a405869720	Test node-pre-gyp info for 64 bit.	2015-02-05 17:31:04 -06:00
edgarsilva	081ac43f1b	Added all opencv libraries to opencv.pc file.	2015-02-05 16:53:02 -06:00
edgarsilva	90244f1db2	Print available libraries for opencv.	2015-02-05 16:24:18 -06:00
edgarsilva	16380f445e	Fix missing targets from bindings to make tests pass.	2015-02-04 13:02:09 -06:00
edgarsilva	7d16f2e046	Return to old version of opencv to try compilation.	2015-02-04 12:51:35 -06:00
Max Ehrlich	037fa6a7a5	Removed unused code to avoid compile warning	2015-02-04 13:27:11 -05:00
edgarsilva	9035d9b0fb	Fix merge issue with main repo master	2015-02-04 12:05:48 -06:00
edgarsilva	37bda024c2	Force ppa update to get newer version of opencv.	2015-02-04 11:56:12 -06:00
edgarsilva	aeff4d10f6	Update travis opencv version.	2015-02-04 11:51:29 -06:00
edgarsilva	4bc20cda6f	Fix issue with different versions of opencv installed in different OSs, updated cflags opencv version in bindings.gyp	2015-02-04 11:22:09 -06:00
Peter Braden	6aaea0978c	Merge pull request #220 from Queuecumber/master ... More camera calibration functions	2015-02-02 18:48:42 +01:00
Max Ehrlich	8ed5177c34	Added map1 type paramter to initUndistortRectifyMap	2015-01-27 12:59:51 -05:00
Max Ehrlich	d9aaf529f8	Fixed bug causing image sizes to be transposed	2015-01-27 12:55:42 -05:00
Max Ehrlich	3d09bb30ea	Added remap	2015-01-27 12:55:32 -05:00
Max Ehrlich	51be174b6e	Added interpolation constants	2015-01-27 12:22:05 -05:00
Max Ehrlich	a66d95b537	Added initUndistortRectifyMap	2015-01-27 12:02:08 -05:00
Max Ehrlich	b76c39a42e	Added getOptimalNewCameraMatrix	2015-01-27 11:49:01 -05:00
Max Ehrlich	92f0bf80e5	Added cv::undistort	2015-01-27 11:16:36 -05:00
Max Ehrlich	96068dd7a9	Added stub imgproc source file	2015-01-27 10:53:06 -05:00