Permalink
Browse files

Merge branch 'master' into lion

Conflicts:
	src/dxfdata.cc
  • Loading branch information...
2 parents 1026be9 + 67eeed3 commit 43acfe53049fd8851d501b86021e28922973b9c8 @kintel kintel committed Jul 26, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/dxfdata.cc
View
@@ -238,7 +238,7 @@ DxfData::DxfData(double fn, double fs, double fa,
int n = get_fragments_from_r(r_major, fn, fs, fa);
n = (int)ceil(n * sweep_angle / (2 * M_PI));
// Vector2d p1;
- Vector2d p1; p1 << 0,0,0;
+ Vector2d p1; p1 << 0,0;
for (int i=0;i<=n;i++) {
double a = (ellipse_start_angle + sweep_angle*i/n);
// Vector2d p2(cos(a)*r_major, sin(a)*r_minor);

0 comments on commit 43acfe5

Please sign in to comment.