Merge pull request #199 from taruti/master

Add Native images to Diagrams.TwoD.Image
diagrams · Jun 23, 2014 · 32fa6ec · 32fa6ec
2 parents 34d0272 + f1e9edb
commit 32fa6ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Diagrams/TwoD.hs b/src/Diagrams/TwoD.hs
@@ -163,7 +163,7 @@ module Diagrams.TwoD
 
          -- * Images
        , DImage(..), ImageData(..)
-       , Embedded, External
+       , Embedded, External, Native
        , image
        , loadImageEmb
        , loadImageExt

diff --git a/src/Diagrams/TwoD/Image.hs b/src/Diagrams/TwoD/Image.hs
@@ -20,7 +20,7 @@
 module Diagrams.TwoD.Image
     (
       DImage(..), ImageData(..)
-    , Embedded, External
+    , Embedded, External, Native
     , image
     , loadImageEmb
     , loadImageExt
@@ -49,12 +49,15 @@ import           Data.Semigroup
 
 data Embedded deriving Typeable
 data External deriving Typeable
+data Native (t :: *) deriving Typeable
 
 -- | 'ImageData' is either a JuicyPixels @DynamicImage@ tagged as 'Embedded' or
---   a reference tagged as 'External'.
+--   a reference tagged as 'External'. Additionally 'Native' is provided for
+--   external libraries to hook into.
 data ImageData :: * -> * where
   ImageRaster :: DynamicImage -> ImageData Embedded
   ImageRef :: FilePath -> ImageData External
+  ImageNative :: t -> ImageData (Native t)
 
 -------------------------------------------------------------------------------
 -- | An image primitive, the two ints are width followed by height.