Merged revisions 53711,53718,53720,53724-53725,53728-53729,53731 via svnmerge from

svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53711 | lrineau | 2010-01-20 21:36:47 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Fix for Debian: Qt4 QGLViewer library is /usr/lib*/libqglviewer-qt4.so
........
  r53718 | lrineau | 2010-01-21 17:57:41 +0100 (Thu, 21 Jan 2010) | 10 lines
  
  Merge from trunk:
    |  New Revision: 53717
    |  Author: afabri
    |  Date: 2010-01-21 17:51:49 +0100 (Thu, 21 Jan 2010)
    |  
    |  Log message:
    |  
    |  Add operator for MSVC 2005/2008 to avoid a matching ambiguity
........
  r53720 | lrineau | 2010-01-21 18:06:33 +0100 (Thu, 21 Jan 2010) | 2 lines
  
  Merge r53719 from trunk (VC workaround)
........
  r53724 | lrineau | 2010-01-22 13:34:50 +0100 (Fri, 22 Jan 2010) | 10 lines
  
  Merge from trunk:
    |  New Revision: 53723
    |  Author: afabri
    |  Date: 2010-01-22 13:28:06 +0100 (Fri, 22 Jan 2010)
    |  
    |  Log message:
    |  
    |  Just FK would be nicer, but VC 2005 messes it up with an FK in a base class when compiling degenerate_test.cpp
    | 
........
  r53725 | lrineau | 2010-01-22 13:44:11 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Cartesian<float> gives warnings (about truncation from double to float).
........
  r53728 | lrineau | 2010-01-22 14:26:40 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Fix bashism ==
........
  r53729 | lrineau | 2010-01-22 15:10:25 +0100 (Fri, 22 Jan 2010) | 3 lines
  
  Re-add g++-3.4 in the list of supported compilers (to be synced with the
  testsuite and the CGAL web site).
........
  r53731 | lrineau | 2010-01-22 16:09:52 +0100 (Fri, 22 Jan 2010) | 11 lines
  
  Merge fmo trunk:
    | ------------------------------------------------------------------------
    | r53730 | afabri | 2010-01-22 16:07:59 +0100 (Fri, 22 Jan 2010) | 1 line
    | Changed paths:
    |    M /trunk/Spatial_searching/doc_tex/Spatial_searching/intro.tex
    |    M /trunk/Spatial_searching/doc_tex/Spatial_searching/main.tex
    | 
    | Moved ccAuthor right after the title
    | ------------------------------------------------------------------------
    | 
........

Installation/CHANGES

@@ -2,72 +2,104 @@ Release notes of CGAL.
 
 ----------------------------- Release 3.6 ----------------------------------
 
-*******
-NOTE: The section "Release 3.6" of the current file Will be re-formatted
-by the release manager a few days before the release. For the moment, you
-can simply add your changes with the formating you want.
-*******
-
 CGAL 3.6 offers the following improvements and new functionality : 
 
-* 2D/3D Regular triangulations : Weighted_point now has a constructor
+<h3>Geometry Kernels</h3>
-  from Cartesian coordinates.
 
-* 2D and 3D Geometry Kernel:
+<h4>2D and 3D Geometry Kernel</h4>
   - Add new do_intersect() and intersection() overloads:
     + do_intersect(Bbox_3, Bbox_3/Line_3/Ray_3/Segment_3)
     + intersection(Triangle_3, Line_3/Ray_3/Segment_3)
 
-* 3D Triangulations :
+
+<h3>Polygons</h3>
+
+<h4>2D Regularized Boolean Set-Operations</h4>
+
+  - Fixed General_polygon_set_2::arrangement() to return the proper type
+    of object.  
+
+
+<h3>Arrangement</h3>
+
+<h4>2D Arrangements</h4>
+
+  - Fixed passing a (const) traits object to the constructor of Arrangement_2.
+
+  - Introduced Arrangement_2::fictitious_face(), which returns the fictitious
+    face in case of an unbounded arrangement.
+
+  - Fixed a bug in Bezier-curve handling.
+
+  - Added (back) iterator, number_of_holes(), holes_begin(), and holes_end()
+    to the default DCEL for backward compatibility.
+
+  - Added (simple) versions of the free overlay() function. It employs the
+    default overlay-traits, which practically does nothing.
+
+
+
+<h3>Triangulations and Delaunay Triangulations</h3>
+
+<h4>2D/3D Regular triangulations</h4>
+
+  - Weighted_point now has a constructor from Cartesian coordinates.
+
+<h4>3D Triangulations</h4>
+
   - Regular_triangulation_3 : semi-static floating-point filters are now used
     in its predicates, which can speed up its construction by a factor of about 3
     when Exact_predicates_inexact_constructions_kernel is used.
+
   - The class Regular_triangulation_filtered_traits_3 is deprecated, the class
     Regular_triangulation_euclidean_traits_3 must be used instead. The
     predicates of that traits will be filtered if the kernel given as template
     parameter of that traits is itself a filtered kernel.
+
   - Triangulation_hierarchy_3 is now deprecated, and replaced by a simpler
     CGAL::Fast_location policy template parameter of Delaunay_triangulation_3.
+
   - The old version of remove() (enabled with CGAL_DELAUNAY_3_OLD_REMOVE)
     has been deleted.
 
-* 3D Periodic triangulations:
+<h4>3D Periodic triangulations</h4>
+
   - New demo: 3D periodic Lloyd algorithm.
+
   - New functionality for Voronoi diagrams: dual of an edge and of a vertex, 
     volume and centroid of the dual of a vertex. 
+
   - The package can now be used with the 3D Alpha Shapes package to compute 
     periodic alpha shapes. 
 
-* 3D Alpha shapes:
+<h4>3D Alpha shapes</h4>
+
   - The class Weighted_alpha_shape_euclidean_traits_3 is deprecated, the class
     Regular_triangulation_euclidean_traits_3 must be used instead.
+
   - The package can now be used together with the 3D Periodic Triangulation 
     package to compute periodic alpha shapes. 
 
-* 3D Mesh Generation
- - The mesh generator has been enriched which an optimisation phase to provide 3D meshes
-    with well shaped tetrahedra (and in particular no slivers).  The optimization phase 
-    involves four different optimization processes: two global opitimization processes (ODT anf Lloyd),
-    a pertuber and an exuder. Each of these processes can be activated or not,  and tuned to the users
-    needs and to available computer resources.
 
-* Arrangement_on_surface_2:
+<h3>Mesh Generation</h3>
-  - Fixed passing a (const) traits object to the constructor of Arrangement_2.
-  - Introduced Arrangement_2::fictitious_face(), which returns the fictitious
-    face in case of an unbounded arrangement.
-  - Fixed a bug in Bezier-curve handling.
-  - Added (back) iterator, number_of_holes(), holes_begin(), and holes_end()
-    to the default DCEL for backward compatibility.
-  - Added (simple) versions of the free overlay() function. It employs the
-    default overlay-traits, which practically does nothing.
 
-* Boolean_set_operations_2:
+<h4>3D Mesh Generation</h4>
-  - Fixed General_polygon_set_2::arranngement() to return the proper type
+
-    of object.    
+  - The mesh generator has been enriched which an optimization phase to
+    provide 3D meshes with well shaped tetrahedra (and in particular no
+    slivers).  The optimization phase involves four different optimization
+    processes: two global optimization processes (ODT anf Lloyd), a
+    pertuber and an exuder. Each of these processes can be activated or
+    not, and tuned to the users needs and to available computer resources.
+
+<h3>Support library<h3>
+
+<h4>CGAL ipelets</h4>
 
-* CGAL_ipelets:
   - Add support for version 7 of Ipe.
 
+
+
 ----------------------------- Release 3.5 ----------------------------------
 CGAL releases will now be published about every six months. As a transition
 release, CGAL-3.5 has been developed during 9 months from the release

Installation/cmake/modules/FindQGLViewer.cmake

@@ -15,7 +15,7 @@ find_path(QGLVIEWER_INCLUDE_DIR
          )
 
 find_library(QGLVIEWER_LIBRARY_RELEASE 
-             NAMES qglviewer QGLViewer QGLViewer2
+             NAMES qglviewer-qt4 qglviewer QGLViewer QGLViewer2
              PATHS /usr/lib
                    /usr/local/lib
                    ENV QGLVIEWERROOT

Installation/doc_tex/Installation/installation.tex

@@ -114,7 +114,7 @@ In order to build the \cgal\ libraries, you need a \CC\ compiler.
   \gdef\lcTabularBorder{2}
   \begin{tabular}{|l|l|} \hline
     \textbf{compiler}        & \textbf{operating system}\\\hline\hline
-    \Gcc{4.0, 4.1, 4.2, 4.3} \footnotemark[10]
+    \Gcc{3.4, 4.0, 4.1, 4.2, 4.3} \footnotemark[10]
     & Solaris 2.6+ / Linux 2.x / MacOS X
       \\ & \mswin\ 95/98/2000/XP/NT4\footnotemark[11]\\\hline
     \msvc{8.0, 9.0} (\textsc{Visual Studio 2005 and 2008}) \footnotemark[12]

Surface_mesher/test/Surface_mesher/implicit_surface_mesher_test.cpp

@@ -178,8 +178,8 @@ void test_with_tag(Tag = CGAL::Non_manifold_tag())
     Tag>()();
 
 #ifndef CGAL_SURFACE_MESHER_SINGLE_TEST
-  std::cout << "\nKERNEL CGAL::Filtered_kernel<CGAL::Cartesian<float> >...\n";
+  std::cout << "\nKERNEL CGAL::Filtered_kernel<CGAL::Cartesian<double> >...\n";
-  Test_with_kernel<CGAL::Filtered_kernel<CGAL::Cartesian<float> >,Tag>()();
+  Test_with_kernel<CGAL::Filtered_kernel<CGAL::Cartesian<double> >,Tag>()();
 
   Test_with_kernel<CGAL::Cartesian<CGAL::Lazy_exact_nt<double> >,
     Tag >()(DO_NOT_RUN);

Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake

@@ -164,19 +164,11 @@ if [ $# -ne 0 ] ; then
   done
 else
   echo "Run all tests."
-  if [ `can_compile APSS_reconstruction` == "y" ]; then
+  if [ `can_compile poisson_reconstruction` = "y" ]; then
-    compile_and_run APSS_reconstruction
-    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
-  fi
-  if [ `can_compile APSS_reconstruction_example` == "y" ]; then
-    compile_and_run APSS_reconstruction_example
-    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
-  fi
-  if [ `can_compile poisson_reconstruction` == "y" ]; then
     compile_and_run poisson_reconstruction
     [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
   fi
-  if [ `can_compile poisson_reconstruction_example` == "y" ]; then
+  if [ `can_compile poisson_reconstruction_example` = "y" ]; then
     compile_and_run poisson_reconstruction_example
     [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
   fi
@@ -186,7 +178,7 @@ fi
 # The clean target generated by CMake under cygwin
 # always fails for some reason
 #
-if [ "${NEED_CLEAN}" == "y" ]; then
+if [ "${NEED_CLEAN}" = "y" ]; then
   if ! ( uname | grep -q "CYGWIN" ) ; then
     ${MAKE_CLEAN_CMD}
   fi