summaryrefslogtreecommitdiff
path: root/2004/i/nono/src/ovision/comm.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/comm.cc
parent71416a4de8daaf0d36bce016c5f34b3fc6576ea5 (diff)
Changement de la prise en charge des differents mode de couleur
Diffstat (limited to '2004/i/nono/src/ovision/comm.cc')
-rw-r--r--2004/i/nono/src/ovision/comm.cc15
1 files changed, 11 insertions, 4 deletions
diff --git a/2004/i/nono/src/ovision/comm.cc b/2004/i/nono/src/ovision/comm.cc
index 415d477..c312e70 100644
--- a/2004/i/nono/src/ovision/comm.cc
+++ b/2004/i/nono/src/ovision/comm.cc
@@ -69,10 +69,18 @@ Comm::Comm(char *filename)
group = new Group(&img, segm);
SegmAndGroup();
- // Affichage de l'image pilote en RGB et YUV
+ // Affichage de l'image pilote avec la couleur d'aquisition et en RGB
tex[1] = LoadImage(img.width, img.height, data[0], tex[1]);
- tex[4] = LoadImage(img.width, img.height, data[1], tex[4]);
-
+
+ if (img.colorMode != RGB)
+ {
+ ConvertImg conv;
+ conv.ConvertToRGB (img);
+ tex[4] = LoadImage(img.width, img.height, data[1], tex[4]);
+ img.LoadRGB(filename, 0, 360, 296);
+ }
+
+
yuvSwitch = 0;
imgLeft[1] = NULL;
}
@@ -403,7 +411,6 @@ Comm::ExecuteUiCmds(char *buffer)
yuvSwitch++;
- cout << img.yuv << endl;
// Conversion en YUV et stockage
img.LoadRGB(fname, 0, 360, 296);
if (yuvSwitch%3 == 1)