From ba186ffd10662b08a87212c7257c12c1d3cc35fc Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Mon, 7 Nov 2011 12:09:38 +0100 Subject: [PATCH] avoid division by 0 --- pandora/archive/extract.py | 7 ++++--- pandora/clip/managers.py | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py index 1c952ffe0..8fa9360cb 100644 --- a/pandora/archive/extract.py +++ b/pandora/archive/extract.py @@ -317,9 +317,10 @@ def average_color(prefix, start=0, end=0): if end: frames = end - start - for i in range(0, len(pixels)): - p = np.sum(pixels[i], axis=0) / frames - color += p + if frames: + for i in range(0, len(pixels)): + p = np.sum(pixels[i], axis=0) / frames + color += p color = list(map(float, color)) return ox.image.getHSL(color) diff --git a/pandora/clip/managers.py b/pandora/clip/managers.py index eae7e1f2a..82b02dec5 100644 --- a/pandora/clip/managers.py +++ b/pandora/clip/managers.py @@ -59,6 +59,9 @@ def parseCondition(condition, user): return ~q else: return q + if (not exclude and op == '=' or op in ('$', '^', '>=', '<')) and v == '': + return Q(True) + if k.endswith('__id'): v = decode_id(v) if isinstance(v, bool): #featured and public flag