diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-06-25 19:58:20 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-08-05 00:38:53 +0000 |
| commit | d119fffbaf3a19c463edb28b232015cb40880445 (patch) | |
| tree | c2dd998e9dfd73d9b2d9c2ab167a3d8f881f265a /src/extension/internal/emf-inout.cpp | |
| parent | Update to trunk and styling fixes (diff) | |
| download | inkscape-d119fffbaf3a19c463edb28b232015cb40880445.tar.gz inkscape-d119fffbaf3a19c463edb28b232015cb40880445.zip | |
Fixes pointed by Tav
Diffstat (limited to 'src/extension/internal/emf-inout.cpp')
| -rw-r--r-- | src/extension/internal/emf-inout.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index a22a33e40..25228fe89 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -1095,17 +1095,16 @@ Emf::select_pen(PEMF_CALLBACK_DATA d, int index) case U_PS_DASHDOT: case U_PS_DASHDOTDOT: { - SPILength spilength; - spilength.read("1"); + SPILength spilength("temp", 1); int penstyle = (pEmr->lopn.lopnStyle & U_PS_STYLE_MASK); if (!d->dc[d->level].style.stroke_dasharray.values.empty() && (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray != d->dc[d->level - 1].style.stroke_dasharray))) d->dc[d->level].style.stroke_dasharray.values.clear(); if (penstyle==U_PS_DASH || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) { - spilength.read("3"); + spilength.setDouble(3); d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); - spilength.read("1"); + spilength.setDouble(1); d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); } if (penstyle==U_PS_DOT || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) { @@ -1190,13 +1189,9 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index) (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray != d->dc[d->level - 1].style.stroke_dasharray))) d->dc[d->level].style.stroke_dasharray.values.clear(); - SPILength spilength; for (unsigned int i=0; i<pEmr->elp.elpNumEntries; i++) { double dash_length = pix_to_abs_size( d, pEmr->elp.elpStyleEntry[i] ); - Inkscape::CSSOStringStream osarray; - osarray << dash_length; - spilength.read(osarray.str().c_str()); - d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); + d->dc[d->level].style.stroke_dasharray.values.push_back(SPILength("temp", dash_length)); } d->dc[d->level].style.stroke_dasharray.set = 1; } else { @@ -1215,23 +1210,23 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index) (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray != d->dc[d->level - 1].style.stroke_dasharray))) d->dc[d->level].style.stroke_dasharray.values.clear(); - SPILength spilength; + SPILength spilength("temp"); if (penstyle==U_PS_DASH || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) { - spilength.read("3"); + spilength.setDouble(3); d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); - spilength.read("2"); + spilength.setDouble(2); d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); } if (penstyle==U_PS_DOT || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) { - spilength.read("1"); + spilength.setDouble(1); d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); - spilength.read("2"); + spilength.setDouble(2); d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); } if (penstyle==U_PS_DASHDOTDOT) { - spilength.read("1"); + spilength.setDouble(1); d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); - spilength.read("2"); + spilength.setDouble(2); d->dc[d->level].style.stroke_dasharray.values.push_back(spilength); } |