From 63b121a0397d4d2d8898a2a9f266859b047ba491 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 15 Apr 2015 21:35:23 -0400 Subject: [PATCH] Import cleanup and hlint fix in Main. --- src/Main.hs | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/Main.hs b/src/Main.hs index 6848ff8..89ac446 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -3,17 +3,16 @@ module Main where -import Data.Maybe (fromJust) -import Control.Monad (when) +import Control.Monad ( when ) import qualified Data.Array.Repa as R -import Data.Maybe (isJust) -import GHC.Conc (getNumProcessors, setNumCapabilities) -import System.IO (hPutStrLn, stderr) -import System.Exit (exitSuccess, exitWith, ExitCode(..)) +import Data.Maybe ( fromJust ) +import GHC.Conc ( getNumProcessors, setNumCapabilities ) +import System.IO ( hPutStrLn, stderr ) +import System.Exit ( exitSuccess, exitWith, ExitCode(..) ) -import CommandLine (Args(..), apply_args) +import CommandLine ( Args(..), apply_args ) import ExitCodes -import Grid (zoom) +import Grid ( zoom ) import Volumetric ( bracket_array, flip_x, @@ -23,8 +22,7 @@ import Volumetric ( swap_bytes, write_values_to_bmp, write_word16s, - z_slice - ) + z_slice ) validate_args :: Args -> IO () @@ -66,20 +64,17 @@ main = do num_procs <- getNumProcessors setNumCapabilities num_procs - -- Determine whether we're doing 2d or 3d. If we're given a slice, - -- assume 2d. let shape = (R.Z R.:. depth R.:. height R.:. width) :: R.DIM3 - if (isJust slice) then - main2d args shape - else - main3d args shape + -- Determine whether we're doing 2d or 3d. If we're given a slice, + -- assume 2d. + let main_function = case slice of + Nothing -> main3d + Just _ -> main2d + main_function args shape exitSuccess - where - - main3d :: Args -> R.DIM3 -> IO () main3d Args{..} shape = do -- 2.44.2