Apply a fix proposed by Jan Thor in bug 702423, to correct a code error that may be part of a bug whereby non-duplicate gradients are removed when using --disable-style-to-xml.
This commit is contained in:
parent
cd63079879
commit
6dc2553bed
1 changed files with 4 additions and 3 deletions
7
scour.py
7
scour.py
|
|
@ -1054,11 +1054,12 @@ def removeDuplicateGradientStops(doc):
|
||||||
|
|
||||||
color = stop.getAttribute('stop-color')
|
color = stop.getAttribute('stop-color')
|
||||||
opacity = stop.getAttribute('stop-opacity')
|
opacity = stop.getAttribute('stop-opacity')
|
||||||
|
style = stop.getAttribute('style')
|
||||||
if stops.has_key(offset) :
|
if stops.has_key(offset) :
|
||||||
oldStop = stops[offset]
|
oldStop = stops[offset]
|
||||||
if oldStop[0] == color and oldStop[1] == opacity:
|
if oldStop[0] == color and oldStop[1] == opacity and oldStop[2] == style:
|
||||||
stopsToRemove.append(stop)
|
stopsToRemove.append(stop)
|
||||||
stops[offset] = [color, opacity]
|
stops[offset] = [color, opacity, style]
|
||||||
|
|
||||||
for stop in stopsToRemove:
|
for stop in stopsToRemove:
|
||||||
stop.parentNode.removeChild(stop)
|
stop.parentNode.removeChild(stop)
|
||||||
|
|
@ -1166,7 +1167,7 @@ def removeDuplicateGradients(doc):
|
||||||
if stopsNotEqual: break
|
if stopsNotEqual: break
|
||||||
stop = stops.item(i)
|
stop = stops.item(i)
|
||||||
ostop = ostops.item(i)
|
ostop = ostops.item(i)
|
||||||
for attr in ['offset', 'stop-color', 'stop-opacity']:
|
for attr in ['offset', 'stop-color', 'stop-opacity', 'style']:
|
||||||
if stop.getAttribute(attr) != ostop.getAttribute(attr):
|
if stop.getAttribute(attr) != ostop.getAttribute(attr):
|
||||||
stopsNotEqual = True
|
stopsNotEqual = True
|
||||||
break
|
break
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue