[Olena-patches] oln 10.156: Fixes to make compile with ICC

13 Apr 2004

Index: olena/oln/morpho/geodesic_dilation.hh

--- olena/oln/morpho/geodesic_dilation.hh Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/37_geodesic_d 1.11.1.12 600)
+++ olena/oln/morpho/geodesic_dilation.hh Tue, 13 Apr 2004 23:03:36 +0200 thivol_d (oln/37_geodesic_d 1.11.1.12 600)
@@ -69,7 +69,7 @@
     **   typedef oln::image2d<ntg::int_u8>	im_type;
     **
     **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-    **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+    **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
     **
     **   save(oln::morpho::geodesic_dilation(im2, im1, oln::neighb_c4()),
     **                                       IMG_OUT "oln_morpho_geodesic_dilation.pbm");
@@ -130,7 +130,7 @@
       **   typedef oln::image2d<ntg::int_u8>	im_type;
       **
       **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-      **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+      **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
       **
       **   save(oln::morpho::sure::geodesic_dilation(im2, im1, oln::neighb_c4()),
       **                                       IMG_OUT "oln_morpho_sure_geodesic_dilation.pbm");
Index: olena/oln/morpho/geodesic_erosion.hh
--- olena/oln/morpho/geodesic_erosion.hh Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/36_geodesic_e 1.19 600)
+++ olena/oln/morpho/geodesic_erosion.hh Tue, 13 Apr 2004 23:03:01 +0200 thivol_d (oln/36_geodesic_e 1.19 600)
@@ -67,7 +67,7 @@
     **   typedef oln::image2d<ntg::int_u8>	im_type;
     **
     **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-    **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+    **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
     **
     **   save(oln::morpho::geodesic_erosion(im1, im2, oln::neighb_c4()),
     **                                       IMG_OUT "oln_morpho_geodesic_erosion.pbm");
@@ -128,7 +128,7 @@
       **   typedef oln::image2d<ntg::int_u8>	im_type;
       **
       **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-      **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+      **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
       **
       **   save(oln::morpho::sure::geodesic_erosion(im1, im2, oln::neighb_c4()),
       **                                       IMG_OUT "oln_morpho_sure_geodesic_erosion.pbm");
Index: olena/oln/morpho/reconstruction.hh
--- olena/oln/morpho/reconstruction.hh Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/35_reconstruc 1.13.1.13 600)
+++ olena/oln/morpho/reconstruction.hh Tue, 13 Apr 2004 23:02:25 +0200 thivol_d (oln/35_reconstruc 1.13.1.13 600)
@@ -74,7 +74,7 @@
       **   typedef oln::image2d<ntg::int_u8>	im_type;
       **
       **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-      **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+      **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
       **
       **   oln::save(oln::morpho::sure::geodesic_reconstruction_dilation(im2,
       **                                                                 im1,
@@ -146,7 +146,7 @@
       **   typedef oln::image2d<ntg::int_u8>	im_type;
       **
       **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-      **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+      **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
       **
       **   oln::save(oln::morpho::sequential::geodesic_reconstruction_dilation(im2,
       **                                                                 im1,
@@ -262,7 +262,7 @@
       **   typedef oln::image2d<ntg::int_u8>	im_type;
       **
       **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-      **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+      **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
       **
       **   oln::save(oln::morpho::hybrid::geodesic_reconstruction_dilation(im2,
       **                                                                 im1,
@@ -367,7 +367,7 @@
       **   typedef oln::image2d<ntg::int_u8>	im_type;
       **
       **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-      **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+      **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
       **
       **   oln::save(oln::morpho::sure::geodesic_reconstruction_erosion(im1,
       **                                                                 im2,
@@ -440,7 +440,7 @@
       **   typedef oln::image2d<ntg::int_u8>	im_type;
       **
       **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-      **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+      **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
       **
       **   oln::save(oln::morpho::sequential::geodesic_reconstruction_erosion(im1,
       **                                                                 im2,
@@ -552,7 +552,7 @@
       **   typedef oln::image2d<ntg::int_u8>	im_type;
       **
       **   im_type	im1(oln::load(IMG_IN "lena128.pgm"));
-      **   im_type	im2(oln::morpho::opening(im1, oln::win_c4p()));
+      **   im_type	im2 = oln::morpho::opening(im1, oln::win_c4p());
       **
       **   oln::save(oln::morpho::hybrid::geodesic_reconstruction_erosion(im1,
       **                                                                 im2,
Index: olena/oln/topo/tarjan/flat-zone.hh
--- olena/oln/topo/tarjan/flat-zone.hh Fri, 02 Apr 2004 16:53:54 +0200 palma_g (oln/r/35_flat-zone. 1.13 600)
+++ olena/oln/topo/tarjan/flat-zone.hh Wed, 14 Apr 2004 00:03:57 +0200 thivol_d (oln/r/35_flat-zone. 1.13 600)
@@ -88,7 +88,7 @@
 	typedef abstract::tarjan_with_attr<exact_type>	super_type; ///< Type of parent class.
 
 	friend class super_type;
-	friend class super_type::super_type;
+	friend class abstract::tarjan<exact_type>;
 	/*!
 	** \brief Constructor.
 	**


-- 
Damien Thivolle
damien.thivolle@lrde.epita.fr

    