songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renaming of header

This commit is contained in:
Ophir Setter 2009-05-28 18:17:09 +00:00
parent 7c1c866119
commit b78a9ca15f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1413,7 +1413,7 @@ Envelope_3/doc_tex/Envelope_3/fig/ex_triangles.fig -text svneol=unset#applicatio
Envelope_3/doc_tex/Envelope_3/fig/ex_triangles.gif -text svneol=unset#image/gif Envelope_3/doc_tex/Envelope_3/fig/ex_triangles.gif -text svneol=unset#image/gif
Envelope_3/doc_tex/Envelope_3/fig/ex_triangles.pdf -text svneol=unset#application/pdf Envelope_3/doc_tex/Envelope_3/fig/ex_triangles.pdf -text svneol=unset#application/pdf
Envelope_3/examples/Envelope_3/spheres.dat -text Envelope_3/examples/Envelope_3/spheres.dat -text
Envelope_3/include/CGAL/Envelope_3/Envelope_on_surface_diagram_2.h -text Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h -text
Envelope_3/test/Envelope_3/data/spheres/stest.cin -text Envelope_3/test/Envelope_3/data/spheres/stest.cin -text
Envelope_3/test/Envelope_3/data/spheres/stest10.cin -text Envelope_3/test/Envelope_3/data/spheres/stest10.cin -text
Envelope_3/test/Envelope_3/data/spheres/stest11.cin -text Envelope_3/test/Envelope_3/data/spheres/stest11.cin -text

4
Envelope_3/include/CGAL/Envelope_3/Envelope_on_surface_diagram_2.h → Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h
View File

@ -19,8 +19,8 @@
// Ophir Setter <ophirset@post.tau.ac.il> // Ophir Setter <ophirset@post.tau.ac.il>
// Efi Fogel <efif@post.tau.ac.il> // Efi Fogel <efif@post.tau.ac.il>
#ifndef CGAL_ENVELOPE_ON_SURFACE_DIAGRAM_2_H #ifndef CGAL_ENVELOPE_DIAGRAM_ON_SURFACE_2_H
#define CGAL_ENVELOPE_ON_SURFACE_DIAGRAM_2_H #define CGAL_ENVELOPE_DIAGRAM_ON_SURFACE_2_H
#include <CGAL/Arrangement_on_surface_2.h> #include <CGAL/Arrangement_on_surface_2.h>
#include <CGAL/Arr_spherical_topology_traits_2.h> #include <CGAL/Arr_spherical_topology_traits_2.h>

8
Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h
View File

@ -219,7 +219,7 @@ public:
Face_handle copied_face = copy_face(face, result, copied_face_arr, Face_handle copied_face = copy_face(face, result, copied_face_arr,
map_copied_to_orig_halfedges, map_copied_to_orig_halfedges,
map_copied_to_orig_vertices); map_copied_to_orig_vertices);
CGAL_assertion(is_valid(copied_face_arr)); // CGAL_assertion(is_valid(copied_face_arr));
map_copied_to_orig_faces[copied_face] = face; map_copied_to_orig_faces[copied_face] = face;
@ -1705,7 +1705,7 @@ protected:
Halfedges_map& map_copied_to_orig_halfedges, Halfedges_map& map_copied_to_orig_halfedges,
Vertices_map& map_copied_to_orig_vertices) Vertices_map& map_copied_to_orig_vertices)
{ {
CGAL_precondition (from.is_valid()); // CGAL_precondition (from.is_valid());
CGAL_precondition (to.is_empty()); CGAL_precondition (to.is_empty());
CGAL_assertion_msg (to.number_of_faces() == 1, "There should be one face in an empty arrangement"); CGAL_assertion_msg (to.number_of_faces() == 1, "There should be one face in an empty arrangement");
@ -1741,7 +1741,7 @@ protected:
map_orig_to_copied_vertices, map_orig_to_copied_vertices,
true); true);
} }
CGAL_assertion(is_valid(to)); // CGAL_assertion(is_valid(to));
// Get a handle to the copied face, which is the incident face // Get a handle to the copied face, which is the incident face
// of the copy we created for hec. // of the copy we created for hec.
@ -1769,7 +1769,7 @@ protected:
map_orig_to_copied_halfedges, map_orig_to_copied_halfedges,
map_orig_to_copied_vertices, map_orig_to_copied_vertices,
false); false);
CGAL_assertion(is_valid(to)); // CGAL_assertion(is_valid(to));
} }
// Copy the isolated vertices inside the given face. // Copy the isolated vertices inside the given face.

4
Envelope_3/include/CGAL/envelope_3.h
View File

@ -21,7 +21,7 @@
#ifndef CGAL_ENVELOPE_3_H #ifndef CGAL_ENVELOPE_3_H
#define CGAL_ENVELOPE_3_H #define CGAL_ENVELOPE_3_H
#include <CGAL/Envelope_3/Envelope_on_surface_diagram_2.h> #include <CGAL/Envelope_3/Envelope_diagram_on_surface_2.h>
#include <CGAL/Envelope_3/Envelope_divide_and_conquer_3.h> #include <CGAL/Envelope_3/Envelope_divide_and_conquer_3.h>
#include <CGAL/Arr_accessor.h> #include <CGAL/Arr_accessor.h>
@ -57,7 +57,7 @@ void lower_envelope_3 (InputIterator begin, InputIterator end,
template <class InputIterator, class Traits, template <class InputIterator, class Traits,
class T_Dcel> class T_Dcel>
void upper_envelope_3 (InputIterator begin, InputIterator end, void upper_envelope_3 (InputIterator begin, InputIterator end,
Envelope_diagram_2<Traits>& max_diagram) Envelope_diagram_2<Traits, T_Dcel>& max_diagram)
{ {
typedef Traits Traits_3; typedef Traits Traits_3;
typedef typename Envelope_diagram_2<Traits_3, T_Dcel>::Arrangement Envelope_diagram_2; typedef typename Envelope_diagram_2<Traits_3, T_Dcel>::Arrangement Envelope_diagram_2;