[librsvg: 7/17] ResizeStragegy: rename FitLargestScale -> ScaleWithMaxSize




commit 15b4e9dacd45a8e77e4358950101aa2cd394bda8
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Feb 21 18:25:48 2022 -0600

    ResizeStragegy: rename FitLargestScale -> ScaleWithMaxSize
    
    Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/669>

 src/bin/rsvg-convert.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/bin/rsvg-convert.rs b/src/bin/rsvg-convert.rs
index 7565ece7a..878e7429c 100644
--- a/src/bin/rsvg-convert.rs
+++ b/src/bin/rsvg-convert.rs
@@ -105,7 +105,7 @@ enum ResizeStrategy {
     Fit(f64, f64),
     FitWidth(f64),
     FitHeight(f64),
-    FitLargestScale(Scale, Option<f64>, Option<f64>),
+    ScaleWithMaxSize(Scale, Option<f64>, Option<f64>),
 }
 
 impl ResizeStrategy {
@@ -128,7 +128,7 @@ impl ResizeStrategy {
                 w: input.w * h / input.h,
                 h,
             },
-            ResizeStrategy::FitLargestScale(s, w, h) => {
+            ResizeStrategy::ScaleWithMaxSize(s, w, h) => {
                 let scaled_input_w = input.w * s.x;
                 let scaled_input_h = input.h * s.y;
 
@@ -613,7 +613,7 @@ impl Converter {
                 (None, Some(h)) if self.zoom.is_identity() => ResizeStrategy::FitHeight(h),
 
                 // otherwise scale the image, but cap the zoom to match the requested size
-                _ => ResizeStrategy::FitLargestScale(self.zoom, requested_width, requested_height),
+                _ => ResizeStrategy::ScaleWithMaxSize(self.zoom, requested_width, requested_height),
             };
 
             let final_size = self.final_size(&strategy, &natural_size, input)?;
@@ -1232,8 +1232,8 @@ mod sizing_tests {
     }
 
     #[test]
-    fn fit_largest_scale_no_max_size() {
-        let strategy = ResizeStrategy::FitLargestScale(
+    fn scale_no_max_size() {
+        let strategy = ResizeStrategy::ScaleWithMaxSize(
             Scale::new(2.0, 3.0),
             None,
             None,
@@ -1246,8 +1246,8 @@ mod sizing_tests {
     }
 
     #[test]
-    fn fit_largest_scale_max_size() {
-        let strategy = ResizeStrategy::FitLargestScale(
+    fn scale_with_max_size() {
+        let strategy = ResizeStrategy::ScaleWithMaxSize(
             Scale::new(2.0, 3.0),
             Some(10.0),
             Some(20.0),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]