← Back to branch summary

~ubuntu-branches/debian/stretch/cgal/stretch

« back to all changes in this revision

Viewing changes to include/CGAL/Triangulated_mixed_complex_observer_3.h

  • Committer: Package Import Robot
  • Author(s): Joachim Reichel
  • Date: 2014-04-05 10:56:43 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20140405105643-jgnrpu2thtx23zfs
Tags: 4.4-1
* New upstream release.
* Remove patches do-not-link-example-with-qt4-support-library.patch and
  fix_jet_fitting_3.patch (applied upstream).

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/CGAL/Triangulated_mixed_complex_observer_3.h
24
24
#include <CGAL/Skin_surface_quadratic_surface_3.h>
25
25
#include <CGAL/Triangulation_simplex_3.h>
26
26
 
 
27
#include <boost/shared_ptr.hpp>
 
28
 
27
29
namespace CGAL {
28
30
 
29
31
template <class T>
162
164
 
163
165
  FT shrink;
164
166
  Rt_Simplex prev_s;
165
 
  Quadratic_surface *surf;
 
167
  boost::shared_ptr<Quadratic_surface> surf;
166
168
 
167
169
  // c is the center of the orthogonal sphere
168
170
  // w is the weight of the orthogonal sphere
177
179
      Q[1] = Q[3] = Q[4] = 0;
178
180
      Q[0] = Q[2] = Q[5] = orient;
179
181
 
180
 
      surf = new Quadratic_surface(Q, c, s*w, (orient==1? 0 : 3));
 
182
      surf = boost::shared_ptr<Quadratic_surface>(new Quadratic_surface(Q, c, s*w, (orient==1? 0 : 3)));
181
183
    } else {
182
184
      // Multiply with 1-s to make the function defining the 
183
185
      // skin surface implicitly continuous
184
186
      Q[1] = Q[3] = Q[4] = 0;
185
187
      Q[0] = Q[2] = Q[5] = orient*(1-s);
186
188
 
187
 
      surf = new Quadratic_surface(Q, c, s*(1-s)*w, (orient==1? 0 : 3));
 
189
      surf = boost::shared_ptr<Quadratic_surface>(new Quadratic_surface(Q, c, s*(1-s)*w, (orient==1? 0 : 3)));
188
190
    }
189
191
  }
190
192
 
204
206
    Q[4] = orient*(-2*t.z()*t.y()/den);
205
207
    Q[5] = orient*(-  t.z()*t.z()/den + (1-s));
206
208
 
207
 
    surf = new Quadratic_surface(Q, c, s*(1-s)*w, (orient==1? 1 : 2));
 
209
    surf = boost::shared_ptr<Quadratic_surface>(new Quadratic_surface(Q, c, s*(1-s)*w, (orient==1? 1 : 2)));
208
210
  }
209
211
 
210
212
  Surface_RT Q[6];