diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-14 16:19:57 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-14 16:19:57 -0500 |
| commit | 3bd4397b6ec5212bfe53a36892746962dc45dbeb (patch) | |
| tree | 0aa06742564779de5995e9145368da1275cee3bd /obrender/image.c | |
| parent | 937b529893cb93859245ad2f0e46d31bfd2f8097 (diff) | |
| parent | 374888f5e9c3c98204a708ef40afec86d136d836 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/frame.c
Diffstat (limited to 'obrender/image.c')
| -rw-r--r-- | obrender/image.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/obrender/image.c b/obrender/image.c index 671b7aee..f86a3ee0 100644 --- 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 */ |