Fix :scale's affect on :width and :height (bug#47819)

* src/image.c (compute_image_size): Multiply width and height values
by scale.

diff --git a/src/image.c b/src/image.c
index 1619886f5a1210443b612b72339f34ed046f65fd..ff4ef018044f9179f58cb69b1a1f0ab304bac97f 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -2040,7 +2040,7 @@ compute_image_size (size_t width, size_t height,
   int_value = image_get_dimension (img, QCwidth);
   if (int_value >= 0)
     {
-      desired_width = int_value;
+      desired_width = int_value * scale;
       /* :width overrides :max-width. */
       max_width = -1;
     }
@@ -2048,7 +2048,7 @@ compute_image_size (size_t width, size_t height,
   int_value = image_get_dimension (img, QCheight);
   if (int_value >= 0)
     {
-      desired_height = int_value;
+      desired_height = int_value * scale;
       /* :height overrides :max-height. */
       max_height = -1;
     }