]> git.eshelyaron.com Git - emacs.git/commitdiff
Simplify svg_load_image
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 3 Dec 2021 17:47:22 +0000 (09:47 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 3 Dec 2021 18:25:09 +0000 (10:25 -0800)
* src/image.c (svg_load_image): Simplify slightly.

src/image.c

index f13304912c8132eb8dbb908ac3348d9250423637..1db2b78ad5b635584ea13fb5fe650067d3079dc5 100644 (file)
@@ -10469,14 +10469,12 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
   else if (has_width && has_viewbox)
     {
       viewbox_width = svg_css_length_to_pixels (iwidth, dpi, img->face_font_size);
-      viewbox_height = svg_css_length_to_pixels (iwidth, dpi, img->face_font_size)
-        * viewbox.height / viewbox.width;
+      viewbox_height = viewbox_width * viewbox.height / viewbox.width;
     }
   else if (has_height && has_viewbox)
     {
       viewbox_height = svg_css_length_to_pixels (iheight, dpi, img->face_font_size);
-      viewbox_width = svg_css_length_to_pixels (iheight, dpi, img->face_font_size)
-        * viewbox.width / viewbox.height;
+      viewbox_width = viewbox_height * viewbox.width / viewbox.height;
     }
   else if (has_viewbox)
     {