all repos — openbox @ d47d5a2801fb2bb3a23d9a53267d33a679109551

openbox fork - make it a bit more like ryudo 

When icons had a very small aspect ratio, we crashed, don't.
Mikael Magnusson mikachu@comhem.se
commit

d47d5a2801fb2bb3a23d9a53267d33a679109551

parent

0e92465751019197a19680c56984664afb7c7999

1 files changed, 9 insertions(+), 3 deletions(-)

jump to
M render/image.c → render/image.c 
@@ -124,6 +124,12 @@ gulong srcX1, srcX2, srcY1, srcY2;
     gulong ratioX, ratioY;
     gulong aspectW, aspectH;
 
+    /* XXX should these variables be ensured to not be zero in the callers? */
+    srcW = srcW ? srcW : 1;
+    srcH = srcH ? srcH : 1;
+    dstW = dstW ? dstW : 1;
+    dstH = dstH ? dstH : 1;
+
     /* keep the aspect ratio */
     aspectW = dstW;
     aspectH = (gint)(dstW * ((gdouble)srcH / srcW));

@@ -131,11 +137,11 @@ if (aspectH > dstH) {
         aspectH = dstH;
         aspectW = (gint)(dstH * ((gdouble)srcW / srcH));
     }
-    dstW = aspectW;
-    dstH = aspectH;
+    dstW = aspectW ? aspectW : 1;
+    dstH = aspectH ? aspectH : 1;
 
     if (srcW == dstW && srcH == dstH)
-        return NULL; /* no scaling needed ! */
+        return NULL; /* no scaling needed! */
 
     dststart = dst = g_new(RrPixel32, dstW * dstH);