[librsvg/librsvg-2.48] Rename Transform::new to new_unchecked
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/librsvg-2.48] Rename Transform::new to new_unchecked
- Date: Thu, 30 Apr 2020 21:28:04 +0000 (UTC)
commit 9763cabaa75900d7b374dca4d6a6d6ee76fabc03
Author: Federico Mena Quintero <federico gnome org>
Date: Wed Apr 29 19:14:51 2020 -0500
Rename Transform::new to new_unchecked
We'll use this to change each call site individually to a better scheme.
rsvg_internals/src/bbox.rs | 2 +-
rsvg_internals/src/drawing_ctx.rs | 4 +--
rsvg_internals/src/filters/context.rs | 4 +--
rsvg_internals/src/gradient.rs | 2 +-
rsvg_internals/src/transform.rs | 64 +++++++++++++++++------------------
5 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/rsvg_internals/src/bbox.rs b/rsvg_internals/src/bbox.rs
index 99593e1c..311ebafc 100644
--- a/rsvg_internals/src/bbox.rs
+++ b/rsvg_internals/src/bbox.rs
@@ -97,7 +97,7 @@ mod tests {
let r1 = Rect::new(1.0, 2.0, 3.0, 4.0);
let r2 = Rect::new(1.5, 2.5, 3.5, 4.5);
let r3 = Rect::new(10.0, 11.0, 12.0, 13.0);
- let t = Transform::new(1.0, 0.0, 0.0, 1.0, 0.5, 0.5);
+ let t = Transform::new_unchecked(1.0, 0.0, 0.0, 1.0, 0.5, 0.5);
let res = combine_rects(None, None, &t, true);
assert_eq!(res, None);
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 9b14f4b6..c43d8291 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -348,7 +348,7 @@ impl DrawingCtx {
let transform = if units == CoordUnits::ObjectBoundingBox {
let bbox_rect = bbox.rect.as_ref().unwrap();
- Some(Transform::new(
+ Some(Transform::new_unchecked(
bbox_rect.width(),
0.0,
0.0,
@@ -424,7 +424,7 @@ impl DrawingCtx {
let mask_cr = cairo::Context::new(&mask_content_surface);
mask_cr.set_matrix(mask_transform.into());
- let bbtransform = Transform::new(
+ let bbtransform = Transform::new_unchecked(
bbox_rect.width(),
0.0,
0.0,
diff --git a/rsvg_internals/src/filters/context.rs b/rsvg_internals/src/filters/context.rs
index 9a1556e0..e2e250ca 100644
--- a/rsvg_internals/src/filters/context.rs
+++ b/rsvg_internals/src/filters/context.rs
@@ -116,7 +116,7 @@ impl FilterContext {
let affine = match filter.get_filter_units() {
CoordUnits::UserSpaceOnUse => draw_transform,
- CoordUnits::ObjectBoundingBox => Transform::new(
+ CoordUnits::ObjectBoundingBox => Transform::new_unchecked(
bbox_rect.width(),
0.0,
0.0,
@@ -129,7 +129,7 @@ impl FilterContext {
let paffine = match filter.get_primitive_units() {
CoordUnits::UserSpaceOnUse => draw_transform,
- CoordUnits::ObjectBoundingBox => Transform::new(
+ CoordUnits::ObjectBoundingBox => Transform::new_unchecked(
bbox_rect.width(),
0.0,
0.0,
diff --git a/rsvg_internals/src/gradient.rs b/rsvg_internals/src/gradient.rs
index c6741659..552aaf07 100644
--- a/rsvg_internals/src/gradient.rs
+++ b/rsvg_internals/src/gradient.rs
@@ -760,7 +760,7 @@ impl Gradient {
) {
let transform = if self.units == GradientUnits(CoordUnits::ObjectBoundingBox) {
let bbox_rect = bbox.rect.unwrap();
- Transform::new(
+ Transform::new_unchecked(
bbox_rect.width(),
0.0,
0.0,
diff --git a/rsvg_internals/src/transform.rs b/rsvg_internals/src/transform.rs
index 4898f1fc..61e4b598 100644
--- a/rsvg_internals/src/transform.rs
+++ b/rsvg_internals/src/transform.rs
@@ -23,7 +23,7 @@ pub struct Transform {
impl Transform {
#[inline]
- pub fn new(xx: f64, yx: f64, xy: f64, yy: f64, x0: f64, y0: f64) -> Self {
+ pub fn new_unchecked(xx: f64, yx: f64, xy: f64, yy: f64, x0: f64, y0: f64) -> Self {
Self {
xx,
xy,
@@ -36,28 +36,28 @@ impl Transform {
#[inline]
pub fn identity() -> Self {
- Self::new(1.0, 0.0, 0.0, 1.0, 0.0, 0.0)
+ Self::new_unchecked(1.0, 0.0, 0.0, 1.0, 0.0, 0.0)
}
#[inline]
pub fn new_translate(tx: f64, ty: f64) -> Self {
- Self::new(1.0, 0.0, 0.0, 1.0, tx, ty)
+ Self::new_unchecked(1.0, 0.0, 0.0, 1.0, tx, ty)
}
#[inline]
pub fn new_scale(sx: f64, sy: f64) -> Self {
- Self::new(sx, 0.0, 0.0, sy, 0.0, 0.0)
+ Self::new_unchecked(sx, 0.0, 0.0, sy, 0.0, 0.0)
}
#[inline]
pub fn new_rotate(a: Angle) -> Self {
let (s, c) = a.radians().sin_cos();
- Self::new(c, s, -s, c, 0.0, 0.0)
+ Self::new_unchecked(c, s, -s, c, 0.0, 0.0)
}
#[inline]
pub fn new_skew(ax: Angle, ay: Angle) -> Self {
- Self::new(1.0, ay.radians().tan(), ax.radians().tan(), 1.0, 0.0, 0.0)
+ Self::new_unchecked(1.0, ay.radians().tan(), ax.radians().tan(), 1.0, 0.0, 0.0)
}
#[must_use]
@@ -134,7 +134,7 @@ impl Transform {
let inv_det = 1.0 / det;
- Some(Transform::new(
+ Some(Transform::new_unchecked(
inv_det * self.yy,
inv_det * (-self.yx),
inv_det * (-self.xy),
@@ -222,7 +222,7 @@ impl Parse for Transform {
impl From<cairo::Matrix> for Transform {
#[inline]
fn from(m: cairo::Matrix) -> Self {
- Self::new(m.xx, m.yx, m.xy, m.yy, m.x0, m.y0)
+ Self::new_unchecked(m.xx, m.yx, m.xy, m.yy, m.x0, m.y0)
}
}
@@ -301,7 +301,7 @@ fn parse_matrix_args<'i>(parser: &mut Parser<'i, '_>) -> Result<Transform, Parse
let y0 = f64::parse(p)?;
- Ok(Transform::new(xx, yx, xy, yy, x0, y0))
+ Ok(Transform::new_unchecked(xx, yx, xy, yy, x0, y0))
})
}
@@ -401,27 +401,27 @@ mod tests {
#[test]
fn test_multiply() {
let t1 = Transform::identity();
- let t2 = Transform::new(1.0, 2.0, 3.0, 4.0, 5.0, 6.0);
+ let t2 = Transform::new_unchecked(1.0, 2.0, 3.0, 4.0, 5.0, 6.0);
assert_transform_eq(&Transform::multiply(&t1, &t2), &t2);
assert_transform_eq(&Transform::multiply(&t2, &t1), &t2);
- let t1 = Transform::new(1.0, 2.0, 3.0, 4.0, 5.0, 6.0);
- let t2 = Transform::new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
- let r = Transform::new(0.0, 0.0, 0.0, 0.0, 5.0, 6.0);
+ let t1 = Transform::new_unchecked(1.0, 2.0, 3.0, 4.0, 5.0, 6.0);
+ let t2 = Transform::new_unchecked(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+ let r = Transform::new_unchecked(0.0, 0.0, 0.0, 0.0, 5.0, 6.0);
assert_transform_eq(&Transform::multiply(&t1, &t2), &t2);
assert_transform_eq(&Transform::multiply(&t2, &t1), &r);
- let t1 = Transform::new(0.5, 0.0, 0.0, 0.5, 10.0, 10.0);
- let t2 = Transform::new(1.0, 0.0, 0.0, 1.0, -10.0, -10.0);
- let r1 = Transform::new(0.5, 0.0, 0.0, 0.5, 0.0, 0.0);
- let r2 = Transform::new(0.5, 0.0, 0.0, 0.5, 5.0, 5.0);
+ let t1 = Transform::new_unchecked(0.5, 0.0, 0.0, 0.5, 10.0, 10.0);
+ let t2 = Transform::new_unchecked(1.0, 0.0, 0.0, 1.0, -10.0, -10.0);
+ let r1 = Transform::new_unchecked(0.5, 0.0, 0.0, 0.5, 0.0, 0.0);
+ let r2 = Transform::new_unchecked(0.5, 0.0, 0.0, 0.5, 5.0, 5.0);
assert_transform_eq(&Transform::multiply(&t1, &t2), &r1);
assert_transform_eq(&Transform::multiply(&t2, &t1), &r2);
}
#[test]
fn test_invert() {
- let t = Transform::new(2.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+ let t = Transform::new_unchecked(2.0, 0.0, 0.0, 0.0, 0.0, 0.0);
assert!(!t.is_invertible());
assert!(t.invert().is_none());
@@ -431,7 +431,7 @@ mod tests {
let i = t.invert().unwrap();
assert_transform_eq(&i, &Transform::identity());
- let t = Transform::new(1.0, 2.0, 3.0, 4.0, 5.0, 6.0);
+ let t = Transform::new_unchecked(1.0, 2.0, 3.0, 4.0, 5.0, 6.0);
assert!(t.is_invertible());
assert!(t.invert().is_some());
let i = t.invert().unwrap();
@@ -453,8 +453,8 @@ mod tests {
#[test]
fn parses_valid_transform() {
- let t = Transform::new(1.0, 0.0, 0.0, 1.0, 20.0, 30.0);
- let s = Transform::new(10.0, 0.0, 0.0, 10.0, 0.0, 0.0);
+ let t = Transform::new_unchecked(1.0, 0.0, 0.0, 1.0, 20.0, 30.0);
+ let s = Transform::new_unchecked(10.0, 0.0, 0.0, 10.0, 0.0, 0.0);
let r = rotation_transform(30.0, 10.0, 10.0);
let a = Transform::multiply(&s, &t);
@@ -491,17 +491,17 @@ mod tests {
fn parses_matrix() {
assert_transform_eq(
&parse_transform("matrix (1 2 3 4 5 6)").unwrap(),
- &Transform::new(1.0, 2.0, 3.0, 4.0, 5.0, 6.0),
+ &Transform::new_unchecked(1.0, 2.0, 3.0, 4.0, 5.0, 6.0),
);
assert_transform_eq(
&parse_transform("matrix(1,2,3,4 5 6)").unwrap(),
- &Transform::new(1.0, 2.0, 3.0, 4.0, 5.0, 6.0),
+ &Transform::new_unchecked(1.0, 2.0, 3.0, 4.0, 5.0, 6.0),
);
assert_transform_eq(
&parse_transform("matrix (1,2.25,-3.25e2,4 5 6)").unwrap(),
- &Transform::new(1.0, 2.25, -325.0, 4.0, 5.0, 6.0),
+ &Transform::new_unchecked(1.0, 2.25, -325.0, 4.0, 5.0, 6.0),
);
}
@@ -509,17 +509,17 @@ mod tests {
fn parses_translate() {
assert_transform_eq(
&parse_transform("translate(-1 -2)").unwrap(),
- &Transform::new(1.0, 0.0, 0.0, 1.0, -1.0, -2.0),
+ &Transform::new_unchecked(1.0, 0.0, 0.0, 1.0, -1.0, -2.0),
);
assert_transform_eq(
&parse_transform("translate(-1, -2)").unwrap(),
- &Transform::new(1.0, 0.0, 0.0, 1.0, -1.0, -2.0),
+ &Transform::new_unchecked(1.0, 0.0, 0.0, 1.0, -1.0, -2.0),
);
assert_transform_eq(
&parse_transform("translate(-1)").unwrap(),
- &Transform::new(1.0, 0.0, 0.0, 1.0, -1.0, 0.0),
+ &Transform::new_unchecked(1.0, 0.0, 0.0, 1.0, -1.0, 0.0),
);
}
@@ -527,17 +527,17 @@ mod tests {
fn parses_scale() {
assert_transform_eq(
&parse_transform("scale (-1)").unwrap(),
- &Transform::new(-1.0, 0.0, 0.0, -1.0, 0.0, 0.0),
+ &Transform::new_unchecked(-1.0, 0.0, 0.0, -1.0, 0.0, 0.0),
);
assert_transform_eq(
&parse_transform("scale(-1 -2)").unwrap(),
- &Transform::new(-1.0, 0.0, 0.0, -2.0, 0.0, 0.0),
+ &Transform::new_unchecked(-1.0, 0.0, 0.0, -2.0, 0.0, 0.0),
);
assert_transform_eq(
&parse_transform("scale(-1, -2)").unwrap(),
- &Transform::new(-1.0, 0.0, 0.0, -2.0, 0.0, 0.0),
+ &Transform::new_unchecked(-1.0, 0.0, 0.0, -2.0, 0.0, 0.0),
);
}
@@ -575,8 +575,8 @@ mod tests {
#[test]
fn parses_transform_list() {
- let t = Transform::new(1.0, 0.0, 0.0, 1.0, 20.0, 30.0);
- let s = Transform::new(10.0, 0.0, 0.0, 10.0, 0.0, 0.0);
+ let t = Transform::new_unchecked(1.0, 0.0, 0.0, 1.0, 20.0, 30.0);
+ let s = Transform::new_unchecked(10.0, 0.0, 0.0, 10.0, 0.0, 0.0);
let r = rotation_transform(30.0, 10.0, 10.0);
assert_transform_eq(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]