[librsvg: 3/6] draw_ctx: avoid useless C wrapper
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 3/6] draw_ctx: avoid useless C wrapper
- Date: Wed, 2 May 2018 20:22:12 +0000 (UTC)
commit d8de2fd5b6b01533a6a1f7e3802d3329de486d2c
Author: Paolo Borelli <pborelli gnome org>
Date: Tue May 1 14:13:24 2018 +0200
draw_ctx: avoid useless C wrapper
librsvg/rsvg-base.c | 6 ------
librsvg/rsvg-private.h | 3 ---
rsvg_internals/src/drawing_ctx.rs | 10 +++++-----
3 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/librsvg/rsvg-base.c b/librsvg/rsvg-base.c
index 6b9b4c75..23153f04 100644
--- a/librsvg/rsvg-base.c
+++ b/librsvg/rsvg-base.c
@@ -635,12 +635,6 @@ rsvg_drawing_ctx_set_affine_on_cr (RsvgDrawingCtx *draw_ctx, cairo_t *cr, cairo_
cairo_set_matrix (cr, &matrix);
}
-PangoContext *
-rsvg_drawing_ctx_get_pango_context (RsvgDrawingCtx *draw_ctx)
-{
- return rsvg_cairo_get_pango_context (draw_ctx);
-}
-
void
rsvg_drawing_ctx_insert_bbox (RsvgDrawingCtx *draw_ctx, RsvgBbox *bbox)
{
diff --git a/librsvg/rsvg-private.h b/librsvg/rsvg-private.h
index 49afb65b..247628bf 100644
--- a/librsvg/rsvg-private.h
+++ b/librsvg/rsvg-private.h
@@ -487,9 +487,6 @@ double rsvg_length_hand_normalize (const RsvgLength *length,
G_GNUC_INTERNAL
void rsvg_drawing_ctx_set_affine_on_cr (RsvgDrawingCtx *draw_ctx, cairo_t *cr, cairo_matrix_t *affine);
-G_GNUC_INTERNAL
-PangoContext *rsvg_drawing_ctx_get_pango_context (RsvgDrawingCtx *draw_ctx);
-
/* Implemented in rust/src/length.rs */
G_GNUC_INTERNAL
RsvgLength rsvg_length_parse (const char *str, LengthDir dir);
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 83b64b84..115f92c8 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -56,10 +56,6 @@ extern "C" {
affine: *const cairo::Matrix,
);
- fn rsvg_drawing_ctx_get_pango_context(
- draw_ctx: *const RsvgDrawingCtx,
- ) -> *mut pango_sys::PangoContext;
-
fn rsvg_drawing_ctx_insert_bbox(draw_ctx: *const RsvgDrawingCtx, bbox: *const RsvgBbox);
fn rsvg_drawing_ctx_insert_ink_bbox(draw_ctx: *const RsvgDrawingCtx, ink_bbox: *const RsvgBbox);
@@ -75,6 +71,10 @@ extern "C" {
fn rsvg_cairo_get_cairo_context(draw_ctx: *const RsvgDrawingCtx) -> *mut cairo_sys::cairo_t;
fn rsvg_cairo_set_cairo_context(draw_ctx: *const RsvgDrawingCtx, cr: *const cairo_sys::cairo_t);
+
+ fn rsvg_cairo_get_pango_context(
+ draw_ctx: *const RsvgDrawingCtx,
+ ) -> *mut pango_sys::PangoContext;
}
pub fn get_dpi(draw_ctx: *const RsvgDrawingCtx) -> (f64, f64) {
@@ -260,7 +260,7 @@ pub fn set_affine_on_cr(
}
pub fn get_pango_context(draw_ctx: *const RsvgDrawingCtx) -> pango::Context {
- unsafe { from_glib_full(rsvg_drawing_ctx_get_pango_context(draw_ctx)) }
+ unsafe { from_glib_full(rsvg_cairo_get_pango_context(draw_ctx)) }
}
pub fn insert_bbox(draw_ctx: *const RsvgDrawingCtx, bbox: &RsvgBbox) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]