get diagrams-povray building again

diagrams · Sep 24, 2012 · c265bb4 · c265bb4
1 parent af96e51
commit c265bb4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/diagrams-povray.cabal b/diagrams-povray.cabal
@@ -18,7 +18,8 @@ Source-repository head
 Library
   Exposed-modules:   Diagrams.Backend.POVRay
   Hs-source-dirs:    src
-  Build-depends:     base >= 4.2 && < 4.4,
-                     diagrams-core >= 0.3 && < 0.4,
-                     diagrams-lib >= 0.3 && < 0.4,
-                     pretty >= 1.0.1.2 && < 1.1
+  Build-depends:     base >= 4.2 && < 4.7,
+                     diagrams-core >= 0.5 && < 0.6,
+                     diagrams-lib >= 0.5 && < 0.6,
+                     pretty >= 1.0.1.2 && < 1.2,
+                     vector-space >= 0.8 && < 0.9
diff --git a/src/Diagrams/Backend/POVRay.hs b/src/Diagrams/Backend/POVRay.hs
@@ -3,6 +3,7 @@
            , MultiParamTypeClasses
            , TypeFamilies
            , DeriveDataTypeable
+           , ViewPatterns
   #-}
 
 -----------------------------------------------------------------------------
@@ -58,7 +59,7 @@ povrayTransf t = OMTransf $
                          , v10, v11, v12
                          , v20, v21, v22
                          , v30, v31, v32 ]
-  where (v00, v01, v02) = apply t (1,0,0)
-        (v10, v11, v12) = apply t (0,1,0)
-        (v20, v21, v22) = apply t (0,0,1)
-        (v30, v31, v32) = transl t
+  where (unr3 -> (v00, v01, v02)) = apply t (r3 (1,0,0))
+        (unr3 -> (v10, v11, v12)) = apply t (r3 (0,1,0))
+        (unr3 -> (v20, v21, v22)) = apply t (r3 (0,0,1))
+        (unr3 -> (v30, v31, v32)) = transl t
diff --git a/src/Diagrams/Backend/POVRay/Syntax.hs b/src/Diagrams/Backend/POVRay/Syntax.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE TypeSynonymInstances
-           , TypeFamilies
-  #-}
+{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE FlexibleInstances #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Diagrams.Backend.POVRay.Syntax