Rasterific 0.6.1 → 0.6.1.1
raw patch · 5 files changed
+17/−15 lines, 5 filesdep ~FontyFruitydep ~basedep ~containersPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: FontyFruity, base, containers
API changes (from Hackage documentation)
- Graphics.Rasterific: _bezierX0 :: Bezier -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _bezierX1 :: Bezier -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _bezierX2 :: Bezier -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _cBezierX0 :: CubicBezier -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _cBezierX1 :: CubicBezier -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _cBezierX2 :: CubicBezier -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _cBezierX3 :: CubicBezier -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _lineX0 :: Line -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _lineX1 :: Line -> {-# UNPACK #-} !Point
- Graphics.Rasterific: _pathClose :: Path -> Bool
- Graphics.Rasterific: _pathCommand :: Path -> [PathCommand]
- Graphics.Rasterific: _pathOriginPoint :: Path -> Point
- Graphics.Rasterific: _planeMaxBound :: PlaneBound -> !Point
- Graphics.Rasterific: _planeMinBound :: PlaneBound -> !Point
- Graphics.Rasterific: _text :: TextRange px -> String
- Graphics.Rasterific: _textFont :: TextRange px -> Font
- Graphics.Rasterific: _textSize :: TextRange px -> PointSize
- Graphics.Rasterific: _textTexture :: TextRange px -> Maybe (Texture px)
- Graphics.Rasterific: getPointSize :: PointSize -> Float
- Graphics.Rasterific.Immediate: _orderFillMethod :: DrawOrder px -> !FillMethod
- Graphics.Rasterific.Immediate: _orderMask :: DrawOrder px -> !(Maybe (Texture (PixelBaseComponent px)))
- Graphics.Rasterific.Immediate: _orderPrimitives :: DrawOrder px -> ![[Primitive]]
- Graphics.Rasterific.Immediate: _orderTexture :: DrawOrder px -> !(Texture px)
- Graphics.Rasterific.Immediate: instance PlaneBoundable (DrawOrder px)
- Graphics.Rasterific.Immediate: instance Transformable (DrawOrder px)
- Graphics.Rasterific.Linear: instance Additive V1
- Graphics.Rasterific.Linear: instance Additive V2
- Graphics.Rasterific.Linear: instance Applicative V1
- Graphics.Rasterific.Linear: instance Applicative V2
- Graphics.Rasterific.Linear: instance Epsilon Double
- Graphics.Rasterific.Linear: instance Epsilon Float
- Graphics.Rasterific.Linear: instance Epsilon a => Epsilon (V2 a)
- Graphics.Rasterific.Linear: instance Eq a => Eq (V1 a)
- Graphics.Rasterific.Linear: instance Eq a => Eq (V2 a)
- Graphics.Rasterific.Linear: instance Functor V1
- Graphics.Rasterific.Linear: instance Functor V2
- Graphics.Rasterific.Linear: instance Metric V2
- Graphics.Rasterific.Linear: instance Num a => Num (V2 a)
- Graphics.Rasterific.Linear: instance Show a => Show (V1 a)
- Graphics.Rasterific.Linear: instance Show a => Show (V2 a)
- Graphics.Rasterific.PathWalker: instance (Monad m, Functor m) => Applicative (PathWalkerT m)
- Graphics.Rasterific.PathWalker: instance Functor m => Functor (PathWalkerT m)
- Graphics.Rasterific.PathWalker: instance Monad m => Monad (PathWalkerT m)
- Graphics.Rasterific.PathWalker: instance MonadTrans PathWalkerT
- Graphics.Rasterific.Transformations: _transformA :: Transformation -> {-# UNPACK #-} !Float
- Graphics.Rasterific.Transformations: _transformB :: Transformation -> {-# UNPACK #-} !Float
- Graphics.Rasterific.Transformations: _transformC :: Transformation -> {-# UNPACK #-} !Float
- Graphics.Rasterific.Transformations: _transformD :: Transformation -> {-# UNPACK #-} !Float
- Graphics.Rasterific.Transformations: _transformE :: Transformation -> {-# UNPACK #-} !Float
- Graphics.Rasterific.Transformations: _transformF :: Transformation -> {-# UNPACK #-} !Float
- Graphics.Rasterific.Transformations: instance Eq Transformation
- Graphics.Rasterific.Transformations: instance Monoid Transformation
- Graphics.Rasterific.Transformations: instance Show Transformation
+ Graphics.Rasterific: [_bezierX0] :: Bezier -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_bezierX1] :: Bezier -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_bezierX2] :: Bezier -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_cBezierX0] :: CubicBezier -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_cBezierX1] :: CubicBezier -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_cBezierX2] :: CubicBezier -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_cBezierX3] :: CubicBezier -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_lineX0] :: Line -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_lineX1] :: Line -> {-# UNPACK #-} !Point
+ Graphics.Rasterific: [_pathClose] :: Path -> Bool
+ Graphics.Rasterific: [_pathCommand] :: Path -> [PathCommand]
+ Graphics.Rasterific: [_pathOriginPoint] :: Path -> Point
+ Graphics.Rasterific: [_planeMaxBound] :: PlaneBound -> !Point
+ Graphics.Rasterific: [_planeMinBound] :: PlaneBound -> !Point
+ Graphics.Rasterific: [_textFont] :: TextRange px -> Font
+ Graphics.Rasterific: [_textSize] :: TextRange px -> PointSize
+ Graphics.Rasterific: [_textTexture] :: TextRange px -> Maybe (Texture px)
+ Graphics.Rasterific: [_text] :: TextRange px -> String
+ Graphics.Rasterific: [getPointSize] :: PointSize -> Float
+ Graphics.Rasterific.Immediate: [_orderFillMethod] :: DrawOrder px -> !FillMethod
+ Graphics.Rasterific.Immediate: [_orderMask] :: DrawOrder px -> !(Maybe (Texture (PixelBaseComponent px)))
+ Graphics.Rasterific.Immediate: [_orderPrimitives] :: DrawOrder px -> ![[Primitive]]
+ Graphics.Rasterific.Immediate: [_orderTexture] :: DrawOrder px -> !(Texture px)
+ Graphics.Rasterific.Immediate: instance Graphics.Rasterific.PlaneBoundable.PlaneBoundable (Graphics.Rasterific.Immediate.DrawOrder px)
+ Graphics.Rasterific.Immediate: instance Graphics.Rasterific.Types.Transformable (Graphics.Rasterific.Immediate.DrawOrder px)
+ Graphics.Rasterific.Linear: infixl 7 ^/
+ Graphics.Rasterific.Linear: instance GHC.Base.Applicative Graphics.Rasterific.Linear.V1
+ Graphics.Rasterific.Linear: instance GHC.Base.Applicative Graphics.Rasterific.Linear.V2
+ Graphics.Rasterific.Linear: instance GHC.Base.Functor Graphics.Rasterific.Linear.V1
+ Graphics.Rasterific.Linear: instance GHC.Base.Functor Graphics.Rasterific.Linear.V2
+ Graphics.Rasterific.Linear: instance GHC.Classes.Eq a => GHC.Classes.Eq (Graphics.Rasterific.Linear.V1 a)
+ Graphics.Rasterific.Linear: instance GHC.Classes.Eq a => GHC.Classes.Eq (Graphics.Rasterific.Linear.V2 a)
+ Graphics.Rasterific.Linear: instance GHC.Num.Num a => GHC.Num.Num (Graphics.Rasterific.Linear.V2 a)
+ Graphics.Rasterific.Linear: instance GHC.Show.Show a => GHC.Show.Show (Graphics.Rasterific.Linear.V1 a)
+ Graphics.Rasterific.Linear: instance GHC.Show.Show a => GHC.Show.Show (Graphics.Rasterific.Linear.V2 a)
+ Graphics.Rasterific.Linear: instance Graphics.Rasterific.Linear.Additive Graphics.Rasterific.Linear.V1
+ Graphics.Rasterific.Linear: instance Graphics.Rasterific.Linear.Additive Graphics.Rasterific.Linear.V2
+ Graphics.Rasterific.Linear: instance Graphics.Rasterific.Linear.Epsilon GHC.Types.Double
+ Graphics.Rasterific.Linear: instance Graphics.Rasterific.Linear.Epsilon GHC.Types.Float
+ Graphics.Rasterific.Linear: instance Graphics.Rasterific.Linear.Epsilon a => Graphics.Rasterific.Linear.Epsilon (Graphics.Rasterific.Linear.V2 a)
+ Graphics.Rasterific.Linear: instance Graphics.Rasterific.Linear.Metric Graphics.Rasterific.Linear.V2
+ Graphics.Rasterific.PathWalker: instance Control.Monad.Trans.Class.MonadTrans Graphics.Rasterific.PathWalker.PathWalkerT
+ Graphics.Rasterific.PathWalker: instance GHC.Base.Functor m => GHC.Base.Functor (Graphics.Rasterific.PathWalker.PathWalkerT m)
+ Graphics.Rasterific.PathWalker: instance GHC.Base.Monad m => GHC.Base.Applicative (Graphics.Rasterific.PathWalker.PathWalkerT m)
+ Graphics.Rasterific.PathWalker: instance GHC.Base.Monad m => GHC.Base.Monad (Graphics.Rasterific.PathWalker.PathWalkerT m)
+ Graphics.Rasterific.Transformations: [_transformA] :: Transformation -> {-# UNPACK #-} !Float
+ Graphics.Rasterific.Transformations: [_transformB] :: Transformation -> {-# UNPACK #-} !Float
+ Graphics.Rasterific.Transformations: [_transformC] :: Transformation -> {-# UNPACK #-} !Float
+ Graphics.Rasterific.Transformations: [_transformD] :: Transformation -> {-# UNPACK #-} !Float
+ Graphics.Rasterific.Transformations: [_transformE] :: Transformation -> {-# UNPACK #-} !Float
+ Graphics.Rasterific.Transformations: [_transformF] :: Transformation -> {-# UNPACK #-} !Float
+ Graphics.Rasterific.Transformations: instance GHC.Base.Monoid Graphics.Rasterific.Transformations.Transformation
+ Graphics.Rasterific.Transformations: instance GHC.Classes.Eq Graphics.Rasterific.Transformations.Transformation
+ Graphics.Rasterific.Transformations: instance GHC.Show.Show Graphics.Rasterific.Transformations.Transformation
- Graphics.Rasterific: cacheDrawing :: RenderablePixel px => Int -> Int -> Dpi -> Drawing px () -> Drawing px ()
+ Graphics.Rasterific: cacheDrawing :: forall px. (RenderablePixel px) => Int -> Int -> Dpi -> Drawing px () -> Drawing px ()
- Graphics.Rasterific: drawImage :: ModulablePixel px => Image px -> StrokeWidth -> Point -> Drawing px ()
+ Graphics.Rasterific: drawImage :: Image px -> StrokeWidth -> Point -> Drawing px ()
- Graphics.Rasterific: drawImageAtSize :: (Pixel px, Modulable (PixelBaseComponent px)) => Image px -> StrokeWidth -> Point -> Float -> Float -> Drawing px ()
+ Graphics.Rasterific: drawImageAtSize :: Image px -> StrokeWidth -> Point -> Float -> Float -> Drawing px ()
- Graphics.Rasterific: drawOrdersOfDrawing :: RenderablePixel px => Int -> Int -> Dpi -> px -> Drawing px () -> [DrawOrder px]
+ Graphics.Rasterific: drawOrdersOfDrawing :: forall px. (RenderablePixel px) => Int -> Int -> Dpi -> px -> Drawing px () -> [DrawOrder px]
- Graphics.Rasterific: renderDrawing :: RenderablePixel px => Int -> Int -> px -> Drawing px () -> Image px
+ Graphics.Rasterific: renderDrawing :: forall px. (RenderablePixel px) => Int -> Int -> px -> Drawing px () -> Image px
- Graphics.Rasterific: renderDrawingAtDpi :: RenderablePixel px => Int -> Int -> Dpi -> px -> Drawing px () -> Image px
+ Graphics.Rasterific: renderDrawingAtDpi :: forall px. (RenderablePixel px) => Int -> Int -> Dpi -> px -> Drawing px () -> Image px
- Graphics.Rasterific: stroke :: Geometry geom => Float -> Join -> (Cap, Cap) -> geom -> Drawing px ()
+ Graphics.Rasterific: stroke :: (Geometry geom) => Float -> Join -> (Cap, Cap) -> geom -> Drawing px ()
- Graphics.Rasterific: withGroupOpacity :: Pixel px => PixelBaseComponent px -> Drawing px () -> Drawing px ()
+ Graphics.Rasterific: withGroupOpacity :: PixelBaseComponent px -> Drawing px () -> Drawing px ()
- Graphics.Rasterific.Immediate: runDrawContext :: (PrimMonad m, RenderablePixel px) => Int -> Int -> px -> DrawContext m px () -> m (Image px)
+ Graphics.Rasterific.Immediate: runDrawContext :: forall m px. (PrimMonad m, RenderablePixel px) => Int -> Int -> px -> DrawContext m px () -> m (Image px)
- Graphics.Rasterific.PathWalker: currentPosition :: Monad m => PathWalkerT m (Maybe Point)
+ Graphics.Rasterific.PathWalker: currentPosition :: (Monad m) => PathWalkerT m (Maybe Point)
- Graphics.Rasterific.PathWalker: currentTangeant :: Monad m => PathWalkerT m (Maybe Vector)
+ Graphics.Rasterific.PathWalker: currentTangeant :: (Monad m) => PathWalkerT m (Maybe Vector)
- Graphics.Rasterific.PathWalker: runPathWalking :: Monad m => Path -> PathWalkerT m a -> m a
+ Graphics.Rasterific.PathWalker: runPathWalking :: (Monad m) => Path -> PathWalkerT m a -> m a
- Graphics.Rasterific.Texture: modulateTexture :: Pixel px => Texture px -> Texture (PixelBaseComponent px) -> Texture px
+ Graphics.Rasterific.Texture: modulateTexture :: Texture px -> Texture (PixelBaseComponent px) -> Texture px
Files
- Rasterific.cabal +5/−6
- changelog +5/−0
- docimages/dummy.png +0/−0
- src/Graphics/Rasterific.hs +5/−7
- src/Graphics/Rasterific/Texture.hs +2/−2
Rasterific.cabal view
@@ -1,7 +1,7 @@ -- Initial Rasterific.cabal generated by cabal init. For further -- documentation, see http://haskell.org/cabal/users-guide/ name: Rasterific-version: 0.6.1+version: 0.6.1.1 synopsis: A pure haskell drawing engine. -- A longer description of the package. description:@@ -40,7 +40,7 @@ Source-Repository this Type: git Location: git://github.com/Twinside/Rasterific.git- Tag: v0.6.1+ Tag: v0.6.1.1 flag embed_linear description: Embed a reduced version of Linear avoiding a (huge) dep@@ -75,19 +75,18 @@ ghc-options: -O3 -Wall -- -ddump-simpl -ddump-to-file -dsuppress-module-prefixes -dsuppress-uniques- ghc-prof-options: -Wall -prof default-language: Haskell2010- build-depends: base >= 4.6 && < 4.9+ build-depends: base >= 4.5 && < 5 , free >= 4.7 , JuicyPixels >= 3.2- , FontyFruity >= 0.5 && < 0.6+ , FontyFruity >= 0.5.3.2 && < 0.6 , vector >= 0.9 , mtl >= 1.9 , dlist >= 0.6 , primitive >= 0.5 , vector-algorithms >= 0.3 , bytestring >= 0.10.2- , containers+ , containers >= 0.5 if !flag(embed_linear) build-depends: linear >= 1.3
changelog view
@@ -1,6 +1,11 @@ Change log ========== +v0.6.1.1 May 2016+-----------------++ * Fix: GHC 8.0 bound fix+ v0.6.1 May 2015 ---------------
+ docimages/dummy.png view
src/Graphics/Rasterific.hs view
@@ -6,6 +6,7 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP #-}+ -- | Main module of Rasterific, an Haskell rasterization engine. -- -- Creating an image is rather simple, here is a simple example@@ -230,9 +231,8 @@ -- > fill $ circle (V2 120 100) 60 -- -- <<docimages/item_opacity.png>>-withGroupOpacity :: Pixel px => PixelBaseComponent px -> Drawing px ()-> Drawing px ()-withGroupOpacity opa sub =- liftF $ WithGlobalOpacity opa sub ()+withGroupOpacity :: PixelBaseComponent px -> Drawing px ()-> Drawing px ()+withGroupOpacity opa sub = liftF $ WithGlobalOpacity opa sub () -- | Draw all the sub drawing commands using a transformation. withTransformation :: Transformation -> Drawing px () -> Drawing px ()@@ -678,8 +678,7 @@ -- -- <<docimages/image_simple.png>> ---drawImage :: ModulablePixel px- => Image px -- ^ Image to be drawn+drawImage :: Image px -- ^ Image to be drawn -> StrokeWidth -- ^ Border size, drawn with current texture. -> Point -- ^ Position of the corner upper left of the image. -> Drawing px ()@@ -692,8 +691,7 @@ -- -- <<docimages/image_resize.png>> ---drawImageAtSize :: (Pixel px, Modulable (PixelBaseComponent px))- => Image px -- ^ Image to be drawn+drawImageAtSize :: Image px -- ^ Image to be drawn -> StrokeWidth -- ^ Border size, drawn with current texture. -> Point -- ^ Position of the corner upper left of the image. -> Float -- ^ Width of the drawn image
src/Graphics/Rasterific/Texture.hs view
@@ -2,6 +2,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE ConstraintKinds #-}+ -- | Module describing the various filling method of the -- geometric primitives. --@@ -141,8 +142,7 @@ -- | Perform a multiplication operation between a full color texture -- and a greyscale one, used for clip-path implementation.-modulateTexture :: (Pixel px)- => Texture px -- ^ The full blown texture.+modulateTexture :: Texture px -- ^ The full blown texture. -> Texture (PixelBaseComponent px) -- ^ A greyscale modulation texture. -> Texture px -- ^ The resulting texture. modulateTexture = ModulateTexture