merge changes from next

This commit is contained in:
Laurent Rineau 2012-08-16 13:03:53 +00:00
commit 45016ef87a
291 changed files with 1004 additions and 939 deletions

24
.gitattributes vendored
View File

@ -1226,6 +1226,7 @@ Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters-small.gif -text svn
Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters.gif -text svneol=unset#image/gif
Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters.pdf -text svneol=unset#application/pdf
Box_intersection_d/test/Box_intersection_d/benchmark.plot -text svneol=native#application/postscript
CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt -text
CGAL_ipelets/TODO -text
CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt -text
CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp -text
@ -1277,7 +1278,6 @@ CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h -text
CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h -text
CGAL_ipelets/include/CGAL/grabbers.h -text
CGAL_ipelets/package_info/CGAL_ipelets/maintainer -text
CGALimageIO/src/CGALImageIO/CMakeLists.txt -text
Circular_kernel_2/benchmark/parser/Report.pdf -text svneol=unset#application/pdf
Circular_kernel_2/benchmark/readme.doc -text svneol=unset#application/msword
Circular_kernel_2/benchmark/readme.pdf -text svneol=unset#application/pdf
@ -1726,7 +1726,7 @@ GraphicsView/doc_tex/GraphicsView/full.png -text
GraphicsView/doc_tex/GraphicsView/uml-design.graphml -text
GraphicsView/doc_tex/GraphicsView/uml-design.pdf -text
GraphicsView/doc_tex/GraphicsView/uml-design.png -text
GraphicsView/src/CGALQt4/GraphicsView.qtmoc.cmake -text
GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake -text
HalfedgeDS/doc_tex/HalfedgeDS/fig/halfedge.gif -text svneol=unset#image/gif
HalfedgeDS/doc_tex/HalfedgeDS/fig/halfedge.pdf -text svneol=unset#application/pdf
HalfedgeDS/doc_tex/HalfedgeDS/fig/halfedge_small.gif -text svneol=unset#image/gif
@ -1962,8 +1962,8 @@ Kinetic_data_structures/include/CGAL/Kinetic/Inexact_simulation_traits.h -text
Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_CORE_exact_simulation_traits.h -text
Kinetic_data_structures/include/CGAL/Kinetic/listeners.h -text
Kinetic_data_structures/include/CGAL/Tools/utility_macros.h -text
Kinetic_data_structures/src/CGALQt3/Kinetic_data_structures.qtmoc.cmake -text
Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm -text
Kinetic_data_structures/src/CGAL_Qt3/Kinetic_data_structures.qtmoc.cmake -text
Kinetic_data_structures/src/CGAL_Qt3/Kinetic_print.xpm -text
Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=1,n -text
Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=3 -text
Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=3,n -text
@ -2200,8 +2200,8 @@ Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc -text
Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost -text
Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/setup-common -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/setup -text
@ -2242,7 +2242,6 @@ Maintenance/release_building/BUGFIX_NUMBER -text
Maintenance/release_building/MAJOR_NUMBER -text
Maintenance/release_building/MINOR_NUMBER -text
Maintenance/release_building/global_dont_submit -text
Maintenance/release_building/public_release_name -text
Maintenance/svn_server/hooks/Mail/Sender.pm -text
Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm -text
Maintenance/svn_server/hooks/check-capabilities.pl -text
@ -2991,7 +2990,7 @@ Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.pdf -text svneol=unset#application/pdf
Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.gif -text svneol=unset#image/gif
Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.pdf -text svneol=unset#application/pdf
Nef_S2/include/CGAL/IO/Nef_polyhedron_iostream_S2.h -text
Nef_S2/src/CGALQt3/Nef_S2.qtmoc.cmake -text
Nef_S2/src/CGAL_Qt3/Nef_S2.qtmoc.cmake -text
Number_types/doc_tex/NumberTypeSupport/illustration.png -text
Number_types/doc_tex/NumberTypeSupport_ref/CORE_BigFloat.tex -text
Number_types/doc_tex/NumberTypeSupport_ref/Gmpfi.tex -text
@ -3537,8 +3536,8 @@ Qt_widget/doc_tex/Qt_widget/standard_toolbar.pdf -text svneol=unset#application/
Qt_widget/doc_tex/Qt_widget/standard_toolbar.png -text svneol=unset#image/png
Qt_widget/doc_tex/Qt_widget/triangulation.gif -text svneol=unset#image/gif
Qt_widget/doc_tex/Qt_widget/triangulation.pdf -text svneol=unset#application/pdf
Qt_widget/src/CGALQt3/CMakeLists.txt -text
Qt_widget/src/CGALQt3/Qt_widget.qtmoc.cmake -text
Qt_widget/src/CGAL_Qt3/CMakeLists.txt -text
Qt_widget/src/CGAL_Qt3/Qt_widget.qtmoc.cmake -text
Ridges_3/doc_tex/Ridges_3/RidgesMechPartDetail.png -text
Ridges_3/doc_tex/Ridges_3/david_crest.jpg -text
Ridges_3/doc_tex/Ridges_3/david_crest_small.png -text svneol=unset#image/png
@ -3585,6 +3584,7 @@ Scripts/developer_scripts/create_cgal_test -text
Scripts/developer_scripts/create_cgal_test_with_cmake -text
Scripts/developer_scripts/create_demos_zip_files.sh -text
Scripts/developer_scripts/create_macosx_installer -text
Scripts/developer_scripts/detect_files_with_mixed_eol_styles -text
Scripts/developer_scripts/detect_packages_licenses -text
Scripts/developer_scripts/licensecheck -text
Scripts/developer_scripts/list_package_files.rb -text
@ -3999,6 +3999,8 @@ Stream_lines_2/doc_tex/Stream_lines_2/streamlines-small.jpg -text svneol=unset#i
Stream_lines_2/doc_tex/Stream_lines_2/streamlines-teaser.jpg -text svneol=unset#image/jpeg
Stream_lines_2/test/Stream_lines_2/data/datap.tri.cin -text
Stream_lines_2/test/Stream_lines_2/data/datav.tri.cin -text
Stream_support/doc_tex/IOstream/io.png -text
Stream_support/test/Stream_support/data/io.cin -text
Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/CCSubdivision.png -text svneol=unset#image/png
Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/PQQStencil.fig -text svneol=unset#application/octet-stream
Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/PQQStencil.gif -text svneol=unset#image/gif
@ -4551,8 +4553,6 @@ Triangulation_3/test/Triangulation_3/include/CGAL/_test_remove_cluster.h -text
Triangulation_3/test/Triangulation_3/test_regular_insert_range_with_info.cpp -text
Triangulation_3/test/Triangulation_3/test_static_filters.cpp -text
Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/voronoi.png -text
iostream/doc_tex/IOstream/io.png -text
iostream/test/iostream/data/io.cin -text
wininst/developer_scripts/CGAL.bmp -text svneol=unset#image/bmp
wininst/developer_scripts/DumpLogToFile.nsh -text
wininst/developer_scripts/EnvVarUpdate.nsh -text

99
.gitignore vendored
View File

@ -29,6 +29,8 @@ AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_segment_test
AABB_tree/test/AABB_tree/aabb_projection_triangle_test
AABB_tree/test/AABB_tree/aabb_projection_triangle_test.vcproj
AABB_tree/test/AABB_tree/cgal_test_with_cmake
Algebraic_kernel_d/test/Algebraic_kernel_d/cgal_test_with_cmake
Algebraic_kernel_d/test/Algebraic_kernel_d/rs_isolator
Alpha_shapes_2/demo/Alpha_shapes_2/*.exe
Alpha_shapes_2/demo/Alpha_shapes_2/*.vcproj
Alpha_shapes_2/demo/Alpha_shapes_2/Makefile
@ -53,6 +55,11 @@ Apollonius_graph_2/demo/Apollonius_graph_2/*.exe
Apollonius_graph_2/demo/Apollonius_graph_2/*.vcproj
Apollonius_graph_2/demo/Apollonius_graph_2/Makefile
Apollonius_graph_2/demo/Apollonius_graph_2/apollonius_graph_2
Arithmetic_kernel/test/Arithmetic_kernel/Arithmetic_kernel
Arithmetic_kernel/test/Arithmetic_kernel/CORE_arithmetic_kernel
Arithmetic_kernel/test/Arithmetic_kernel/GMP_arithmetic_kernel
Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel
Arithmetic_kernel/test/Arithmetic_kernel/LEDA_arithmetic_kernel
Arrangement_on_surface_2/examples/Arrangement_on_surface_2/Bezier_curves
Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt
Arrangement_on_surface_2/examples/Arrangement_on_surface_2/dual_lines
@ -69,22 +76,22 @@ Boolean_set_operations_2/demo/Boolean_set_operations_2/*.sln
Boolean_set_operations_2/demo/Boolean_set_operations_2/*.vcproj
Boolean_set_operations_2/demo/Boolean_set_operations_2/Makefile
Boolean_set_operations_2/demo/Boolean_set_operations_2/boolean_operations_2
CGALimageIO/demo/CGALimageIO/Makefile
CGALimageIO/demo/CGALimageIO/cgal_test_with_cmake
CGALimageIO/demo/CGALimageIO/cmake_install.cmake
CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer
CGALimageIO/examples/CGALimageIO/*.exe
CGALimageIO/examples/CGALimageIO/Makefile
CGALimageIO/examples/CGALimageIO/cgal_test_with_cmake
CGALimageIO/examples/CGALimageIO/convert_raw_image_to_inr
CGALimageIO/examples/CGALimageIO/makefile
CGALimageIO/examples/CGALimageIO/test_imageio
CGALimageIO/src/CGALImageIO/Makefile
CGALimageIO/test/CGALimageIO/*.exe
CGALimageIO/test/CGALimageIO/*.sln
CGALimageIO/test/CGALimageIO/*.vcproj
CGALimageIO/test/CGALimageIO/Makefile
CGALimageIO/test/CGALimageIO/test_trilinear_interpolation
CGAL_ImageIO/demo/CGALimageIO/Makefile
CGAL_ImageIO/demo/CGALimageIO/cgal_test_with_cmake
CGAL_ImageIO/demo/CGALimageIO/cmake_install.cmake
CGAL_ImageIO/demo/CGALimageIO/image_to_vtk_viewer
CGAL_ImageIO/examples/CGALimageIO/*.exe
CGAL_ImageIO/examples/CGALimageIO/Makefile
CGAL_ImageIO/examples/CGALimageIO/cgal_test_with_cmake
CGAL_ImageIO/examples/CGALimageIO/convert_raw_image_to_inr
CGAL_ImageIO/examples/CGALimageIO/makefile
CGAL_ImageIO/examples/CGALimageIO/test_imageio
CGAL_ImageIO/src/CGAL_ImageIO/Makefile
CGAL_ImageIO/test/CGAL_ImageIO/*.exe
CGAL_ImageIO/test/CGAL_ImageIO/*.sln
CGAL_ImageIO/test/CGAL_ImageIO/*.vcproj
CGAL_ImageIO/test/CGAL_ImageIO/Makefile
CGAL_ImageIO/test/CGAL_ImageIO/test_trilinear_interpolation
Circular_kernel_3/demo/Circular_kernel_3/*.exe
Circular_kernel_3/demo/Circular_kernel_3/*.sln
Circular_kernel_3/demo/Circular_kernel_3/*.vcproj
@ -152,12 +159,16 @@ GraphicsView/doc_tex/GraphicsView.tex
GraphicsView/doc_tex/GraphicsView/auto
GraphicsView/doc_tex/GraphicsView_ref/auto
GraphicsView/doc_tex/auto
GraphicsView/src/CGALQt4/*.dll
GraphicsView/src/CGALQt4/*.lib
GraphicsView/src/CGALQt4/*.so
GraphicsView/src/CGALQt4/Makefile
GraphicsView/src/CGALQt4/moc_*.cxx
GraphicsView/src/CGALQt4/qrc_*.cxx
GraphicsView/src/CGAL_Qt4/*.dll
GraphicsView/src/CGAL_Qt4/*.lib
GraphicsView/src/CGAL_Qt4/*.so
GraphicsView/src/CGAL_Qt4/Makefile
GraphicsView/src/CGAL_Qt4/moc_*.cxx
GraphicsView/src/CGAL_Qt4/qrc_*.cxx
HalfedgeDS/test/HalfedgeDS/CMakeLists.txt
HalfedgeDS/test/HalfedgeDS/cgal_test_with_cmake
HalfedgeDS/test/HalfedgeDS/test_hds
HalfedgeDS/test/HalfedgeDS/test_hds_decorator
Installation/auxiliary/gdb/python/CGAL/__init__.pyc
Installation/auxiliary/gdb/python/CGAL/printers.pyc
Installation/auxiliary/gdb/test
@ -165,6 +176,7 @@ Installation/cmake/modules/*.tmp
Installation/test/Installation/cgal_test
Installation/test/Installation/deprecation_warning
Interpolation/demo/Interpolation/cgal_test_with_cmake
Intersections_2/test/Intersections_2/CMakeLists.txt
Intersections_3/test/Intersections_3/CMakeLists.txt
Intersections_3/test/Intersections_3/bbox_other_do_intersect_test
Intersections_3/test/Intersections_3/cgal_test_with_cmake
@ -327,26 +339,26 @@ Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/include
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/lib
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/Makefile
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/localbuildscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/localtestscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/localtestscript-redo-results-collection
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/Makefile
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/localbuildscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/localtestscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/localtestscript-redo-results-collection
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/Makefile
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/localbuildscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/localtestscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/localtestscript-redo-results-collection
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/Makefile
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/localbuildscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/localtestscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/localtestscript-redo-results-collection
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/include
@ -935,6 +947,7 @@ Polyhedron/demo/Polyhedron/ui_*.h
Polyhedron/test/Polyhedron/*.kdev*
Polyhedron/test/Polyhedron/CMakeLists.txt
Polyhedron/test/Polyhedron/Makefile
Polyhedron/test/Polyhedron/cgal_test_with_cmake
Polyhedron/test/Polyhedron/test_polyhedron
Polynomial/doc_html
Polynomial/doc_pdf
@ -972,7 +985,7 @@ QP_solver/documentation/UpdateZ.log
QP_solver/documentation/UpdateZ.pdf
QP_solver/documentation/UpdateZ.synctex.gz
Qt_widget/.env
Qt_widget/src/CGALQt3/*.moc
Qt_widget/src/CGAL_Qt3/*.moc
Qt_widget/test/Qt_widget/test_qt_version
Random_numbers/*.aux
Random_numbers/*.bbl

View File

@ -680,7 +680,7 @@ public:
}
size_type
number_solid_components(const Type_of_alpha& alpha) const
number_solid_components(const Type_of_alpha& /* alpha */) const
{
return number_of_solid_components(get_alpha());
}

View File

@ -26,6 +26,7 @@
#include <iostream>
#include <vector>
#include <map>
#include <cstring>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Arr_segment_traits_2.h>

View File

@ -8,7 +8,7 @@ add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
collect_cgal_library(CGAL_Core CGALCore "")
collect_cgal_library(CGAL_Core "")
target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} )

View File

@ -15,12 +15,12 @@ set(PACKAGE_ROOT ../..)
# Add several CGAL packages to the include and link paths,
# if they lie in ${PACKAGE_ROOT}/.
foreach(INC_DIR ${PACKAGE_ROOT}/include
${PACKAGE_ROOT}/../CGALimageIO/include )
${PACKAGE_ROOT}/../CGAL_ImageIO/include )
if(EXISTS ${INC_DIR})
include_directories (BEFORE ${INC_DIR})
endif()
endforeach()
foreach(LIB_DIR ${PACKAGE_ROOT}/../CGALimageIO/src/CGALImageIO)
foreach(LIB_DIR ${PACKAGE_ROOT}/../CGAL_ImageIO/src/CGAL_ImageIO)
if (EXISTS ${LIB_DIR})
link_directories (${LIB_DIR})
endif()

View File

@ -1,7 +1,7 @@
// This demo has been inspired from the file
// Examples/Medical/Cxx/Medical1.cxx in VTK-5.0.
// Adaptation to CGALimageIO made by: Laurent Rineau
// Adaptation to CGAL_ImageIO made by: Laurent Rineau
/*
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen

View File

@ -75,7 +75,7 @@ public:
protected:
Image_shared_ptr image_ptr;
// implementation in src/CGALimageIO/Image_3.cpp
// implementation in src/CGAL_ImageIO/Image_3.cpp
bool private_read(_image* im);
public:
@ -166,13 +166,13 @@ public:
bool read_vtk_image_data(vtkImageData*);
#endif // CGAL_USE_VTK
// implementation in src/CGALimageIO/Image_3.cpp
// implementation in src/CGAL_ImageIO/Image_3.cpp
void gl_draw(const float point_size,
const unsigned char r,
const unsigned char g,
const unsigned char b);
// implementation in src/CGALimageIO/Image_3.cpp
// implementation in src/CGAL_ImageIO/Image_3.cpp
void gl_draw_bbox(const float line_width,
const unsigned char red,
const unsigned char green,

View File

@ -3,7 +3,7 @@ message("Configuring libCGAL_ImageIO")
find_package( OpenGL )
find_package( ZLIB )
#option(WITH_VTK "Add VTK support to the CGAL ImageIO library." OFF)
#option(WITH_VTK "Add VTK support to libCGAL_ImageIO." OFF)
if(WITH_VTK)
find_package(VTK QUIET)
@ -52,7 +52,7 @@ if(OPENGL_FOUND)
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
collect_cgal_library( CGAL_ImageIO CGALImageIO "")
collect_cgal_library( CGAL_ImageIO "")
add_dependencies( CGAL_ImageIO CGAL )
@ -63,10 +63,10 @@ if(OPENGL_FOUND)
message("libCGAL_ImageIO is configured")
else(OPENGL_FOUND)
message( STATUS "CGAL_ImageIO needs OpenGL, cannot be configured.")
message( STATUS "libCGAL_ImageIO needs OpenGL, cannot be configured.")
endif(OPENGL_FOUND)
if(NOT ZLIB_FOUND)
message( STATUS "NOTICE: CGAL_ImageIO needs ZLib to read compressed files. That feature will not be activated.")
message( STATUS "NOTICE: libCGAL_ImageIO needs ZLib to read compressed files. That feature will not be activated.")
endif(NOT ZLIB_FOUND)

Some files were not shown because too many files have changed in this diff Show More