Merge branch 'release/v0.1.2'

colour-science · Jul 29, 2016 · 3836ea2 · 3836ea2
2 parents a258441 + 765cc16
commit 3836ea2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -7,7 +7,11 @@ Colour - Demosaicing
 -   **Thomas Mansencal**, *Visual Effects Artist @ Weta Digital*
 
     Project coordination, overall development.
-
+
+-   **Wayne Prentice**
+
+    Technical support.
+
 About
 -----
 

diff --git a/colour_demosaicing/__init__.py b/colour_demosaicing/__init__.py
@@ -40,7 +40,7 @@
 
 __major_version__ = '0'
 __minor_version__ = '1'
-__change_version__ = '1'
+__change_version__ = '2'
 __version__ = '.'.join((__major_version__,
                         __minor_version__,
                         __change_version__))
diff --git a/colour_demosaicing/bayer/demosaicing/menon2007.py b/colour_demosaicing/bayer/demosaicing/menon2007.py
@@ -110,8 +110,8 @@ def demosaicing_CFA_Bayer_Menon2007(CFA, pattern='RGGB', refining_step=True):
     G = CFA * G_m
     B = CFA * B_m
 
-    G_H = np.where(G == 0, _cnv_h(CFA, h_0) + _cnv_h(CFA, h_1), G)
-    G_V = np.where(G == 0, _cnv_v(CFA, h_0) + _cnv_v(CFA, h_1), G)
+    G_H = np.where(G_m == 0, _cnv_h(CFA, h_0) + _cnv_h(CFA, h_1), G)
+    G_V = np.where(G_m == 0, _cnv_v(CFA, h_0) + _cnv_v(CFA, h_1), G)
 
     C_H = np.where(R_m == 1, R - G_H, 0)
     C_H = np.where(B_m == 1, B - G_H, C_H)

diff --git a/colour_demosaicing/resources/colour-demosaicing-tests-dataset b/colour_demosaicing/resources/colour-demosaicing-tests-dataset
diff --git a/docs/conf.py b/docs/conf.py
@@ -79,7 +79,7 @@
 # The short X.Y version.
 version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.1'
+release = '0.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -43,7 +43,7 @@
                                  'mock==1.0.1']
 
 setup(name='colour-demosaicing',
-      version='0.1.1',
+      version='0.1.2',
       author=__author__,
       author_email=__email__,
       include_package_data=True,