summaryrefslogtreecommitdiff
path: root/2005/i
diff options
context:
space:
mode:
authordufourj2005-06-05 17:18:17 +0000
committerdufourj2005-06-05 17:18:17 +0000
commitf3dae352baefb31b7bcc939a562df7712bcad58e (patch)
treeb748045c2a45e2ed15c168c954d038761f07b803 /2005/i
parente3a7a94988aa9286f0db35068e89fd398105afcc (diff)
Correction de la segfault dans OVision (variable non initialisé).
Correction des chemins de libz.a dans les Makefiles.
Diffstat (limited to '2005/i')
-rw-r--r--2005/i/robert/src/ovision/see/Makefile.defs4
-rw-r--r--2005/i/robert/src/ovision/see/ovision.cc3
2 files changed, 4 insertions, 3 deletions
diff --git a/2005/i/robert/src/ovision/see/Makefile.defs b/2005/i/robert/src/ovision/see/Makefile.defs
index f930295..b45f29b 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)
-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
+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 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 /usr/lib/libz.a
+genct_OBJECTS = genct.o oconfig.o segm.o segmLearn.o colorTable.o 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 220bd89..a316306 100644
--- a/2005/i/robert/src/ovision/see/ovision.cc
+++ b/2005/i/robert/src/ovision/see/ovision.cc
@@ -4,7 +4,8 @@
/// Constructeur
OVision::OVision (bool useSocket)
: oconfig_ (0), img_ (0), colorTab_ (0), segm_ (0), eraser_ (0),
- group_ (0), mag_ (0), v4l_ (0), step_ (0), aim_ (Group::undefined) //map_ (0),
+ group_ (0), mag_ (0), space_ (0), v4l_ (0), step_ (0),
+ aim_ (Group::undefined) //map_ (0),
{
// socket_ = 0;
}