svg: honor --stretch option

3 files changed, 5 insertions, 5 deletions

diff --git a/main.c b/main.c
index f8ba7ac..6b9e138 100644
--- a/main.c
+++ b/main.c
@@ -94,7 +94,7 @@ render(struct output *output)
 
 #if defined(WBG_HAVE_SVG)
     if (!src) {
-        src = svg_render(width * scale, height * scale);
+        src = svg_render(width * scale, height * scale, stretch);
         is_svg = true;
     }
 #endif
diff --git a/svg.c b/svg.c
index b9d5d6e..a62793f 100644
--- a/svg.c
+++ b/svg.c
@@ -1,4 +1,5 @@
 #include "svg.h"
+#include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -31,7 +32,7 @@ svg_load(FILE *fp, const char *path)
 }
 
 pixman_image_t *
-svg_render(const int width, const int height)
+svg_render(const int width, const int height, bool stretch)
 {
     pixman_image_t *pix = NULL;
     uint8_t *data = NULL;
@@ -42,8 +43,7 @@ svg_render(const int width, const int height)
 
     double sx = width / (double)svg_image->width;
     double sy = height / (double)svg_image->height;
-
-    float s = sx > sy ? sy : sx;
+    double s = stretch ? fmax(sx, sy) : fmin(sx, sy);
 
     float tx = (width - svg_image->width * s) / 2;
     float ty = (height - svg_image->height * s) / 2;
diff --git a/svg.h b/svg.h
index 89a6253..ffc766f 100644
--- a/svg.h
+++ b/svg.h
@@ -5,5 +5,5 @@
 #include <pixman.h>
 
 bool svg_load(FILE *fp, const char *path);
-pixman_image_t *svg_render(const int width, const int height);
+pixman_image_t *svg_render(const int width, const int height, bool stretch);
 void svg_free();