Make the minimum number of changes necessary to work with repa-3.1.1.1. Unfortunately...

[spline3.git] / src / MRI.hs

diff --git a/src/MRI.hs b/src/MRI.hs
index a246bf53d6cca7202fe25c921c1b6c183ec34965..094991c2dac537b38e18bd992b7dfe90737ea726 100644 (file)
--- a/src/MRI.hs
+++ b/src/MRI.hs
@@ -20,11 +20,13 @@ where
 
 import Data.Word
 import Data.Bits
-import Data.Array.Repa                  as R
-import Data.Array.Repa.Repr.Unboxed     as R
-import Data.Array.Repa.IO.Binary        as R
+import Data.Array.Repa                          as R
+import Data.Array.Repa.Eval                     as R (now)
+import Data.Array.Repa.Repr.Unboxed             as R
+import Data.Array.Repa.IO.Binary                as R
 import Data.Array.Repa.Algorithms.ColorRamp     as R
-import Data.Array.Repa.IO.BMP           as R (writeImageToBMP)
+import Data.Array.Repa.Operators.Traversal      as R (unsafeTraverse)
+import Data.Array.Repa.IO.BMP                   as R (writeImageToBMP)
 
 import Values
 
@@ -64,7 +66,7 @@ type ColorData sh = Array U sh RGB
 read_word16s :: FilePath -> IO RawData3D
 read_word16s path = do
   arr <- R.readArrayFromStorableFile path mri_shape
-  now $ R.copy arr
+  now $ R.copyS arr
 
 
 
@@ -123,7 +125,7 @@ write_word16s = R.writeArrayToStorableFile
 
 values_to_colors :: (Shape sh) => (Values sh) -> (ColorData sh)
 values_to_colors arr =
-  R.compute $ R.map (truncate_rgb . ramp_it) arr
+  R.computeS $ R.map (truncate_rgb . ramp_it) arr
   where
     ramp_it :: Double -> (Double, Double, Double)
     ramp_it x =
@@ -151,4 +153,4 @@ write_values_slice_to_bitmap v3d path =
   R.writeImageToBMP path colors
   where
     arr_bracketed = bracket_array v3d
-    colors = values_to_colors $ R.compute $ R.map fromIntegral arr_bracketed
+    colors = values_to_colors $ R.computeS $ R.map fromIntegral arr_bracketed