From 0bea755e70c88f7d4ba78ad98df58bef3c3b6cb5 Mon Sep 17 00:00:00 2001
From: Dan Schultzer <dan@dreamconception.com>
Date: Thu, 22 Sep 2016 12:09:15 -0700
Subject: [PATCH 1/4] Added 6.0.0 change log

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc95f42b..66e6f4e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,32 @@
 
 # Changelog
 
+
+## 6.0.0
+
+# Enhancements
+- @wenq added `contour.moments` method.
+- @andreasgal added `matrix.substract` method.
+- @jainanshul added `matrix.mean` method.
+- @idubinskiy restored `contour.points` method.
+- @danschultzer updated node-pre-gyp to fix load of node-opencv in electron runtime.
+- @andreasgal made `matrix.getData` work with RGB images.
+- @Evilcat325 added `matrix.MatchTemplateByMatrix` method.
+
+# Bug fixes
+- @dominikdolancic fixed image load issue in `matrix.matchTemplate()`.
+- @AwooOOoo fixed `type_info` errors in Visual Studio with std namespace pollution.
+- @mvines fixed issue that prevented `AsyncSaveWorker` from using de-allocated memory.
+- @mcwhittemore fixed dissimilarity example image load.
+- @saoron fixed dead index.html documentup source.
+- @andreasgal fixed an issue with `matrix.crop` (and potentially others), where `matrix.getData` ends up returning less than full matrix.
+
+## Backwards incompatible changes
+- @dxprog changed readImage to load image with `CV_LOAD_IMAGE_UNCHANGED` instead of `CV_LOAD_IMAGE_COLOR`. The latter returned the image as 3-channel.
+- @danschultzer changed `VideoCapture.close` to `VideoCapture.release`.
+
+Thanks all.
+
 ## 5.0.0 (Feb 9 2016)
 
 - @mvines and @svogl started working on OpenCV 3.x support.

From d64b28304d92ec8f27172b861ee0c870498514b8 Mon Sep 17 00:00:00 2001
From: Dan Schultzer <dan@dreamconception.com>
Date: Thu, 22 Sep 2016 12:09:20 -0700
Subject: [PATCH 2/4] Bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 054372fc..5154262e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opencv",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "Node Bindings to OpenCV",
   "author": "Peter Braden <peterbraden@peterbraden.co.uk>",
   "dependencies": {

From 782efa994aaabc94b1df52daa927b67bdef3edf8 Mon Sep 17 00:00:00 2001
From: Peter Braden <peterbraden@peterbraden.co.uk>
Date: Fri, 23 Sep 2016 12:29:05 +0200
Subject: [PATCH 3/4] Add thanks

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66e6f4e9..e05edd32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,8 @@
 - @dxprog changed readImage to load image with `CV_LOAD_IMAGE_UNCHANGED` instead of `CV_LOAD_IMAGE_COLOR`. The latter returned the image as 3-channel.
 - @danschultzer changed `VideoCapture.close` to `VideoCapture.release`.
 
-Thanks all.
+Thanks to all, also a massive thanks to @danschultzer for helping get the open
+tickets and PR's under control.
 
 ## 5.0.0 (Feb 9 2016)
 

From d47b6f6ce3b7e63426eee075f922d07dba02ea85 Mon Sep 17 00:00:00 2001
From: Dan Schultzer <dan@dreamconception.com>
Date: Fri, 23 Sep 2016 03:32:45 -0700
Subject: [PATCH 4/4] Update bug fixes/enhancements

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e05edd32..0707b1d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - @danschultzer updated node-pre-gyp to fix load of node-opencv in electron runtime.
 - @andreasgal made `matrix.getData` work with RGB images.
 - @Evilcat325 added `matrix.MatchTemplateByMatrix` method.
+- @danschultzer added code coverage.
 
 # Bug fixes
 - @dominikdolancic fixed image load issue in `matrix.matchTemplate()`.
@@ -20,6 +21,7 @@
 - @mcwhittemore fixed dissimilarity example image load.
 - @saoron fixed dead index.html documentup source.
 - @andreasgal fixed an issue with `matrix.crop` (and potentially others), where `matrix.getData` ends up returning less than full matrix.
+- @danschultzer fixed `examples/test.js` channel issue, and problematic Vec3b casting (instead of Vec3f) in `matrix.set`.
 
 ## Backwards incompatible changes
 - @dxprog changed readImage to load image with `CV_LOAD_IMAGE_UNCHANGED` instead of `CV_LOAD_IMAGE_COLOR`. The latter returned the image as 3-channel.