summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Erikson <ulferikson@gmail.com>2009-03-02 15:00:45 +0000
committerulferikson <ulferikson@users.sourceforge.net>2009-03-02 15:00:45 +0000
commit9dc80ae16b7ca8b79a535553e8a75d782c6b4ac2 (patch)
treea07563fcfbb1ecd8b8bb267c881651aac03233b9 /src
parentremove more static dialogs. (diff)
downloadinkscape-9dc80ae16b7ca8b79a535553e8a75d782c6b4ac2.tar.gz
inkscape-9dc80ae16b7ca8b79a535553e8a75d782c6b4ac2.zip
Removing the polyline simplification. Fix for bug #335437 + bug #307783 (missing characters in emf export)
(bzr r7400)
Diffstat (limited to 'src')
-rw-r--r--src/extension/internal/emf-win32-print.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index f69186c71..d098f6466 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -4,7 +4,7 @@
/* Authors:
* Ulf Erikson <ulferikson@users.sf.net>
*
- * Copyright (C) 2006-2008 Authors
+ * Copyright (C) 2006-2009 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
@@ -674,7 +674,6 @@ PrintEmfWin32::print_simple_shape(Geom::PathVector const &pathv, const Geom::Mat
bool done = false;
bool closed = (lpPoints[0].x == lpPoints[i-1].x) && (lpPoints[0].y == lpPoints[i-1].y);
bool polygon = false;
- bool polyline = false;
bool rectangle = false;
bool ellipse = false;
@@ -688,9 +687,6 @@ PrintEmfWin32::print_simple_shape(Geom::PathVector const &pathv, const Geom::Mat
}
}
}
- else if (moves == 1 && moves+lines == nodes) {
- polyline = true;
- }
else if (moves == 1 && nodes == 5 && moves+curves == nodes && closed) {
if (lpPoints[0].x == lpPoints[1].x && lpPoints[1].x == lpPoints[11].x &&
lpPoints[5].x == lpPoints[6].x && lpPoints[6].x == lpPoints[7].x &&
@@ -703,7 +699,7 @@ PrintEmfWin32::print_simple_shape(Geom::PathVector const &pathv, const Geom::Mat
}
}
- if (polygon || polyline || ellipse) {
+ if (polygon || ellipse) {
HPEN hpenTmp = NULL;
HPEN hpenOld = NULL;
HBRUSH hbrushTmp = NULL;
@@ -726,9 +722,6 @@ PrintEmfWin32::print_simple_shape(Geom::PathVector const &pathv, const Geom::Mat
else
Polygon( hdc, lpPoints, nodes );
}
- else if (polyline) {
- Polyline( hdc, lpPoints, nodes );
- }
else if (ellipse) {
Ellipse( hdc, lpPoints[6].x, lpPoints[3].y, lpPoints[0].x, lpPoints[9].y);
}