0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

fix color merge

Browse source
This commit is contained in:
j 2011-10-28 11:58:40 +02:00
parent b719c544ad
commit eef82edda8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/item/models.py
View file

@ -892,7 +892,7 @@ class Item(models.Model):
for s in streams: for s in streams:
for c in s.cuts: for c in s.cuts:
self.data['cuts'].append(c+offset) self.data['cuts'].append(c+offset)
color = map(lambda a,b: (a+b)/n, color,ox.image.getRGB(s.color)) color = map(lambda a,b: (a+b)/n, color,ox.image.getRGB(s.color))
offset += s.duration offset += s.duration
self.data['color'] = ox.image.getHSL(color) self.data['color'] = ox.image.getHSL(color)
#extract.timeline_strip(self, self.data['cuts'], stream.info, self.timeline_prefix[:-8]) #extract.timeline_strip(self, self.data['cuts'], stream.info, self.timeline_prefix[:-8])