decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

avoid division by 0

Browse source
This commit is contained in:
j 2011-11-07 12:09:38 +01:00
parent 3bed914023
commit ba186ffd10
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pandora/archive/extract.py
View file

@ -317,6 +317,7 @@ def average_color(prefix, start=0, end=0):
if end: if end:
frames = end - start frames = end - start
if frames:
for i in range(0, len(pixels)): for i in range(0, len(pixels)):
p = np.sum(pixels[i], axis=0) / frames p = np.sum(pixels[i], axis=0) / frames
color += p color += p

3
pandora/clip/managers.py
View file

@ -59,6 +59,9 @@ def parseCondition(condition, user):
return ~q return ~q
else: else:
return q return q
if (not exclude and op == '=' or op in ('$', '^', '>=', '<')) and v == '':
return Q(True)
if k.endswith('__id'): if k.endswith('__id'):
v = decode_id(v) v = decode_id(v)
if isinstance(v, bool): #featured and public flag if isinstance(v, bool): #featured and public flag