Merge pull request #226 from caspervdw/release-0.3.3

FIX Two fixes after release 0.3.3rc1

Author: tacaswell

.gitattributes

@@ -1,2 +1,8 @@
 trackpy/_version.py export-subst
 pims/_version.py export-subst
+*.pkl binary
+*.spe binary
+*.tif binary
+*.mov binary
+*.seq binary
+*.nd2 binary

pims/display.py

@@ -445,7 +445,7 @@ def plot_to_frame(fig, width=512, close_fig=False, fig_size_inches=None,
     with _fig_size_cntx(fig, fig_size_inches, tight_layout) as fig:
         width_in, height_in = fig.get_size_inches()
         dpi = width / width_in
-        buf_shape = (height_in * dpi, width_in * dpi, 4)
+        buf_shape = (int(height_in * dpi), int(width_in * dpi), 4)
         fig.savefig(buf, format='rgba', dpi=dpi)
 
     buf.seek(0)

pims/tests/test_common.py

@@ -722,9 +722,6 @@ def test_metadata(self):
                 d = pickle.load(p)
             else:
                 d = pickle.load(p, encoding="latin1")
-                # unpickling fails on Py3.4, Win7, 64-bit:
-                # UnpicklingError: the STRING opcode argument must be quoted
-
                 #spare4 is actually a byte array
                 d["spare4"] = d["spare4"].encode("latin1")