Merge 984f4b3 into 3d5c093

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2018-2019, Alexey Kuleshevich
+Copyright (c) 2018-2020, Alexey Kuleshevich
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

massiv-io/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.2.0
+
+* Switch to `MonadIO`
+* Write files with durability and atomicity guarantees
+* Switch to `encodeM` and `decodeM`, as well as corresponding `encodeImageM` and `decodeImageM`
+* Addition of `decodeWithMetadataM`
+* Addition of `ConvertError`, `DecodeError` and `EncodeError`.
+* Got rid of `ReadOptions`
+* Switch to `Color` package for pixels and color space coversion
+
 # 0.1.9
 
 * Fix `HDR` decoding, i.e. `.hdr` and `.pic` file reading.

massiv-io/LICENSE

@@ -1,4 +1,4 @@
-Copyright Alexey Kuleshevich (c) 2017
+Copyright Alexey Kuleshevich (c) 2017-2020
 
 All rights reserved.
 

massiv-io/Setup.hs

@@ -1,2 +1,33 @@
+{-# LANGUAGE CPP #-}
+{-# OPTIONS_GHC -Wall #-}
+module Main (main) where
+
+#ifndef MIN_VERSION_cabal_doctest
+#define MIN_VERSION_cabal_doctest(x,y,z) 0
+#endif
+
+#if MIN_VERSION_cabal_doctest(1,0,0)
+
+import Distribution.Extra.Doctest ( defaultMainWithDoctests )
+main :: IO ()
+main = defaultMainWithDoctests "doctests"
+
+#else
+
+#ifdef MIN_VERSION_Cabal
+-- If the macro is defined, we have new cabal-install,
+-- but for some reason we don't have cabal-doctest in package-db
+--
+-- Probably we are running cabal sdist, when otherwise using new-build
+-- workflow
+#warning You are configuring this package without cabal-doctest installed. \
+         The doctests test-suite will not work as a result. \
+         To fix this, install cabal-doctest before configuring.
+#endif
+
 import Distribution.Simple
+
+main :: IO ()
 main = defaultMain
+
+#endif

massiv-io/massiv-io.cabal

@@ -1,5 +1,5 @@
 name:                massiv-io
-version:             0.1.9.0
+version:             0.2.0.0
 synopsis:            Import/export of Image files into massiv Arrays
 description:         This package contains functionality for import/export of arrays
                      into the real world. For now it only has the ability to read/write
@@ -9,41 +9,46 @@ license:             BSD3
 license-file:        LICENSE
 author:              Alexey Kuleshevich
 maintainer:          alexey@kuleshevi.ch
-copyright:           2018-2019 Alexey Kuleshevich
+copyright:           2018-2020 Alexey Kuleshevich
 category:            Data, Data Structures
-build-type:          Simple
+build-type:          Custom
+extra-doc-files:     files/*.jpg
 extra-source-files:  README.md
                    , CHANGELOG.md
 cabal-version:       >=1.10
+custom-setup
+  setup-depends:
+      base
+    , Cabal
+    , cabal-doctest >=1.0.6
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Graphics.ColorSpace
-                     , Graphics.ColorSpace.Binary
-                     , Graphics.ColorSpace.CMYK
-                     , Graphics.ColorSpace.Complex
-                     , Graphics.ColorSpace.HSI
-                     , Graphics.ColorSpace.RGB
-                     , Graphics.ColorSpace.X
-                     , Graphics.ColorSpace.Y
-                     , Graphics.ColorSpace.YCbCr
-                     , Data.Massiv.Array.IO
-  other-modules:       Graphics.ColorSpace.Elevator
-                     , Graphics.ColorSpace.Internal
-                     , Data.Massiv.Array.IO.Base
+  exposed-modules:     Data.Massiv.Array.IO
+                     , Graphics.ColorModel
+  other-modules:       Data.Massiv.Array.IO.Base
                      , Data.Massiv.Array.IO.Image
                      , Data.Massiv.Array.IO.Image.JuicyPixels
+                     , Data.Massiv.Array.IO.Image.JuicyPixels.Base
+                     , Data.Massiv.Array.IO.Image.JuicyPixels.BMP
+                     , Data.Massiv.Array.IO.Image.JuicyPixels.GIF
+                     , Data.Massiv.Array.IO.Image.JuicyPixels.HDR
+                     , Data.Massiv.Array.IO.Image.JuicyPixels.JPG
+                     , Data.Massiv.Array.IO.Image.JuicyPixels.PNG
+                     , Data.Massiv.Array.IO.Image.JuicyPixels.TGA
+                     , Data.Massiv.Array.IO.Image.JuicyPixels.TIF
                      , Data.Massiv.Array.IO.Image.Netpbm
   build-depends:       base            >= 4.8 && < 5
                      , bytestring
+                     , Color           >= 0.1.2
                      , data-default-class
                      , deepseq
-                     , directory
-                     , filepath        >= 1.0
-                     , massiv          >= 0.1.1
-                     , process
-                     , JuicyPixels     >= 3.2.7
+                     , exceptions
+                     , filepath
+                     , massiv          >= 0.3
+                     , JuicyPixels     >= 3.3
                      , netpbm
+                     , unliftio        >= 0.2.12
                      , vector          >= 0.10
   default-language:    Haskell2010
   ghc-options:         -Wall
@@ -59,3 +64,17 @@ library
 source-repository head
   type:     git
   location: https://github.com/lehins/massiv
+
+test-suite doctests
+  type:             exitcode-stdio-1.0
+  hs-source-dirs:   tests
+  main-is:          doctests.hs
+  build-depends: base
+               , doctest >=0.15
+               , QuickCheck
+               , template-haskell
+  default-language:    Haskell2010
+
+source-repository head
+  type:     git
+  location: https://github.com/lehins/massiv