summaryrefslogtreecommitdiff
path: root/2005/i/robert/src/ovision
diff options
context:
space:
mode:
authordufourj2005-05-07 01:36:46 +0000
committerdufourj2005-05-07 01:36:46 +0000
commit3ece446c2a9198b4b50323cd1b3a5182114c26df (patch)
tree923e40413c7efe5570d30659245c24137ae7c55f /2005/i/robert/src/ovision
parenta32c76bb0347d70c321957d26ca9b4df19778030 (diff)
M2ga commit bordelique du vendredi à 3h du matin avec un gars lourd
Diffstat (limited to '2005/i/robert/src/ovision')
-rw-r--r--2005/i/robert/src/ovision/see/Makefile.defs6
-rw-r--r--2005/i/robert/src/ovision/see/ovision.cc8
2 files changed, 7 insertions, 7 deletions
diff --git a/2005/i/robert/src/ovision/see/Makefile.defs b/2005/i/robert/src/ovision/see/Makefile.defs
index e75b320..f930295 100644
--- a/2005/i/robert/src/ovision/see/Makefile.defs
+++ b/2005/i/robert/src/ovision/see/Makefile.defs
@@ -1,12 +1,12 @@
PROGRAMS += test_ovision test_img test_group test_map test_ovisiontracker test_cam test_segm test_magnifier test_ovision test_colortable test_space genct n2ml test_hotelling test_eraser
-LIBS += $(ovision_OBJECTS)
+#LIBS += $(ovision_OBJECTS)
-ovision_OBJECTS = convertImg.o img.o oconfig.o segmTable.o hotelling.o segm.o imgInterface.o colorTable.o segmTable.o segmLearn.o group.o magnifier.o skittle.o ovision.o -lz space.o eraser.o# map.o
+ovision_OBJECTS = convertImg.o img.o oconfig.o segmTable.o hotelling.o segm.o imgInterface.o colorTable.o segmTable.o segmLearn.o group.o magnifier.o skittle.o ovision.o space.o eraser.o /usr/lib/libz.a# map.o
test_img_OBJECTS = test_img.o img.o imgInterface.o oconfig.o $(image_OBJECTS) $(data_OBJECTS) $(net_OBJECTS)
test_eraser_OBJECTS = test_eraser.o eraser.o oconfig.o $(image_OBJECTS) $(data_OBJECTS) $(net_OBJECTS)
n2ml_OBJECTS = n2ml.o oconfig.o img.o segm.o segmLearn.o $(image_OBJECTS) $(data_OBJECTS) $(net_OBJECTS)
-genct_OBJECTS = genct.o oconfig.o segm.o segmLearn.o colorTable.o -lz
+genct_OBJECTS = genct.o oconfig.o segm.o segmLearn.o colorTable.o /usr/lib/libz.a
test_hotelling_OBJECTS = test_hotelling.o hotelling.o oconfig.o
test_cam_OBJECTS = test_cam.o img.o imgInterface.o oconfig.o $(video4linux_OBJECTS) $(image_OBJECTS) $(utils_OBJECTS) $(data_OBJECTS) $(net_OBJECTS)
test_segm_OBJECTS = test_segm.o img.o segm.o segmLearn.o oconfig.o imgInterface.o colorTable.o segmTable.o $(image_OBJECTS) $(data_OBJECTS) $(net_OBJECTS)
diff --git a/2005/i/robert/src/ovision/see/ovision.cc b/2005/i/robert/src/ovision/see/ovision.cc
index 8b7b28d..220bd89 100644
--- a/2005/i/robert/src/ovision/see/ovision.cc
+++ b/2005/i/robert/src/ovision/see/ovision.cc
@@ -4,7 +4,7 @@
/// Constructeur
OVision::OVision (bool useSocket)
: oconfig_ (0), img_ (0), colorTab_ (0), segm_ (0), eraser_ (0),
- group_ (0), mag_ (0), step_ (0), aim_ (Group::undefined) //map_ (0),
+ group_ (0), mag_ (0), v4l_ (0), step_ (0), aim_ (Group::undefined) //map_ (0),
{
// socket_ = 0;
}
@@ -31,18 +31,18 @@ OVision::init (const Group::ZoneType aim)
// Initialisation des classes
if (aim == Group::redSkittle)
{
- colorTab_ = new ColorTable ("../runtime/rc/colortableGreen.z");
+ colorTab_ = new ColorTable ("../runtime/rc/colortableRed.z");
oconfig_->nnInfluLum = 0.4;
oconfig_->groupColor.clear ();
ObjectColor tmp;
tmp.label = "redSkittle";
- tmp.color = 0;
+ tmp.color = 3;
tmp.type = aim;
oconfig_->groupColor.push_back (tmp);
}
else
{
- colorTab_ = new ColorTable ("../runtime/rc/colortableRed.z");
+ colorTab_ = new ColorTable ("../runtime/rc/colortableGreen.z");
oconfig_->nnInfluLum = 0.4;
ObjectColor tmp;
oconfig_->groupColor.clear ();