Merge branch 'backport' into work

[chaz/openbox] / obrender / image.c

diff --git a/obrender/image.c b/obrender/image.c
index 671b7aeeb294f0c09beffad2121017c443bc3b46..f86a3ee008c2410964f435b49116743651735c26 100644 (file)
--- a/obrender/image.c
+++ b/obrender/image.c
@@ -532,7 +532,9 @@ void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img,
 
             /* our size difference metric.. */
             wdiff = self->original[i]->width - area->width;
+            if (wdiff < 0) wdiff *= 2; /* prefer scaling down than up */
             hdiff = self->original[i]->height - area->height;
+            if (hdiff < 0) hdiff *= 2; /* prefer scaling down than up */
             diff = (wdiff * wdiff) + (hdiff * hdiff);
 
             /* find the smallest difference */