[librsvg/librsvg-2.48] Move RsvgPositionData to c_api
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/librsvg-2.48] Move RsvgPositionData to c_api
- Date: Tue, 5 May 2020 19:47:22 +0000 (UTC)
commit e96e8a24a47f49c1ef7c53b037991676a0641ce1
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Apr 30 20:22:37 2020 -0500
Move RsvgPositionData to c_api
It's not used in rsvg_internals anymore.
librsvg/c_api.rs | 11 +++++++++--
rsvg_internals/src/handle.rs | 7 -------
rsvg_internals/src/lib.rs | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/librsvg/c_api.rs b/librsvg/c_api.rs
index cfc53e3c..6f1bdbb8 100644
--- a/librsvg/c_api.rs
+++ b/librsvg/c_api.rs
@@ -35,8 +35,8 @@ use gobject_sys::{GEnumValue, GFlagsValue};
use rsvg_internals::{
rsvg_log, DefsLookupErrorKind, Dpi, Handle, IntrinsicDimensions, LoadOptions, LoadingError,
- RenderingError, RsvgLength, RsvgPositionData, RsvgSizeFunc, SharedImageSurface, SizeCallback,
- SurfaceType, ViewBox,
+ RenderingError, RsvgLength, RsvgSizeFunc, SharedImageSurface, SizeCallback, SurfaceType,
+ ViewBox,
};
use crate::messages::{rsvg_g_critical, rsvg_g_warning};
@@ -469,6 +469,13 @@ pub fn checked_i32(x: f64) -> Result<i32, cairo::Status> {
cast::i32(x).map_err(|_| cairo::Status::InvalidSize)
}
+// Keep in sync with rsvg.h:RsvgPositionData
+#[repr(C)]
+pub struct RsvgPositionData {
+ pub x: libc::c_int,
+ pub y: libc::c_int,
+}
+
// Keep in sync with rsvg.h:RsvgDimensionData
#[repr(C)]
pub struct RsvgDimensionData {
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 87f32cf8..a1c25dd6 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -83,13 +83,6 @@ impl LoadOptions {
}
}
-// Keep in sync with rsvg.h:RsvgPositionData
-#[repr(C)]
-pub struct RsvgPositionData {
- pub x: libc::c_int,
- pub y: libc::c_int,
-}
-
// Keep in sync with rsvg.h:RsvgSizeFunc
pub type RsvgSizeFunc = Option<
unsafe extern "C" fn(
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index 21a26860..4ee0e84f 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -45,7 +45,7 @@ pub use crate::dpi::{rsvg_rust_set_default_dpi_x_y, Dpi};
pub use crate::error::{DefsLookupErrorKind, HrefError, LoadingError, RenderingError};
-pub use crate::handle::{Handle, LoadOptions, RsvgPositionData, RsvgSizeFunc, SizeCallback};
+pub use crate::handle::{Handle, LoadOptions, RsvgSizeFunc, SizeCallback};
pub use crate::length::{Length, LengthUnit, RsvgLength};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]