aboutsummaryrefslogtreecommitdiffstats
path: root/image.c
diff options
context:
space:
mode:
Diffstat (limited to 'image.c')
-rw-r--r--image.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/image.c b/image.c
index 1c56c92..4868900 100644
--- a/image.c
+++ b/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.17 2002/11/15 15:51:24 ukai Exp $ */
+/* $Id: image.c,v 1.18 2002/11/15 15:56:36 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
@@ -630,14 +630,16 @@ getImageSize(ImageCache * cache)
if (h == 0)
h = 1;
if (cache->width < 0 && cache->height < 0) {
- cache->width = w;
- cache->height = h;
+ cache->width = (w > MAX_IMAGE_SIZE) ? MAX_IMAGE_SIZE: w;
+ cache->height = (h > MAX_IMAGE_SIZE) ? MAX_IMAGE_SIZE: h;
}
else if (cache->width < 0) {
- cache->width = (int)((double)cache->height * w / h + 0.5);
+ int tmp = (int)((double)cache->height * w / h + 0.5);
+ cache->width = (tmp > MAX_IMAGE_SIZE) ? MAX_IMAGE_SIZE: tmp;
}
else if (cache->height < 0) {
- cache->height = (int)((double)cache->width * h / w + 0.5);
+ int tmp = (int)((double)cache->width * h / w + 0.5);
+ cache->height = (tmp > MAX_IMAGE_SIZE) ? MAX_IMAGE_SIZE: tmp;
}
if (cache->width == 0)
cache->width = 1;