diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp index e380941fc63..d10db53dc47 100644 --- a/content/svg/content/src/nsSVGFilters.cpp +++ b/content/svg/content/src/nsSVGFilters.cpp @@ -1499,8 +1499,8 @@ nsSVGFECompositeElement::Filter(nsSVGFilterInstance *instance, for (PRInt32 y = rect.y; y < rect.YMost(); y++) { PRUint32 targIndex = y * stride + 4 * x; for (PRInt32 i = 0; i < 4; i++) { - PRUint8 i2 = targetData[targIndex + i]; - PRUint8 i1 = sourceData[targIndex + i]; + PRUint8 i1 = targetData[targIndex + i]; + PRUint8 i2 = sourceData[targIndex + i]; float result = k1Scaled*i1*i2 + k2*i1 + k3*i2 + k4Scaled; targetData[targIndex + i] = static_cast(PR_MIN(PR_MAX(0, result), 255)); diff --git a/layout/reftests/svg/filters/feComposite-arguments-01.svg b/layout/reftests/svg/filters/feComposite-arguments-01.svg new file mode 100644 index 00000000000..acec685ffc1 --- /dev/null +++ b/layout/reftests/svg/filters/feComposite-arguments-01.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/layout/reftests/svg/filters/reftest.list b/layout/reftests/svg/filters/reftest.list index dc78a302b21..8aa6debe22b 100644 --- a/layout/reftests/svg/filters/reftest.list +++ b/layout/reftests/svg/filters/reftest.list @@ -67,6 +67,7 @@ fails == filter-marked-line-01.svg pass.svg # bug 477704 == filter-patterned-rect-01.svg pass.svg == filter-patterned-rect-02.svg pass.svg +== feComposite-arguments-01.svg pass.svg == feConvolveMatrix-order-01.svg feConvolveMatrix-order-01-ref.svg == feMorphology-radius-negative-01.svg pass.svg