X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FVolumetric.hs;h=0d1dfaac641773cbc35e0f39147e6359f23613b1;hb=f720b869549f32762a03006b676afb484f7df64b;hp=64669fee1a7205f6a41d8cfa4718e4961a10ebf6;hpb=7d9913abf931dcbfe553c2cd872b604e5bbeafc0;p=spline3.git diff --git a/src/Volumetric.hs b/src/Volumetric.hs index 64669fe..0d1dfaa 100644 --- a/src/Volumetric.hs +++ b/src/Volumetric.hs @@ -40,7 +40,6 @@ import Data.Array.Repa.IO.Binary ( writeArrayToStorableFile ) import Data.Array.Repa.IO.BMP ( writeImageToBMP ) import Data.Array.Repa.Operators.Traversal ( unsafeTraverse ) -import Data.Array.Repa.Repr.Unboxed ( Unbox ) import Data.Array.Repa.Slice ( All( All ), Any( Any ) ) import Values ( Values, Values2D ) @@ -138,9 +137,9 @@ values_to_colors arr = truncate_rgb (r, g, b) = (r', g', b') where - r' = truncate (r * 255) - g' = truncate (g * 255) - b' = truncate (b * 255) + r' = truncate (r * 255) :: Word8 + g' = truncate (g * 255) :: Word8 + b' = truncate (b * 255) :: Word8 write_values_to_bmp :: FilePath -> Values2D -> IO () @@ -149,6 +148,6 @@ write_values_to_bmp path values = do writeImageToBMP path colors -z_slice :: (Unbox a, Source r a) => Int -> Array r DIM3 a -> Array D DIM2 a +z_slice :: (Source r a) => Int -> Array r DIM3 a -> Array D DIM2 a z_slice n arr = slice arr (Any :. n :. All :. All)