From 3fa7e34537d897adacfe4881641952aec66a9991 Mon Sep 17 00:00:00 2001
From: bpinsard <bpinsard@imed.jussieu.fr>
Date: Thu, 25 Oct 2012 22:04:40 +0200
Subject: [PATCH 1/3] fix decimal rescale values causing Decimal data frame

---
 nibabel/nicom/dicomwrappers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nibabel/nicom/dicomwrappers.py b/nibabel/nicom/dicomwrappers.py
index c9aef8b75a..adacfc72c1 100644
--- a/nibabel/nicom/dicomwrappers.py
+++ b/nibabel/nicom/dicomwrappers.py
@@ -353,8 +353,8 @@ def is_same_series(self, other):
         return True
 
     def _scale_data(self, data):
-        scale = self.get('RescaleSlope', 1)
-        offset = self.get('RescaleIntercept', 0)
+        scale = float(self.get('RescaleSlope', 1))
+        offset = float(self.get('RescaleIntercept', 0))
         # a little optimization.  If we are applying either the scale or
         # the offset, we need to allow upcasting to float.
         if scale != 1:

From 6033206f99711797721138975a46dc8583617f0e Mon Sep 17 00:00:00 2001
From: bpinsard <bpinsard@imed.jussieu.fr>
Date: Mon, 3 Dec 2012 09:35:56 +0100
Subject: [PATCH 2/3] adding comment about float casting

---
 nibabel/nicom/dicomwrappers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nibabel/nicom/dicomwrappers.py b/nibabel/nicom/dicomwrappers.py
index adacfc72c1..03c5d8679d 100644
--- a/nibabel/nicom/dicomwrappers.py
+++ b/nibabel/nicom/dicomwrappers.py
@@ -353,6 +353,7 @@ def is_same_series(self, other):
         return True
 
     def _scale_data(self, data):
+        # depending on pydicom and dicom files, values might need casting from Decimal to float
         scale = float(self.get('RescaleSlope', 1))
         offset = float(self.get('RescaleIntercept', 0))
         # a little optimization.  If we are applying either the scale or

From 8e4477edc7894b89a1807d166521b8f15b2cc2e0 Mon Sep 17 00:00:00 2001
From: Brendan Moloney <moloney.brendan@gmail.com>
Date: Thu, 28 Feb 2013 22:50:52 -0800
Subject: [PATCH 3/3] TST: Added test for decimal rescale issue.

---
 nibabel/nicom/tests/data/decimal_rescale.dcm | Bin 0 -> 26650 bytes
 nibabel/nicom/tests/test_dicomwrappers.py    |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 nibabel/nicom/tests/data/decimal_rescale.dcm

diff --git a/nibabel/nicom/tests/data/decimal_rescale.dcm b/nibabel/nicom/tests/data/decimal_rescale.dcm
new file mode 100644
index 0000000000000000000000000000000000000000..148454a3acf09cd3ef9384af800657dab5a278f6
GIT binary patch
literal 26650
zcmeH|OK%)S5XZ|CV+O}b#&$5Xh{GfS$$QvQchCERcC)*VNAf;rjfJ$*8i7HU@B<Sh
za>BgDEeLYun<4p=5dPivjt5_I$bn0Z<eh(4S65g6s-{i!|300(-LsIw?#?3pg||fu
zG<dAvcor<Yck_2i`pQp3;Y%Sz>PNoxL;T?v^S9t(8;`(@9gOeaSfSTT_^x5j#a!UW
zS20u+ionFu^XpV>FH`66(~~0)yLlFEP^)WGD<8Lqt#)D48`LhADK7@IeC#0|n`~G%
zXfV#7<o(vpbU4m?t?|dx@wDIZZ0y)+A-fETOCfFSFzMYTDMc8Bekv90@bYeWJ-9J`
zcw_wN##mfN6+xsjKh>M*sIuHkM!pE+ORKu_jZ_%>adhPyl)lxxhTuUs;Xcl2QEzP1
zDeVkwD)Mfx+b^)kImV0BIzBnJ>3b?BbN!r#{ke9WVtcNIbM5~j^n29)Xm<3;>FoI6
zo3oSIR}(qgYDslG$)!pWzgh7gI@d8zEBZNnY?_=Mo=gsp^qSRTMD!BRKQHOx@_pw*
zH`J@ge;YrCoHBn0)tTq)koXUIhnkmUJgjh9V3cL>aXQ5cWx`Kn8m3VcdM;wLizRw8
zo}z7BdSFJyaM~MU^w7k}hb}!bN_AX%ALN(l^DotB5*{BIdmm~@9qbZ8onI>9f_tY}
zB;{-C4@Sp961()H@zCpkf?6i20$)WUij_-0Bfdp)+ofO7%~0_A)%XWczZqKszu(K*
zKTKq_Jm&v2o=N1=3u6sa1uK=c!g--r=<8?4Uz~WovG-UeF1Wm^-Y$*SitQC@4`<zP
zpPn5Y9X@^LlC!>xFYjCz5S{4K+Ik!3Z4Y*^=lylfLn70+VYNsz+JFsJ@P$yZO41-z
zvB*-FT;r?rr;(1ZwN-dERC-?B8rhDv>u#>mTjgnLbg%5-8m*Sv!&*bp^Jw*w7}VMo
zF%RE*j%d1%JyPJLs3B$Si#QEq6`(nSX(LPgOvqG5Dvf0tO&cL<6a*rXK@ck`JxZ`L
zBso<F4I$&Hm^S9h&$2L0MItgKqfAZp{U~*LvjEZK#4}$Hq4!$oNQW8$ZaTeJ2(KVf
zo4E0I!EAvx2|UrWy+MD_-X0HnUFB`!bb59lv#Um(L!tlShr3rrQ}YWyTF`zDW*3ZF
zfwGLc4Ry;Xf?6uon?}8WZHUa!yNTX!WHjJFkD-^S5sFNY3XCk$J`+?$XT3?gP&V!5
z{mx)ddi6>j>&SOr(|V<*^-4|a<d(IrQ?0CZo%UDfYZdL6_9k_#>P_CHu4Qg=+_?e3
zC;DHL*QCOl-*ruzSo27uN_L}4Mx#nbBU&zZ8`15GUa9CiW%rHfZpD7DqSq=u>lM9G
z@p-3WzdrrNcMc8q%x7l4HvVA(On?b60Vco%m;e)C0!)AjFaajO1egF5U;<2l2`~XB
zzyz286JP>NfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO1egF5U;<2l2`~XB
zzyz286JP>NfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO1egF5U;<2l2`~XB
Wzyz286JP>NfC(@GCcp$<kHEi~CVAcf

literal 0
HcmV?d00001

diff --git a/nibabel/nicom/tests/test_dicomwrappers.py b/nibabel/nicom/tests/test_dicomwrappers.py
index 8017c1f12e..22c79338a5 100644
--- a/nibabel/nicom/tests/test_dicomwrappers.py
+++ b/nibabel/nicom/tests/test_dicomwrappers.py
@@ -31,6 +31,7 @@
     DATA = None
 DATA_FILE_B0 = pjoin(IO_DATA_PATH, 'siemens_dwi_0.dcm.gz')
 DATA_FILE_SLC_NORM = pjoin(IO_DATA_PATH, 'csa_slice_norm.dcm')
+DATA_FILE_DEC_RSCL = pjoin(IO_DATA_PATH, 'decimal_rescale.dcm')
 
 # This affine from our converted image was shown to match our image
 # spatially with an image from SPM DICOM conversion. We checked the
@@ -171,3 +172,10 @@ def test_assert_parallel():
     dw = didw.wrapper_from_file(DATA_FILE_SLC_NORM)
     dw.image_orient_patient = np.c_[[1., 0., 0.], [0., 1., 0.]]
     assert_raises(AssertionError, dw.__getattribute__, 'slice_normal')
+    
+@dicom_test
+def test_decimal_rescale():
+    #Test that we don't get back a data array with dtpye np.object when our 
+    #rescale slope is a decimal
+    dw = didw.wrapper_from_file(DATA_FILE_DEC_RSCL)
+    assert dw.get_data().dtype != np.object
\ No newline at end of file