2002-01-14 Jerome Darbon <jerome@epita.fr>

	* demo/Makefile.am (test_reconstruction_SOURCES): New.
	* tests/test-construction.cc: New file.
	* img/lena.pgm: New file.
	* Makefile.am (EXTRA_DIST): Add it.

    prcs2git-id: 0_2.18

.oln.prcs_aux

@@ -37,9 +37,9 @@
 (README 4490 1010848824 1_README 1.2)
 (src/core/w_window3d.hh 3230 1009823825 c/17_w_window3d 1.1)
 (src/core/point3d.hxx 3199 1009823825 c/27_point3d.hx 1.1)
-(demo/Makefile.in 8484 1010943161 e/16_Makefile.i 1.2)
+(demo/Makefile.in 9258 1011005992 e/16_Makefile.i 1.3)
 (src/value/rec_int.hh 3500 1009823825 b/37_rec_int.hh 1.1)
-(ChangeLog 44203 1011004755 6_ChangeLog 1.11)
+(ChangeLog 44411 1011005992 6_ChangeLog 1.12)
 (tools/missing 10278 1010854101 e/13_missing 1.1)
 (src/core/dpoint1d.hh 2470 1009823825 d/27_dpoint1d.h 1.1)
 (src/math/macros.hh 3503 1009823825 b/21_macros.hh 1.1)
@@ -48,7 +48,7 @@
 (src/core/old/image2d_bin.hh 3428 1009823825 c/50_image2d_bi 1.1)
 (src/value/rec_value.hh 6904 1009823825 b/36_rec_value. 1.1)
 (src/core/point3d.hh 2627 1009823825 c/28_point3d.hh 1.1)
-(Makefile.in 12603 1010996113 e/9_Makefile.i 1.4)
+(Makefile.in 12619 1011005992 e/9_Makefile.i 1.5)
 (doc/configure 75984 1011002001 e/3_configure 1.3)
 (src/morpho/laplacian.inc 2766 1010999792 41_laplacian. 1.2)
 (tools/ChangeLog 203 1010921900 e/18_ChangeLog 1.1)
@@ -166,12 +166,12 @@
 (src/value/xyz.hh 1911 1009823825 b/32_xyz.hh 1.1)
 (src/core/fold.hh 2496 1009823825 c/7_fold.hh 1.1)
 (src/value/hsi.hh 1913 1009823825 b/30_hsi.hh 1.1)
-(doc/tpl/processing.tpl 5747 1011002001 d/48_processing 1.6)
+(doc/tpl/processing.tpl 5747 1011005992 d/48_processing 1.7)
 (src/core/window2d.hh 5194 1009823825 c/14_window2d.h 1.1)
 (src/core/image.hh 2199 1009823825 d/18_image.hh 1.1)
 (src/morpho/gradient.hh 1686 1009823825 b/3_gradient.h 1.1)
 (src/basics.hh 1943 1009823825 d/42_basics.hh 1.1)
-(demo/Makefile.am 265 1009823825 d/44_Makefile.a 1.1)
+(demo/Makefile.am 338 1011005992 d/44_Makefile.a 1.2)
 (src/core/bkd_iter3d.hh 2417 1009823825 d/36_bkd_iter3d 1.1)
 (src/convert/nrgbyiq.hh 3156 1009823825 14_nrgbyiq.hh 1.1)
 (src/core/dpoint3d.hxx 3042 1009823825 d/22_dpoint3d.h 1.1)
@@ -184,7 +184,7 @@
 (src/core/internal/fake.hh 1888 1009823825 d/17_fake.hh 1.1)
 (src/value/yiq.hh 1911 1009823825 b/29_yiq.hh 1.1)
 (src/value/int_u.hh 6745 1009823825 b/42_int_u.hh 1.1)
-(Makefile.am 246 1010996113 2_Makefile.a 1.4)
+(Makefile.am 262 1011005992 2_Makefile.a 1.5)
 (src/value/hsl.hh 1913 1009823825 b/26_hsl.hh 1.1)
 (src/value/all.hh 1717 1009823825 b/50_all.hh 1.1)
 (src/core/image3d.hh 4697 1009823825 c/43_image3d.hh 1.1)

ChangeLog

+2002-01-14  Jerome Darbon  <jerome@epita.fr>
+
+	* demo/Makefile.am (test_reconstruction_SOURCES): New.
+	* tests/test-construction.cc: New file.
+	* img/lena.pgm: New file.
+	* Makefile.am (EXTRA_DIST): Add it.
+
 2002-01-14  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	* src/level/connected.hh: Doc update from Jerome.

Makefile.am

@@ -2,5 +2,5 @@
 
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.5b
 SUBDIRS = src demo
-EXTRA_DIST = img/lena.pgm ISSUES \
+EXTRA_DIST = img/lena.pgm img/lena128.pgm ISSUES \
   doc/doc/oln-ref.info doc/doc/oln-ref.pdf doc/doc/oln-ref.ps doc/doc/html

Makefile.in

@@ -74,7 +74,7 @@ install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.5b
 SUBDIRS = src demo
-EXTRA_DIST = img/lena.pgm ISSUES \
+EXTRA_DIST = img/lena.pgm img/lena128.pgm ISSUES \
   doc/doc/oln-ref.info doc/doc/oln-ref.pdf doc/doc/oln-ref.ps doc/doc/html
 
 subdir = .

demo/Makefile.am

@@ -2,6 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/src
 AM_CXXFLAGS = -Wall -W -DNDEBUG -ftemplate-depth-50 -ansi -pedantic
-noinst_PROGRAMS = tour morpholena
+noinst_PROGRAMS = tour morpholena test-reconstruction
 tour_SOURCES = tour.cc
 morpholena_SOURCES = morpholena.cc
+test_reconstruction_SOURCES = test-reconstruction.cc

demo/Makefile.in

@@ -74,13 +74,15 @@ install_sh = @install_sh@
 
 INCLUDES = -I$(top_srcdir)/src
 AM_CXXFLAGS = -Wall -W -DNDEBUG -ftemplate-depth-50 -ansi -pedantic
-noinst_PROGRAMS = tour morpholena
+noinst_PROGRAMS = tour morpholena test-reconstruction
 tour_SOURCES = tour.cc
 morpholena_SOURCES = morpholena.cc
+test_reconstruction_SOURCES = test-reconstruction.cc
 subdir = demo
 mkinstalldirs = $(SHELL) $(top_srcdir)/tools/mkinstalldirs
 CONFIG_CLEAN_FILES =
-noinst_PROGRAMS = tour$(EXEEXT) morpholena$(EXEEXT)
+noinst_PROGRAMS = tour$(EXEEXT) morpholena$(EXEEXT) \
+	test-reconstruction$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 
 am_morpholena_OBJECTS = morpholena.$(OBJEXT)
@@ -88,6 +90,11 @@ morpholena_OBJECTS = $(am_morpholena_OBJECTS)
 morpholena_LDADD = $(LDADD)
 morpholena_DEPENDENCIES =
 morpholena_LDFLAGS =
+am_test_reconstruction_OBJECTS = test-reconstruction.$(OBJEXT)
+test_reconstruction_OBJECTS = $(am_test_reconstruction_OBJECTS)
+test_reconstruction_LDADD = $(LDADD)
+test_reconstruction_DEPENDENCIES =
+test_reconstruction_LDFLAGS =
 am_tour_OBJECTS = tour.$(OBJEXT)
 tour_OBJECTS = $(am_tour_OBJECTS)
 tour_LDADD = $(LDADD)
@@ -101,16 +108,18 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/tools/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/morpholena.Po $(DEPDIR)/tour.Po
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/morpholena.Po \
+@AMDEP_TRUE@	$(DEPDIR)/test-reconstruction.Po $(DEPDIR)/tour.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
 CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(morpholena_SOURCES) $(tour_SOURCES)
+DIST_SOURCES = $(morpholena_SOURCES) $(test_reconstruction_SOURCES) \
+	$(tour_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(morpholena_SOURCES) $(tour_SOURCES)
+SOURCES = $(morpholena_SOURCES) $(test_reconstruction_SOURCES) $(tour_SOURCES)
 
 all: all-am
 
@@ -127,6 +136,9 @@ clean-noinstPROGRAMS:
 morpholena$(EXEEXT): $(morpholena_OBJECTS) $(morpholena_DEPENDENCIES) 
 	@rm -f morpholena$(EXEEXT)
 	$(CXXLINK) $(morpholena_LDFLAGS) $(morpholena_OBJECTS) $(morpholena_LDADD) $(LIBS)
+test-reconstruction$(EXEEXT): $(test_reconstruction_OBJECTS) $(test_reconstruction_DEPENDENCIES) 
+	@rm -f test-reconstruction$(EXEEXT)
+	$(CXXLINK) $(test_reconstruction_LDFLAGS) $(test_reconstruction_OBJECTS) $(test_reconstruction_LDADD) $(LIBS)
 tour$(EXEEXT): $(tour_OBJECTS) $(tour_DEPENDENCIES) 
 	@rm -f tour$(EXEEXT)
 	$(CXXLINK) $(tour_LDFLAGS) $(tour_OBJECTS) $(tour_LDADD) $(LIBS)
@@ -138,6 +150,7 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/morpholena.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/test-reconstruction.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tour.Po@am__quote@
 
 distclean-depend:

doc/tpl/processing.tpl

@@ -142,7 +142,7 @@ int main()
 	  (begin
 	    (psystem "rm " (get ".exo"))
        	    (psystem "convert " exoname " " exoname ".eps")
-	    (psystem "convert " exoname " html/" exiname ".png"); (regexp-substitute/global #f "\.p.*$" exoname 'pre ".jpg"))
+	    (psystem "convert " exoname " html/" exoname ".png"); (regexp-substitute/global #f "\.p.*$" exoname 'pre ".jpg"))
        	    (psystem "epstopdf " exoname ".eps > " exoname ".pdf")
 ))))
 ~][~ ENDIF ~][~ `rm -f .example example.cc` ~]

oln.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Olena")
-(Project-Version oln 0_2 17)
-(Parent-Version oln 0_2 16)
-(Version-Log "2002-01-14  Alexandre Duret-Lutz  <duret_g@epita.fr>
+(Project-Version oln 0_2 18)
+(Parent-Version oln 0_2 17)
+(Version-Log "2002-01-14  Jerome Darbon  <jerome@epita.fr>
 
-	* src/level/connected.hh: Doc update from Jerome.
+	* demo/Makefile.am (test_reconstruction_SOURCES): New.
+	* tests/test-construction.cc: New file.
+	* img/lena.pgm: New file.
+	* Makefile.am (EXTRA_DIST): Add it.
 
 ")
 (New-Version-Log "")
-(Checkin-Time "Mon, 14 Jan 2002 11:39:15 +0100")
+(Checkin-Time "Mon, 14 Jan 2002 11:59:52 +0100")
 (Checkin-Login adl)
 (Populate-Ignore ("~$"
                   "\\.\\(bak\\|old\\|rej\\|orig\\)$"
@@ -62,11 +65,11 @@
 
   (NEWS (oln/0_NEWS 1.2 644))
   (README (oln/1_README 1.2 644))
-  (Makefile.am (oln/2_Makefile.a 1.4 644))
+  (Makefile.am (oln/2_Makefile.a 1.5 644))
   (configure.ac (oln/3_configure. 1.2 644))
   (THANKS (oln/4_THANKS 1.1 644))
   (img/lena.pgm (oln/5_lena.pgm 1.1 640) :no-keywords)
-  (ChangeLog (oln/6_ChangeLog 1.11 644))
+  (ChangeLog (oln/6_ChangeLog 1.12 644))
   (src/config/system.hh (oln/7_system.hh 1.1 644))
   (src/utils/timer.hh (oln/8_timer.hh 1.1 644))
   (src/utils/stat.hh (oln/9_stat.hh 1.2 644))
@@ -260,7 +263,7 @@
   (src/basics1d.hh (oln/d/41_basics1d.h 1.1 644))
   (src/basics.hh (oln/d/42_basics.hh 1.1 644))
   (demo/morpholena.cc (oln/d/43_morpholena 1.1 644))
-  (demo/Makefile.am (oln/d/44_Makefile.a 1.1 644))
+  (demo/Makefile.am (oln/d/44_Makefile.a 1.2 644))
   (demo/tour.cc (oln/d/45_tour.cc 1.1 644))
   (demo/image.cc (oln/d/46_image.cc 1.1 644))
   (tools () :directory)
@@ -273,7 +276,7 @@
 ;; Files added by populate at Sat, 12 Jan 2002 17:25:43 +0100,
 ;; to version 0_2.4(w), by adl:
 
-  (doc/tpl/processing.tpl (oln/d/48_processing 1.6 644))
+  (doc/tpl/processing.tpl (oln/d/48_processing 1.7 644))
   (doc/img/object.pbm (oln/d/49_object.pbm 1.1 644))
   (doc/doc/oln-ref.texi (oln/d/50_oln-ref.te 1.4 644))
   (doc/doc/Makefile.am (oln/d/51_Makefile.a 1.6 644))
@@ -294,14 +297,14 @@
   (doc/doc/Makefile.in (oln/e/6_Makefile.i 1.6 644))
   (configure (oln/e/7_configure 1.2 755))
   (aclocal.m4 (oln/e/8_aclocal.m4 1.2 644))
-  (Makefile.in (oln/e/9_Makefile.i 1.4 644))
+  (Makefile.in (oln/e/9_Makefile.i 1.5 644))
   (tools/texinfo.tex (oln/e/10_texinfo.te 1.2 644))
   (tools/mdate-sh (oln/e/11_mdate-sh 1.1 755))
   (tools/depcomp (oln/e/12_depcomp 1.1 755))
   (tools/missing (oln/e/13_missing 1.1 755))
   (tools/mkinstalldirs (oln/e/14_mkinstalld 1.1 755))
   (tools/install-sh (oln/e/15_install-sh 1.1 755))
-  (demo/Makefile.in (oln/e/16_Makefile.i 1.2 644))
+  (demo/Makefile.in (oln/e/16_Makefile.i 1.3 644))
   (src/Makefile.in (oln/e/17_Makefile.i 1.3 644))
 
 ;; Files added by populate at Sun, 13 Jan 2002 12:33:06 +0100,