Commit b0bca8ae authored by Andrew Gibiansky's avatar Andrew Gibiansky

Fixing #402; this may break 7.10 later, but for now 7.10 doesnt compile anyways

parent 8337a1db
...@@ -12,13 +12,13 @@ import Diagrams.Backend.Cairo ...@@ -12,13 +12,13 @@ import Diagrams.Backend.Cairo
import IHaskell.Display import IHaskell.Display
instance IHaskellDisplay (QDiagram Cairo V2 Double Any) where instance IHaskellDisplay (QDiagram Cairo R2 Any) where
display renderable = do display renderable = do
png <- diagramData renderable PNG png <- diagramData renderable PNG
svg <- diagramData renderable SVG svg <- diagramData renderable SVG
return $ Display [png, svg] return $ Display [png, svg]
diagramData :: Diagram Cairo -> OutputType -> IO DisplayData diagramData :: Diagram Cairo R2 -> OutputType -> IO DisplayData
diagramData renderable format = do diagramData renderable format = do
switchToTmpDir switchToTmpDir
...@@ -31,7 +31,7 @@ diagramData renderable format = do ...@@ -31,7 +31,7 @@ diagramData renderable format = do
-- Write the image. -- Write the image.
let filename = ".ihaskell-diagram." ++ extension format let filename = ".ihaskell-diagram." ++ extension format
renderCairo filename (mkHeight imgHeight) renderable renderCairo filename (mkSizeSpec (Just imgWidth) (Just imgHeight)) renderable
-- Convert to base64. -- Convert to base64.
imgData <- readFile $ fpFromString filename imgData <- readFile $ fpFromString filename
...@@ -45,5 +45,5 @@ diagramData renderable format = do ...@@ -45,5 +45,5 @@ diagramData renderable format = do
extension PNG = "png" extension PNG = "png"
-- Rendering hint. -- Rendering hint.
diagram :: Diagram Cairo -> Diagram Cairo diagram :: Diagram Cairo R2 -> Diagram Cairo R2
diagram = id diagram = id
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment