Attachment 603305 Details for Bug 847093 – Patch that allows Graph to use cairo module

[patch] Patch that allows Graph to use cairo module

Graph-cairo.patch (text/plain), 1.91 KB, created by Nathanael Noblet on 2012-08-09 16:41:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathanael Noblet

Created: 2012-08-09 16:41:25 UTC

Size: 1.91 KB

patch

obsolete

>commit c418696bd53af50d0f3e364853dbb8e2194642a5
>Author: Nathanael D. Noblet <nathanael@gnat.ca>
>Date:   Thu Aug 9 10:35:17 2012 -0600
>
>    use cairo instead of cairo_wrapper
>
>diff --git a/src/driver/cairo.php b/src/driver/cairo.php
>index f58e5c8..a720846 100644
>--- a/src/driver/cairo.php
>+++ b/src/driver/cairo.php
>@@ -100,7 +100,7 @@ class ezcGraphCairoDriver extends ezcGraphDriver
>      */
>     public function __construct( array $options = array() )
>     {
>-        ezcBase::checkDependency( 'Graph', ezcBase::DEP_PHP_EXTENSION, 'cairo_wrapper' );
>+        ezcBase::checkDependency( 'Graph', ezcBase::DEP_PHP_EXTENSION, 'cairo' );
>         $this->options = new ezcGraphCairoDriverOptions( $options );
>     }
> 
>@@ -936,8 +936,8 @@ class ezcGraphCairoDriver extends ezcGraphDriver
> 
>         // Scale pattern to defined dimensions and move it to its destination position
>         $matrix = cairo_matrix_multiply(
>-            $move = cairo_matrix_create_translate( -$position->x, -$position->y ),
>-            $scale = cairo_matrix_create_scale( $data[0] / $width, $data[1] / $height )
>+            $move = CairoMatrix::initTranslate( -$position->x, -$position->y ),
>+            $scale = CairoMatrix::initScale( $data[0] / $width, $data[1] / $height )
>         );
>         cairo_pattern_set_matrix( $pattern, $matrix );
> 
>diff --git a/tests/driver_cairo_test.php b/tests/driver_cairo_test.php
>index 51c1208..b4025d1 100644
>--- a/tests/driver_cairo_test.php
>+++ b/tests/driver_cairo_test.php
>@@ -50,9 +50,9 @@ class ezcGraphCairoDriverTest extends ezcTestImageCase
> 
>     protected function setUp()
>     {
>-        if ( !ezcBaseFeatures::hasExtensionSupport( 'cairo_wrapper' ) )
>+        if ( !ezcBaseFeatures::hasExtensionSupport( 'cairo' ) )
>         {
>-            $this->markTestSkipped( 'This test needs pecl/cairo_wrapper support.' );
>+            $this->markTestSkipped( 'This test needs pecl/cairo support.' );
>         }
> 
>         static $i = 0;

Actions: View | Diff

Attachments on bug 847093: 603305