diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-02-16 20:49:53 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-02-16 20:49:53 +0000 |
| commit | 9593c78703845bfca18a3a135cbbc47cc03b54f6 (patch) | |
| tree | 4616e3cb7ed134d82367726aafaaf3f312d1cbc5 /src/live_effects/parameter/array.cpp | |
| parent | added knots (diff) | |
| download | inkscape-9593c78703845bfca18a3a135cbbc47cc03b54f6.tar.gz inkscape-9593c78703845bfca18a3a135cbbc47cc03b54f6.zip | |
continuing fillet/chamfer
(bzr r13645.1.13)
Diffstat (limited to 'src/live_effects/parameter/array.cpp')
| -rw-r--r-- | src/live_effects/parameter/array.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/live_effects/parameter/array.cpp b/src/live_effects/parameter/array.cpp index d1d718b08..473b561d2 100644 --- a/src/live_effects/parameter/array.cpp +++ b/src/live_effects/parameter/array.cpp @@ -55,17 +55,16 @@ sp_svg_satellite_read_d(gchar const *str, Geom::Satellite *sat){ } gchar ** strarray = g_strsplit(str, "*", 0); if(strarray[6] && !strarray[7]){ - std::map< gchar const *, Geom::SatelliteType> gts = sat->GcharMapToSatelliteType; - sat->setSatelliteType(gts[strarray[0]]); + sat->setSatelliteType(strarray[0]); sat->setIsTime(helperfns_read_bool(strarray[1], true)); sat->setActive(helperfns_read_bool(strarray[2], true)); sat->setHasMirror(helperfns_read_bool(strarray[3], false)); sat->setHidden(helperfns_read_bool(strarray[4], false)); double time,size; - sp_svg_number_read_d(strarray[5], &time); - sp_svg_number_read_d(strarray[6], &size); - sat->setTime(time); + sp_svg_number_read_d(strarray[5], &size); + sp_svg_number_read_d(strarray[6], &time); sat->setSize(size); + sat->setTime(time); g_strfreev (strarray); return 1; } |
