packages feed

xournal-render 0.4 → 0.4.0.0

raw patch · 8 files changed

+30/−36 lines, 8 files

Files

src/Graphics/Xournal/Render/BBox.hs view
@@ -19,7 +19,6 @@  import Data.ByteString hiding (map, minimum, maximum, concat, concatMap, filter ) -import Debug.Trace import Prelude hiding (fst,snd,curry,uncurry,mapM_,concatMap)  clipBBox :: Maybe BBox -> Render ()@@ -32,7 +31,7 @@     save     setSourceRGBA 0 0 0 0     setOperator OperatorSource-    rectangle x1 y1 x2 y2 +    rectangle x1 y1 (x2-x1) (y2-y1)      fill     restore @@ -88,14 +87,16 @@       Just bbox@(BBox (x1,y1) (x2,y2)) -> do          let c = M.lookup col predefined_bkgcolor           case c of -          Just (r,g,b,a) -> setSourceRGB r g b +          Just (r,g,b,_a) -> setSourceRGB r g b            Nothing        -> setSourceRGB 1 1 1          rectangle x1 y1 (x2-x1) (y2-y1)         fill         cairoDrawRulingBBox bbox w h sty+cairoDrawBackgroundBBox _ _  (BackgroundPdf _ _ _ _) = +    error "BackgroundPdf in cairoDrawBackgroundBBox"  cairoDrawRulingBBox :: BBox -> Double -> Double -> ByteString -> Render () -cairoDrawRulingBBox bbox@(BBox (x1,y1) (x2,y2)) w h style = do+cairoDrawRulingBBox (BBox (x1,y1) (x2,y2)) w h style = do   let drawonerule y = do          moveTo x1 y          lineTo x2 y
src/Graphics/Xournal/Render/BBoxMapPDF.hs view
@@ -22,12 +22,12 @@ import qualified Control.Monad.State as St (get) import Data.Label -import Data.ByteString hiding (putStrLn, empty)-import qualified Data.ByteString.Char8 as C hiding (empty)+-- import Data.ByteString hiding (putStrLn, empty)+-- import qualified Data.ByteString.Char8 as C hiding (empty) -#ifdef POPPLER-import qualified Graphics.UI.Gtk.Poppler.Document as Poppler-#endif +-- #ifdef POPPLER+-- import qualified Graphics.UI.Gtk.Poppler.Document as Poppler+-- #endif   import Graphics.Xournal.Render.BBox import Graphics.Rendering.Cairo@@ -136,7 +136,7 @@ mkBkgPDF dim@(Dim w h) bkg = do     let bkgpdf = bkgPDFFromBkg bkg   case bkgpdf of -    BkgPDFSolid c s msfc -> do -- return bkgpdf +    BkgPDFSolid _c _s msfc -> do        case msfc of          Just _ -> return bkgpdf         Nothing -> do @@ -157,8 +157,9 @@                 Just doc -> do                     (mpg,msfc) <- popplerGetPageFromDoc doc pn                    return (bkgpdf {bkgpdf_popplerpage = mpg, bkgpdf_cairosurface = msfc}) +                Nothing -> error "no pdf doc? in mkBkgPDF"             _ -> return bkgpdf -        Just (Context oldd oldf olddoc) -> do +        Just (Context _oldd _oldf olddoc) -> do            (mpage,msfc) <- case olddoc of              Just doc -> do                popplerGetPageFromDoc doc pn@@ -196,10 +197,8 @@  updateLayerBuf :: Maybe BBox -> TLayerBBoxBuf LyBuf -> IO (TLayerBBoxBuf LyBuf) updateLayerBuf mbbox lyr = do -  -- putStrLn $ "updatelayerbuf called" ++ show mbbox   case get g_buffer lyr of      LyBuf (Just sfc) -> do -      --  putStrLn "here"       renderWith sfc $ do          clearBBox mbbox                 cairoDrawLayerBBox mbbox (gcast lyr :: TLayerBBox)@@ -268,7 +267,7 @@                               instance RenderOptionable (InBBox TPageBBoxMapPDF) where   type RenderOption (InBBox TPageBBoxMapPDF) = InBBoxOption -  cairoRenderOption opt@(InBBoxOption mbbox) (InBBox page) = do +  cairoRenderOption (InBBoxOption mbbox) (InBBox page) = do      cairoRenderOption (DrawPDFInBBox mbbox) (gbackground page, gdimension page)      mapM_ (cairoDrawLayerBBox mbbox) . glayers $ page  @@ -276,7 +275,7 @@ -- | page within a bbox. not implemented bbox part.  cairoDrawPageBBoxPDF :: Maybe BBox -> TPageBBoxMapPDF -> Render ()-cairoDrawPageBBoxPDF mbbox page = cairoRender page  -- This is temporary+cairoDrawPageBBoxPDF _mbbox page = cairoRender page  -- This is temporary
src/Graphics/Xournal/Render/Generic.hs view
@@ -6,7 +6,7 @@ import Prelude hiding (mapM_)  -- import Text.Xournal.Type-import Graphics.Xournal.Render.Type + import Data.Xournal.Generic import Data.Xournal.Simple import Data.Xournal.BBox
src/Graphics/Xournal/Render/HitTest.hs view
@@ -69,7 +69,7 @@ mkHitTestInsideBBox b = mkHitTestAL (hitTestInsideBBox b . strokebbox_bbox)  hitTestInsideBBox :: BBox -> BBox -> Bool -hitTestInsideBBox b1 b2@(BBox (ulx2,uly2) (lrx2,lry2)) +hitTestInsideBBox b1 (BBox (ulx2,uly2) (lrx2,lry2))    = hitTestBBoxPoint b1 (ulx2,uly2)     && hitTestBBoxPoint b1 (lrx2,lry2)
src/Graphics/Xournal/Render/PDFBackground.hs view
@@ -4,20 +4,19 @@  module Graphics.Xournal.Render.PDFBackground where -import Debug.Trace+ import Control.Monad.State hiding (mapM_) import Prelude hiding (mapM_) -import Data.Foldable + import Data.Monoid  import Data.ByteString hiding (putStrLn) import qualified Data.ByteString.Char8 as C-import Data.Xournal.Generic+ import Data.Xournal.Simple import Data.Xournal.BBox import Graphics.Xournal.Render.BBox  import Graphics.Xournal.Render.Generic-import Graphics.Xournal.Render.Type  #ifdef POPPLER import qualified Graphics.UI.Gtk.Poppler.Document as Poppler@@ -125,13 +124,10 @@         case msfc of            Nothing -> cairoRenderOption DrawBkgPDF (b,dim)           Just sfc -> do -            -- cairoRenderOption DrawBkgPDF (b,dim)-            -- clipBBox . Just . dimToBBox $ dim             setSourceSurface sfc 0 0              paint -            -- resetClip        BkgPDFPDF _ _ _ _ msfc -> do -        case bkgpdf_cairosurface b of +        case msfc of            Nothing -> cairoRenderOption DrawBkgPDF (b,dim)           Just sfc -> do              setSourceSurface sfc 0 0 @@ -142,7 +138,6 @@         clipBBox mbbox         cairoRenderOption DrawBuffer (b,dim)         resetClip-        --  cairoDrawBackgroundBBox mbbox dim (bkgFromBkgPDF b)       BkgPDFPDF _ _ _ _ _ -> do          clipBBox mbbox         cairoRenderOption DrawBuffer (b,dim)
src/Graphics/Xournal/Render/Simple.hs view
@@ -25,6 +25,7 @@   x0 `seq` y0 `seq` moveTo x0 y0   mapM_ f xs      where f (x :!: y) = x `seq` y `seq` lineTo x y +drawOneStrokeCurve [] = return ()  -- | general background drawing (including pdf file) @@ -33,7 +34,7 @@   let Dim w h = page_dim page    case page_bkg page of      Background typ col sty -> cairoDrawBkg (Dim w h) (Background typ col sty)-    bpdf@(BackgroundPdf _ mdomain mfilename pagenum) -> +    BackgroundPdf _ mdomain mfilename pagenum ->        cairoDrawPdfBkg (Dim w h) mdomain mfilename pagenum     @@ -44,15 +45,15 @@   error "pdf bkg is not implemented"  cairoDrawBkg :: Dimension -> Background -> Render () -cairoDrawBkg (Dim w h) (Background typ col sty) = do +cairoDrawBkg (Dim w h) (Background _typ col sty) = do    let c = M.lookup col predefined_bkgcolor     case c of -    Just (r,g,b,a) -> setSourceRGB r g b +    Just (r,g,b,_a) -> setSourceRGB r g b      Nothing        -> setSourceRGB 1 1 1    rectangle 0 0 w h    fill   cairoDrawRuling w h sty-cairoDrawBkg (Dim w h) (BackgroundPdf typ mdomain mfilename pagenum) = do +cairoDrawBkg (Dim w h) (BackgroundPdf _typ _mdomain _mfilename _pagenum) = do    setSourceRGBA 1 1 1 1   rectangle 0 0 w h    fill@@ -101,7 +102,7 @@ cairoDrawPage :: Page -> Render () cairoDrawPage page = do    let strokes = (layer_strokes . (!!0) . page_layers) page -      (Dim w h) = page_dim page+      -- (Dim w h) = page_dim page   cairoDrawBackground page   setLineCap LineCapRound   setLineJoin LineJoinRound
src/Graphics/Xournal/Render/Type.hs view
@@ -3,8 +3,6 @@ module Graphics.Xournal.Render.Type where  import Prelude hiding (fst,snd)-import Data.Strict.Tuple -import Data.ByteString hiding (map, minimum, maximum)  import Data.Xournal.Simple  import Data.Xournal.Generic@@ -38,10 +36,10 @@  getB :: AlterList a b -> [b] getB Empty = [] -getB (x :- xs) = getA xs +getB (_x :- xs) = getA xs   interleave :: (a->c) -> (b->c) -> AlterList a b -> [c]-interleave fa fb Empty = [] +interleave _fa _fb Empty = []  interleave fa fb (x :- xs) = fa x : (interleave fb fa xs)   ----
xournal-render.cabal view
@@ -1,5 +1,5 @@ Name:		xournal-render-Version:	0.4+Version:	0.4.0.0 Synopsis:       Xournal file renderer Description: 	Rendering library using cairo for xournal file format License: 	BSD3