diff options
Diffstat (limited to '')
-rw-r--r-- | fbwarn/src/parseBVG.c | 6 | ||||
-rw-r--r-- | fbwarn/src/parseBVG.h | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/fbwarn/src/parseBVG.c b/fbwarn/src/parseBVG.c index db25ddc..9b0a137 100644 --- a/fbwarn/src/parseBVG.c +++ b/fbwarn/src/parseBVG.c @@ -282,7 +282,7 @@ BVGCircle *BVGParseCircleSegment(char *argv[7]) { clr = parseColorFromHex(args[3]); result->drawSector=true; - result->centerX=x; result->centerY=y*scale; + result->centerX=x*scale; result->centerY=y*scale; result->color=*clr; result->radius=radius*scale; result->segments=segments; @@ -315,7 +315,7 @@ BVGRing *BVGParseRing(char *argv[8]) { result->centerX=x*scale; result->centerY=y*scale; - result->inRadius=innerRadius; result->outRadius=outerRadius; + result->inRadius=innerRadius*scale; result->outRadius=outerRadius*scale; result->startAngle=startAngle; result->endAngle=endAngle; result->segmets=segments; result->color=*clr; @@ -343,7 +343,7 @@ BVGEllipse *BVGParseEllipse(char *argv[6]) { args[5][strlen(args[5])-1] = '\0'; clr = parseColorFromHex(args[5]); - result->centerX=x; result->centerY=y; + result->centerX=x*scale; result->centerY=y*scale; result->horizontalRadius=horizontalRadius*scale; result->verticalRadius=verticalRadius*scale; result->fill=fill; diff --git a/fbwarn/src/parseBVG.h b/fbwarn/src/parseBVG.h index 1a90c78..120763a 100644 --- a/fbwarn/src/parseBVG.h +++ b/fbwarn/src/parseBVG.h @@ -19,6 +19,13 @@ void BVGDrawRectangle(BVGRectangle *rectangle); BVGRoundedRectangle *BVGParseRoundedRectangle(char *argv[9]); void BVGDrawRoundedRectangle(BVGRoundedRectangle *rectangle); BVGCircle *BVGParseCircle(char *argv[4]); +BVGCircle *BVGParseCircleSegment(char *argv[7]); void BVGDrawCircle(BVGCircle *circle); BVGRing *BVGParseRing(char *argv[8]); void BVGDrawRing(BVGRing *ring); +BVGEllipse *BVGParseEllipse(char *argv[6]); +void BVGDrawEllipse(BVGEllipse *ellipse); +BVGTriangle *BVGParseTriangle(char *argv[8]); +void BVGDrawTriangle(BVGTriangle *triangle); +BVGText *BVGParseText(char *argv[5]); +void BVGDrawText(BVGText *text); |