summaryrefslogtreecommitdiff
path: root/2004/i/nono/src/ovision/group.cc
diff options
context:
space:
mode:
authorgaillaro2004-05-06 20:11:03 +0000
committergaillaro2004-05-06 20:11:03 +0000
commita3c3e7599df9a4748c30aab108ef414b1e12cba0 (patch)
tree0ad73fa5f213e6d2d695a435e56998fc59771fea /2004/i/nono/src/ovision/group.cc
parent99294453118e8d992716ab5a63b1bd1114bb74ec (diff)
ajout du fichier dist et des points dans adjust
Diffstat (limited to '2004/i/nono/src/ovision/group.cc')
-rw-r--r--2004/i/nono/src/ovision/group.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/2004/i/nono/src/ovision/group.cc b/2004/i/nono/src/ovision/group.cc
index 482bb93..9228d7b 100644
--- a/2004/i/nono/src/ovision/group.cc
+++ b/2004/i/nono/src/ovision/group.cc
@@ -62,10 +62,10 @@ Group::~Group() {
/// @param numColor numero de la couleur a chercher
/// @param x,y coordonnees de depart pour la recherche
void Group::Plague(int type, unsigned char numColor, int x, int y) {
- unsigned int xmax = x;
- unsigned int xmin = x;
- unsigned int ymax = y;
- unsigned int ymin = y;
+ int xmax = x;
+ int xmin = x;
+ int ymax = y;
+ int ymin = y;
// TODO ajouter une inertie ?
@@ -119,7 +119,7 @@ void Group::Plague(int type, unsigned char numColor, int x, int y) {
pLast = pCur;
pCur = pCur->next;
}
-
+
// Si il n'est pas presente on l'ajoute
if (!pCur) {
@@ -193,10 +193,12 @@ void Group::JumpPoints(unsigned char numColor) {
numColor = segm->index[numColor];
// Parcours d'une partie des pixels de l'image
- for (unsigned int x=0; x<width; x+=10) {
- for (unsigned int y=0; y<height; y+=10) {
+ for (int x=0; x<width; x+=10) {
+ for (int y=0; y<height; y+=10) {
if (tabSegm[y*width+x] == numColor)
+ {
Plague(BALL, numColor, x, y);
+ }
}
}
@@ -225,8 +227,8 @@ void Group::TabOut() {
// Parcours de la liste des zones trouvees
while (pCur) {
// Remplissage de la zone avec une couleur
- for(unsigned int i=pCur->xmin; i<pCur->xmax; i++)
- for (unsigned int j=pCur->ymin; j<pCur->ymax; j++)
+ for(int i=pCur->xmin; i<pCur->xmax; i++)
+ for (int j=pCur->ymin; j<pCur->ymax; j++)
tabOut[j*img->width+i] = pCur->idColor+1;
pCur = pCur->next;