Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 562487 - comparison between signed and unsigned integer expressions in BoxBlur and nsSVGFETileElement::Filter, r=roc

Browse Source
This commit is contained in:
timeless@mozdev.org 2010-04-28 16:15:00 -07:00
parent d87f981eb5
commit 89bfd67671
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
content/svg/content/src/nsSVGFilters.cpp
View File

@ -519,13 +519,13 @@ static PRUint32 ComputeScaledDivisor(PRUint32 aDivisor)
static void
BoxBlur(const PRUint8 *aInput, PRUint8 *aOutput,
PRInt32 aStrideMinor, PRInt32 aStartMinor, PRInt32 aEndMinor,
PRUint32 aLeftLobe, PRUint32 aRightLobe, PRBool aAlphaOnly)
PRInt32 aLeftLobe, PRInt32 aRightLobe, PRBool aAlphaOnly)
{
PRUint32 boxSize = aLeftLobe + aRightLobe + 1;
PRUint32 scaledDivisor = ComputeScaledDivisor(boxSize);
PRUint32 sums[4] = {0, 0, 0, 0};
PRInt32 boxSize = aLeftLobe + aRightLobe + 1;
PRInt32 scaledDivisor = ComputeScaledDivisor(boxSize);
PRInt32 sums[4] = {0, 0, 0, 0};
for (PRUint32 i=0; i < boxSize; i++) {
for (PRInt32 i=0; i < boxSize; i++) {
PRInt32 pos = aStartMinor - aLeftLobe + i;
pos = NS_MAX(pos, aStartMinor);
pos = NS_MIN(pos, aEndMinor - 1);
@ -551,13 +551,17 @@ BoxBlur(const PRUint8 *aInput, PRUint8 *aOutput,
SUM(GFX_ARGB32_OFFSET_G); \
SUM(GFX_ARGB32_OFFSET_R); } \
SUM(GFX_ARGB32_OFFSET_A);
for (PRInt32 minor = aStartMinor; minor < aStartMinor + aLeftLobe; minor++) {
for (PRInt32 minor = aStartMinor;
minor < aStartMinor + aLeftLobe;
minor++) {
OUTPUT_PIXEL();
SUM_PIXEL();
nextInput += aStrideMinor;
aOutput += aStrideMinor;
}
for (PRInt32 minor = aStartMinor + aLeftLobe; minor < aEndMinor - aRightLobe - 1; minor++) {
for (PRInt32 minor = aStartMinor + aLeftLobe;
minor < aEndMinor - aRightLobe - 1;
minor++) {
OUTPUT_PIXEL();
SUM_PIXEL();
lastInput += aStrideMinor;
@ -2961,10 +2965,10 @@ nsSVGFETileElement::Filter(nsSVGFilterInstance *instance,
nsIntPoint offset(-tile.x + tile.width, -tile.y + tile.height);
for (PRInt32 y = rect.y; y < rect.YMost(); y++) {
PRUint32 tileY = tile.y + WrapInterval(y + offset.y, tile.height);
if (tileY < surfaceRect.height) {
if (tileY < (PRUint32)surfaceRect.height) {
for (PRInt32 x = rect.x; x < rect.XMost(); x++) {
PRUint32 tileX = tile.x + WrapInterval(x + offset.x, tile.width);
if (tileX < surfaceRect.width) {
if (tileX < (PRUint32)surfaceRect.width) {
*(PRUint32*)(targetData + y * stride + 4 * x) =
*(PRUint32*)(sourceData + tileY * stride + 4 * tileX);
}