summaryrefslogtreecommitdiff
path: root/2004/i/nono/src/ovision/segmNN.cc
diff options
context:
space:
mode:
authorgaillaro2004-08-08 11:29:43 +0000
committergaillaro2004-08-08 11:29:43 +0000
commitc2fc583752a443cb6adc8b918d1c3f442137885a (patch)
tree3a981d5e5b88c1adb68f484e0d38c424b321e1e8 /2004/i/nono/src/ovision/segmNN.cc
parent71416a4de8daaf0d36bce016c5f34b3fc6576ea5 (diff)
Changement de la prise en charge des differents mode de couleur
Diffstat (limited to '2004/i/nono/src/ovision/segmNN.cc')
-rw-r--r--2004/i/nono/src/ovision/segmNN.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/2004/i/nono/src/ovision/segmNN.cc b/2004/i/nono/src/ovision/segmNN.cc
index 5667e75..05c8564 100644
--- a/2004/i/nono/src/ovision/segmNN.cc
+++ b/2004/i/nono/src/ovision/segmNN.cc
@@ -67,7 +67,7 @@ SegmNN::WinnerOutput (unsigned char *x)
tmp = node[j*3+k]-x[k];
// Si on est en yuv ou hsi et que c'est la composante de luminosite on ajoute un poids sur son influence
- if ((img->yuv && k==0) || (img->hsi && k==2))
+ if (((img->colorMode == YUV) && k==0) || ((img->colorMode == HSI) && k==2))
output[j] += (int) oconfig->nn_influ_lum * tmp * tmp;
// Sinon calcul normal
else
@@ -146,7 +146,7 @@ SegmNN::FindColorNN (unsigned char *x, bool testOutputMax)
tmp = node[j*3+k]-x[k];
// Si on est en yuv ou hsi et que c'est la composante de luminosite, on ajoute un poids pour affecter son influence
- if ((img->yuv && k==0) || (img->hsi && k==2))
+ if (((img->colorMode == YUV) && k==0) || ((img->colorMode == HSI) && k==2))
output[j] += (int) oconfig->nn_influ_lum * tmp * tmp;
// Sinon calcul normal
else