diff options
author | Marge Bot <marge-bot@gnome.org> | 2023-03-30 22:30:19 +0000 |
---|---|---|
committer | Marge Bot <marge-bot@gnome.org> | 2023-03-30 22:30:19 +0000 |
commit | c2a06bb9feee23b8ff455a340bdb2522705065c9 (patch) | |
tree | 0dcb32e7b6c0303dfb10a7885ef4a3bfedd0bc62 | |
parent | ae9c2a475f548517a9f0800bee6a7128ed7126cd (diff) | |
parent | f2f8df329fdcd508f78edbd27d3c7d6bbc4cdd4e (diff) | |
download | librsvg-c2a06bb9feee23b8ff455a340bdb2522705065c9.tar.gz |
Merge branch 'update-container-image' into 'main'
CI: bump the container image
See merge request GNOME/librsvg!817
-rw-r--r-- | ci/container_builds.yml | 4 | ||||
-rw-r--r-- | src/length.rs | 11 | ||||
-rw-r--r-- | src/transform.rs | 9 | ||||
-rw-r--r-- | tests/fixtures/reftests/filter-morphology-from-reference-page-ref.png | bin | 3951 -> 0 bytes | |||
-rw-r--r-- | tests/fixtures/reftests/filter-morphology-from-reference-page.svg | 37 | ||||
-rw-r--r-- | tests/src/reference.rs | 1 | ||||
-rw-r--r-- | tests/src/reference_utils.rs | 2 |
7 files changed, 8 insertions, 56 deletions
diff --git a/ci/container_builds.yml b/ci/container_builds.yml index 4e8c4900..a9a687b6 100644 --- a/ci/container_builds.yml +++ b/ci/container_builds.yml @@ -6,8 +6,8 @@ include: variables: # When branching change the suffix to avoid conflicts with images # from the main branch - BASE_TAG: "2023-02-08.1-main" - RUST_STABLE: "1.67.0" + BASE_TAG: "2023-03-28.0-main" + RUST_STABLE: "1.68.2" RUST_MINIMUM: "1.64.0" .container.opensuse@common: diff --git a/src/length.rs b/src/length.rs index f5656cbe..5d91b166 100644 --- a/src/length.rs +++ b/src/length.rs @@ -505,16 +505,11 @@ pub type Length<N> = CssLength<N, Signed>; /// Alias for `CssLength` types that are non negative pub type ULength<N> = CssLength<N, Unsigned>; -#[derive(Debug, PartialEq, Copy, Clone)] +#[derive(Debug, Default, PartialEq, Copy, Clone)] pub enum LengthOrAuto<N: Normalize> { - Length(CssLength<N, Unsigned>), + #[default] Auto, -} - -impl<N: Normalize> Default for LengthOrAuto<N> { - fn default() -> Self { - LengthOrAuto::Auto - } + Length(CssLength<N, Unsigned>), } impl<N: Normalize> Parse for LengthOrAuto<N> { diff --git a/src/transform.rs b/src/transform.rs index a042b778..9f6c6789 100644 --- a/src/transform.rs +++ b/src/transform.rs @@ -68,8 +68,9 @@ pub struct Transform { /// The `transform` property from the CSS Transforms Module Level 1. /// /// CSS Transforms 1: <https://www.w3.org/TR/css-transforms-1/#transform-property> -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Default, Clone, PartialEq)] pub enum TransformProperty { + #[default] None, List(Vec<TransformFunction>), } @@ -80,12 +81,6 @@ pub enum TransformProperty { #[derive(Copy, Clone, Default, Debug, PartialEq)] pub struct TransformAttribute(Transform); -impl Default for TransformProperty { - fn default() -> Self { - TransformProperty::None - } -} - impl Property for TransformProperty { fn inherits_automatically() -> bool { false diff --git a/tests/fixtures/reftests/filter-morphology-from-reference-page-ref.png b/tests/fixtures/reftests/filter-morphology-from-reference-page-ref.png Binary files differdeleted file mode 100644 index 0a50037c..00000000 --- a/tests/fixtures/reftests/filter-morphology-from-reference-page-ref.png +++ /dev/null diff --git a/tests/fixtures/reftests/filter-morphology-from-reference-page.svg b/tests/fixtures/reftests/filter-morphology-from-reference-page.svg deleted file mode 100644 index d10eb7a1..00000000 --- a/tests/fixtures/reftests/filter-morphology-from-reference-page.svg +++ /dev/null @@ -1,37 +0,0 @@ -<!-- This was taken from the reference page over at - https://www.w3.org/TR/SVG11/filters.html#feMorphologyElement --> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" - "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg width="5cm" height="7cm" viewBox="0 0 700 500" - xmlns="http://www.w3.org/2000/svg" version="1.1"> - <title>Example feMorphology - Examples of erode and dilate</title> - <desc>Five text strings drawn as outlines. - The first is unfiltered. The second and third use 'erode'. - The fourth and fifth use 'dilate'.</desc> - <defs> - <filter id="Erode3"> - <feMorphology operator="erode" in="SourceGraphic" radius="3" /> - </filter> - <filter id="Erode6"> - <feMorphology operator="erode" in="SourceGraphic" radius="6" /> - </filter> - <filter id="Dilate3"> - <feMorphology operator="dilate" in="SourceGraphic" radius="3" /> - </filter> - <filter id="Dilate6"> - <feMorphology operator="dilate" in="SourceGraphic" radius="6" /> - </filter> - </defs> - <rect fill="none" stroke="blue" stroke-width="2" - x="1" y="1" width="698" height="498"/> - <g enable-background="new" > - <g font-family="Verdana" font-size="75" - fill="none" stroke="black" stroke-width="6" > - <text x="50" y="90">Unfiltered</text> - <text x="50" y="180" filter="url(#Erode3)" >Erode radius 3</text> - <text x="50" y="270" filter="url(#Erode6)" >Erode radius 6</text> - <text x="50" y="360" filter="url(#Dilate3)" >Dilate radius 3</text> - <text x="50" y="450" filter="url(#Dilate6)" >Dilate radius 6</text> - </g> - </g> -</svg> diff --git a/tests/src/reference.rs b/tests/src/reference.rs index 7d57fd2f..37f1a562 100644 --- a/tests/src/reference.rs +++ b/tests/src/reference.rs @@ -221,7 +221,6 @@ mod tests { t!(filter_effects_region_svg, "filter-effects-region.svg"); t!(filter_image_from_reference_page_svg, "filter-image-from-reference-page.svg"); t!(filter_kernel_unit_length_svg, "filter-kernel-unit-length.svg"); - t!(filter_morphology_from_reference_page_svg, "filter-morphology-from-reference-page.svg"); t!(filter_offset_svg, "filter-offset.svg"); t!(font_shorthand_svg, "font-shorthand.svg"); t!(gzip_compressed_svg, "gzip-compressed.svg"); diff --git a/tests/src/reference_utils.rs b/tests/src/reference_utils.rs index 3de2bcd5..8232d4c9 100644 --- a/tests/src/reference_utils.rs +++ b/tests/src/reference_utils.rs @@ -134,7 +134,7 @@ pub fn output_dir() -> PathBuf { } fn tolerable_difference() -> u8 { - static mut TOLERANCE: u8 = 2; + static mut TOLERANCE: u8 = 8; static ONCE: Once = Once::new(); ONCE.call_once(|| unsafe { |