Commit 0d7e332c by Dirk

Added missing checks.

parent e4532fdf
Showing with 8 additions and 4 deletions
......@@ -398,8 +398,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,
object[id].color.red+=QuantumScale*GetPixelRed(image,p);
object[id].color.green+=QuantumScale*GetPixelGreen(image,p);
object[id].color.blue+=QuantumScale*GetPixelBlue(image,p);
object[id].color.black+=QuantumScale*GetPixelBlack(image,p);
object[id].color.alpha+=QuantumScale*GetPixelAlpha(image,p);
if (image->alpha_trait != UndefinedPixelTrait)
object[id].color.alpha+=QuantumScale*GetPixelAlpha(image,p);
if (image->colorspace == CMYKColorspace)
object[id].color.black+=QuantumScale*GetPixelBlack(image,p);
object[id].centroid.x+=x;
object[id].centroid.y+=y;
object[id].area++;
......@@ -439,8 +441,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,
object[i].color.red=QuantumRange*(object[i].color.red/object[i].area);
object[i].color.green=QuantumRange*(object[i].color.green/object[i].area);
object[i].color.blue=QuantumRange*(object[i].color.blue/object[i].area);
object[i].color.alpha=QuantumRange*(object[i].color.alpha/object[i].area);
object[i].color.black=QuantumRange*(object[i].color.black/object[i].area);
if (image->alpha_trait != UndefinedPixelTrait)
object[i].color.alpha=QuantumRange*(object[i].color.alpha/object[i].area);
if (image->colorspace == CMYKColorspace)
object[i].color.black=QuantumRange*(object[i].color.black/object[i].area);
object[i].centroid.x=object[i].centroid.x/object[i].area;
object[i].centroid.y=object[i].centroid.y/object[i].area;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment