Attachment 26573 Details for Bug 22137 – Revert "Add an overloaded Context::get_matrix() that returns a copy of the Matrix"

[patch] Revert "Add an overloaded Context::get_matrix() that returns a copy of the Matrix"

Revert-Add-an-overloaded-Contextgetmatrix-that-ret.patch (text/plain), 2.22 KB, created by Jonathon Jongsma on 2009-06-08 20:35:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathon Jongsma

Created: 2009-06-08 20:35:59 UTC

Size: 2.22 KB

patch

obsolete

>From b67b4d977180aafdb80c58b9e2e427018f9a5207 Mon Sep 17 00:00:00 2001
>From: Jonathon Jongsma <jjongsma@gnome.org>
>Date: Mon, 8 Jun 2009 21:51:20 -0500
>Subject: [PATCH] Revert "Add an overloaded Context::get_matrix() that returns a copy of the Matrix"
>
>This reverts commit ccb381d30a1a523896d2b60204c0c2588fe25f02.
>---
> ChangeLog             |    7 -------
> cairomm/context.cc    |    8 --------
> cairomm/context.h     |    3 ---
> tests/test-context.cc |    1 -
> 4 files changed, 0 insertions(+), 19 deletions(-)
>
>diff --git a/ChangeLog b/ChangeLog
>index e2dca10..16361be 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -262,13 +262,6 @@
> 
> 2008-10-22  Jonathon Jongsma  <jonathon@quotidian.org>
> 
>-	* cairomm/context.cc:
>-	* cairomm/context.h: add an overloaded get_matrix() function that returns a
>-	copy of the matrix for convenience
>-	* tests/test-context.cc: excercise the API
>-
>-2008-10-22  Jonathon Jongsma  <jonathon@quotidian.org>
>-
> 	* .gitignore:
> 	* Makefile.am:
> 	* configure.in: moved pkgconfig files to a data subdirectory, and consolidated
>diff --git a/cairomm/context.cc b/cairomm/context.cc
>index 8db25eb..a9df045 100644
>--- a/cairomm/context.cc
>+++ b/cairomm/context.cc
>@@ -698,14 +698,6 @@ void Context::get_matrix(Matrix& matrix)
>   check_object_status_and_throw_exception(*this);
> }
> 
>-Matrix Context::get_matrix() const
>-{
>-  Cairo::Matrix m;
>-  cairo_get_matrix(const_cast<cairo_t*>(cobj()), (cairo_matrix_t*)&m);
>-  check_object_status_and_throw_exception(*this);
>-  return m;
>-}
>-
> static
> RefPtr<Surface> get_surface_wrapper (cairo_surface_t* surface)
> {
>diff --git a/cairomm/context.h b/cairomm/context.h
>index a5021ef..54b51d8 100644
>--- a/cairomm/context.h
>+++ b/cairomm/context.h
>@@ -815,9 +815,6 @@ public:
>    * @param matrix	return value for the matrix
>    */
>   void get_matrix(Matrix& matrix);
>-  /** @since 1.8
>-   */
>-  Matrix get_matrix() const;
> 
>   /** Gets the target surface associated with this Context.
>    *
>diff --git a/tests/test-context.cc b/tests/test-context.cc
>index a52bab1..471581d 100644
>--- a/tests/test-context.cc
>+++ b/tests/test-context.cc
>@@ -225,7 +225,6 @@ test_matrix ()
>   cr->set_matrix(matrix);
>   cr->set_identity_matrix ();
>   cr->get_matrix (matrix);
>-  Cairo::Matrix m2 = cr->get_matrix ();
> }
> 
> void
>-- 
>1.6.3.1

Actions: View | Splinter Review

Attachments on bug 22137: 26572 | 26573 | 26574 | 26575 | 26576 | 26577 | 26580

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.