diff options
| author | Alvin Penner <penner@vaxxine.com> | 2011-10-07 22:36:44 +0000 |
|---|---|---|
| committer | apenner <penner@vaxxine.com> | 2011-10-07 22:36:44 +0000 |
| commit | e47c0620257d767316fe5f5beb0462adc9bed920 (patch) | |
| tree | 33ac08a30c73f350b51b536b8b980972f18ec249 /src | |
| parent | Dutch translation update (diff) | |
| download | inkscape-e47c0620257d767316fe5f5beb0462adc9bed920.tar.gz inkscape-e47c0620257d767316fe5f5beb0462adc9bed920.zip | |
emf import. allow EMR_MOVETOEX to occur before EMR_BEGINPATH (Bug 858369)
Fixed bugs:
- https://launchpad.net/bugs/858369
(bzr r10670)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/emf-win32-inout.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp index f1f0ef3cb..f66209479 100644 --- a/src/extension/internal/emf-win32-inout.cpp +++ b/src/extension/internal/emf-win32-inout.cpp @@ -736,7 +736,7 @@ myEnhMetaFileProc(HDC /*hDC*/, HANDLETABLE * /*lpHTable*/, ENHMETARECORD const * lpEMFR->iType!=EMR_POLYLINETO && lpEMFR->iType!=EMR_POLYLINETO16 && lpEMFR->iType!=EMR_LINETO && lpEMFR->iType!=EMR_ARCTO && lpEMFR->iType!=EMR_SETBKCOLOR && lpEMFR->iType!=EMR_SETROP2 && - lpEMFR->iType!=EMR_SETBKMODE) + lpEMFR->iType!=EMR_SETBKMODE && lpEMFR->iType!=EMR_BEGINPATH) { *(d->outsvg) += " <path "; output_style(d, EMR_STROKEPATH); @@ -1665,8 +1665,11 @@ myEnhMetaFileProc(HDC /*hDC*/, HANDLETABLE * /*lpHTable*/, ENHMETARECORD const * { dbg_str << "<!-- EMR_BEGINPATH -->\n"; - tmp_path << "d=\""; - *(d->path) = ""; + if (!d->pathless_stroke) { + tmp_path << "d=\""; + *(d->path) = ""; + } + d->pathless_stroke = false; d->inpath = true; break; } |