xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2024-11-23 11:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

DroidFish: Handle units in SVG parser for stroke-width attribute.

Browse Source
This commit is contained in:
Peter Osterlund 2012-06-09 14:51:09 +00:00
parent a857fbc2cd
commit bbbb9078cb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DroidFish/src/com/larvalabs/svgandroid/SVGParser.java
View File

@ -752,12 +752,15 @@ public class SVGParser {
}
*/
public Float getFloat(String name) {
public Float getFloat(String name, boolean handleUnits) {
String v = getAttr(name);
if (v == null) {
return null;
} else {
try {
if (handleUnits)
if (v.endsWith("px") || v.endsWith("pt"))
v = v.substring(0, v.length() - 2);
return Float.parseFloat(v);
} catch (NumberFormatException nfe) {
return null;
@ -862,7 +865,7 @@ public class SVGParser {
if (color != null) {
doColor(atts, color, false);
// Check for other stroke attributes
Float width = atts.getFloat("stroke-width");
Float width = atts.getFloat("stroke-width", true);
// Set defaults
if (width != null) {
@ -924,9 +927,9 @@ public class SVGParser {
c = replaceColor;
}
paint.setColor(c);
Float opacity = atts.getFloat("opacity");
Float opacity = atts.getFloat("opacity", false);
if (opacity == null) {
opacity = atts.getFloat(fillMode ? "fill-opacity" : "stroke-opacity");
opacity = atts.getFloat(fillMode ? "fill-opacity" : "stroke-opacity", false);
}
if (opacity == null) {
paint.setAlpha(255);