Merge pull request #8 from NaturalHistoryMuseum/feature/7-numpy-inter…

…face

[#7] older numpy

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v0.1.3
+
+* #7 Support older numpy
+
 ### v0.1.2
 
 * #5 Better handling of DLLs

pyzbar/__init__.py

@@ -1,3 +1,3 @@
 """A ctypes-based wrapper around the zbar barcode reader."""
 
-__version__ = '0.1.2'
+__version__ = '0.1.3'

pyzbar/pyzbar.py

@@ -99,7 +99,12 @@ def decode(image, symbols=None):
             image = image[:, :, 0]
         if 'uint8' != str(image.dtype):
             image = image.astype('uint8')
-        pixels = image.tobytes()
+        try:
+            pixels = image.tobytes()
+        except AttributeError:
+            # `numpy.ndarray.tobytes()` introduced in `numpy` 1.9.0 - use the
+            # older `tostring` method.
+            pixels = image.tostring()
         height, width = image.shape[:2]
     else:
         # image should be a tuple (pixels, width, height)

pyzbar/tests/test_decode.py

@@ -3,6 +3,8 @@
 
 from pathlib import Path
 
+import numpy as np
+
 from PIL import Image
 
 try:
@@ -83,6 +85,11 @@ def test_empty(self):
         expected = []
         self.assertEqual(expected, res)
 
+    def test_decode_numpy(self):
+        "Read image using Pillow and convert to numpy.ndarray"
+        res = decode(np.asarray(self.code128))
+        self.assertEqual(self.EXPECTED_CODE128, res)
+
     @unittest.skipIf(cv2 is None, 'OpenCV not installed')
     def test_decode_opencv(self):
         "Read image using OpenCV"

requirements.pip

@@ -4,5 +4,6 @@ enum34==1.1.6; python_version == '2.7'
 # TODO How to specify OpenCV? 'cv2>=2.4.8'
 coveralls>=1.1
 nose>=1.3.4
+numpy>=1.8.2
 pathlib>=1.0.1; python_version == '2.7'
 Pillow>=3.2.0

setup.py

@@ -45,7 +45,8 @@ def readme():
     },
     'tests_require': [
         # TODO How to specify OpenCV? 'cv2>=2.4.8',
-        PILLOW
+        PILLOW,
+        'numpy>=1.8.2',
     ],
     'include_package_data': True,
     'classifiers': [