Commit Graph

48515 Commits

Author SHA1 Message Date
Philipp Möller 495fac8ea1 Merge from next 2012-07-27 17:58:52 +00:00
Laurent Rineau 1e96f6e043 Upgrade to RS 3.1 2012-07-27 15:47:47 +00:00
Sébastien Loriot 354e29e2b7 add example failing on llvm mac os 2012-07-27 14:47:18 +00:00
Laurent Rineau 2b23e7283b Upgrade to RS 3.1 2012-07-27 14:45:19 +00:00
Sébastien Loriot 6a99e19a44 reintegrate feature branch Point_set_and_Polyhedron_demo-merge-GF:
* it provides to the polyhedron demo the functionalities of the Point_set demo (but splatting)
 * convex hull working on points
 * plugin callable depending on items selected
2012-07-27 14:28:49 +00:00
Sébastien Loriot d00a870e9f merge from next 2012-07-27 14:17:21 +00:00
Laurent Rineau 0b8cff4f1a My $HOME/CGAL/trunk is a symlink to next, but still... 2012-07-27 14:14:36 +00:00
Sébastien Loriot eb95b00499 fix display mode selection induced by introduction of a new display mode 2012-07-27 13:52:01 +00:00
Sébastien Loriot b22a192d40 fix display of polyhedron items 2012-07-27 13:32:48 +00:00
Sébastien Loriot e060d19f7d display error 2012-07-27 13:24:39 +00:00
Laurent Rineau 9491693417 Fix an issue when BUILD_SHARED_LIBS is toggled
When the value of the Boolean cache variable BUILD_SHARED_LIBS is modified,
there was a bug that the variable CGAL_LIBRARY_NAME,
CGAL_Core_LIBRARY_NAME, CGAL_Qt4_LIBRARY_NAME, and so on, were not
updated. As a consequence, the file CGALConfig.cmake produced in the
installation directory was not correct: it was referring to .so files
whereas the installed binaries were .a files, or the reverse.

This patch fixes the issue.
2012-07-27 13:16:55 +00:00
Sébastien Loriot 9deba05a96 restore properties accidently erased 2012-07-27 13:10:37 +00:00
Marc Glisse 4d4f9adb55 Missing standard includes. 2012-07-27 12:05:53 +00:00
Sébastien Loriot 5a7c587154 merge from next 2012-07-27 10:55:37 +00:00
Sébastien Loriot 740d865f09 remove local_spacing plugin that was needed for splatting 2012-07-27 10:53:31 +00:00
Sébastien Loriot 40e636e8e5 more warnings removed 2012-07-27 10:38:58 +00:00
Sébastien Loriot cd58d025f7 remove unused var warnings 2012-07-27 10:29:10 +00:00
Sébastien Loriot 19422b5103 convex hull works with points 2012-07-27 09:52:29 +00:00
Laurent Rineau 389c2ab9e9 Fix a warning about an unused variable
Now the example does use the variable, and displays the coordinates of
the vertices of the closest facet.
2012-07-27 09:14:21 +00:00
Laurent Rineau bfc84ff07c Remove warning about unused parameter 2012-07-27 08:59:52 +00:00
Philipp Möller a680b4475c Add a batch of additional commands for easier description building. 2012-07-26 17:45:48 +00:00
Laurent Rineau fcd8565b46 Revert a buggy revision
Bug reported by a user against CGAL-4.0.2
A single triangle cannot be meshed!

The fault was a buggy assertion added in the following revision:
  |-----------------------------------------------------------------------
  |r66359 | lrineau | 2011-11-16 18:58:22 +0100 (Wed, 16 Nov 2011) | 3 lines
  |
  |Add an assertion that checks that a point constructed as the midpoint of an
  |edge is located either on the edge or inside one of the two incident faces.
  |
  |-----------------------------------------------------------------------
And the assertion message was:
  terminate called after throwing an instance of 'CGAL::Assertion_exception'
    what():  CGAL ERROR: assertion violation!
  Expr: zone.locate_type != Tr::FACE || zone.fh == f || zone.fh == n
  File: /home/lrineau/wc/Mesh_2/test/Mesh_2/../../include/CGAL/Mesh_2/Refine_edges.h
  Line: 430
  Explanation: Your data set contains at least a vertex that is very close to 
    a constrained edge! Mesh_2 cannot mesh that sort of data set.
2012-07-26 14:02:13 +00:00
Laurent Rineau e87895400f Fix a bug created by that revision:
| ------------------------------------------------------------------------
  | r57003 | afabri | 2010-06-23 10:30:32 +0200 (Wed, 23 Jun 2010) | 1 line
  | 
  | int -> size_t and static_casts
  | ------------------------------------------------------------------------

The conversion from int to size_t is not always safe. Here the right type
was a signed type: std::ptrdiff_t, especially because the variable stores a
difference between two pointers.

The bug was discovered by a very recent version of clang:
clang version 3.2 (trunk 160721)

The error was:
cd /home/lrineau/CGAL/CGAL-4.1-Ic-113/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/src/CGAL && /usr/local/packages/llvm-trunk/bin/clang++   -DCGAL_EXPORTS -DCGAL_TEST_SUITE -DCGAL_USE_MPFR -DCGAL_USE_GMPXX -DCGAL_USE_GMP --std=c++11 -fno-strict-aliasing -Wall -fPIC -I/home/lrineau/CGAL/CGAL-4.1-Ic-113/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/include -I/home/lrineau/CGAL/CGAL-4.1-Ic-113/include -I/home/lrineau/CGAL/boost/boost-release-branch    -o CMakeFiles/CGAL.dir/all_files.cpp.o -c /home/lrineau/CGAL/CGAL-4.1-Ic-113/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/src/CGAL/all_files.cpp
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-113/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/src/CGAL/all_files.cpp:2:
/home/lrineau/CGAL/CGAL-4.1-Ic-113/src/CGAL/JAMA_numeric_solver.cpp:83:14: error: case value evaluates to -1, which cannot be narrowed to type 'std::size_t' (aka 'unsigned long') [-Wc++11-narrowing]
        case -1:
             ^
/home/lrineau/CGAL/CGAL-4.1-Ic-113/src/CGAL/JAMA_numeric_solver.cpp:109:14: error: case value evaluates to -1, which cannot be narrowed to type 'std::size_t' (aka 'unsigned long') [-Wc++11-narrowing]
        case -1:
             ^
In file included from /home/lrineau/CGAL/CGAL-4.1-Ic-113/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/src/CGAL/all_files.cpp:13:
/home/lrineau/CGAL/CGAL-4.1-Ic-113/src/CGAL/Turkowski_numeric_solver.cpp:398:8: error: case value evaluates to -1, which cannot be narrowed to type 'std::size_t' (aka 'unsigned long') [-Wc++11-narrowing]
  case -1:
       ^
/home/lrineau/CGAL/CGAL-4.1-Ic-113/src/CGAL/Turkowski_numeric_solver.cpp:431:8: error: case value evaluates to -1, which cannot be narrowed to type 'std::size_t' (aka 'unsigned long') [-Wc++11-narrowing]
  case -1:
       ^
4 errors generated.
2012-07-26 12:46:30 +00:00
Eric Berberich 680a6030b0 Better readability of arrangement testsuite (better "greppability" for "error")
renamed tests called "error" to "assertions", which avoid false positives when
grepping for "error" in the log
2012-07-26 11:39:16 +00:00
Laurent Rineau a9cb96b42a Minor tweak to CMake messages during CGAL configuration
Before that patch, CGAL_SetupFlags was included in the stage:
  == Detect external libraries ==
Now there is a stage:
  == Set up flags ==
2012-07-26 10:51:05 +00:00
Laurent Rineau 20762313af Refresh the FindQt3-patched module, from CGAL, with recent changes
to the FindQt3 module shipped with CMake

CGAL FindQt3-patched module uses the prefix QT3_ for all cache variables,
instead of just QT_. That allows to use Qt3 and Qt4 in the same project
(but for different binaries of course).
2012-07-26 09:28:21 +00:00
Sébastien Loriot 980ddfb16a remove warning+forgot to test things 2012-07-26 07:17:58 +00:00
Ophir Setter 628087b87a moc-qt3 to come before moc. Now, if moc is qt4 moc the cmake file will use the correct moc in Qt3 2012-07-26 07:08:26 +00:00
Sébastien Loriot 822e6ecf7f remove splatting. If someone really wants it, we can think about importing it 2012-07-25 12:50:40 +00:00
Sébastien Loriot c6bd2e92bc missing one 2012-07-25 11:21:56 +00:00
Sébastien Loriot 46d4312d48 correct export 2012-07-25 11:20:36 +00:00
Sébastien Loriot 6ab6f956ea add applicable for new plugins and udate nameFilter for polyline 2012-07-25 10:40:47 +00:00
Monique Teillaud 745685fed6 fixed bug in 2 functors names 2012-07-25 09:18:26 +00:00
Sébastien Loriot d0c904e01f merge from next 2012-07-25 08:34:04 +00:00
Sébastien Loriot 480d729ec8 reintegrate the branch Polyhedron-corefinement_demo-sloriot which adds the following
plugins to the polyhedron demo:
  * handle polyline as item
  * intersection of polyhedra
  * corefinement of polyhedra
2012-07-25 08:10:35 +00:00
Sébastien Loriot 70cc8fba56 merge from next 2012-07-25 07:55:02 +00:00
Sébastien Loriot 49f64c87b0 update license to GPL v3 2012-07-25 07:37:34 +00:00
Laurent Rineau 7744529877 update bibtex files in manual tools too 2012-07-24 12:03:09 +00:00
Laurent Rineau 97e074c133 manual bibtex for CGAL-4.1 2012-07-24 12:02:20 +00:00
Laurent Rineau 6507b3fd24 Fix a typo (missing closing parenthesis) 2012-07-24 11:45:28 +00:00
Philipp Möller f330095286 Add Boost.System to the CGAL dependencies
As of Boost 1.50 it is required to link Boost.System with CGAL. System
has been a Thread dependency all along and we simply never linked to
it and apparently got lucky.

Add it to the dependencies, add it in the manual and INSTALL file.
2012-07-24 10:02:57 +00:00
Eric Berberich 398ea99687 also ImageIO needs essential libs
This bug has been reportet by Michael Kerber. In his setup 
GMP/MPFR are not in the same directory which resulted in 
a 'missing mpfr.h'. Thanks for pointing out.
2012-07-23 08:22:17 +00:00
Luis Peñaranda faedebaba5 added flag to use ugcd 2012-07-19 15:46:15 +00:00
Eric Berberich 92e6e55416 access to infinite endpoint is not granted, added guards 2012-07-19 11:59:12 +00:00
Michael Hemmer 254aa83353 fix conversion problems 2012-07-19 10:18:12 +00:00
Luis Peñaranda 7b2ddd3188 avoided some link errors in gcd implementation 2012-07-18 19:20:54 +00:00
Eric Berberich ee7da1d7fc fixed an error that showed up after correctly adding a precond to Split_2 functor in r70397 2012-07-18 09:20:29 +00:00
Sébastien Loriot 3e750c6fd7 temporary hack to work around assertion 2012-07-17 12:08:49 +00:00
Guillaume Damiand bf0d1025eb Revert last commit: cgal is really too rigid... 2012-07-17 08:56:13 +00:00
Guillaume Damiand 46f16de7c9 Add operator += in BBox classes (more or less a trivial bug-fix). 2012-07-17 08:18:59 +00:00