ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix paths

Browse Source
This commit is contained in:
Ali 2019-12-27 16:25:38 +04:00
parent b97b7a3aae
commit 486f5962d5
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
submodules/Svg/Sources/Svg.m
View File

@ -4,6 +4,8 @@
#import "SVGKExporterUIImage.h"
#import "nanosvg.h"
#define UIColorRGBA(rgb,a) ([[UIColor alloc] initWithRed:(((rgb >> 16) & 0xff) / 255.0f) green:(((rgb >> 8) & 0xff) / 255.0f) blue:(((rgb) & 0xff) / 255.0f) alpha:a])
CGSize aspectFillSize(CGSize size, CGSize bounds) {
CGFloat scale = MAX(bounds.width / MAX(1.0, size.width), bounds.height / MAX(1.0, size.height));
@ -117,7 +119,7 @@ UIImage * _Nullable drawSvgImage(NSData * _Nonnull data, CGSize size) {
startTime = [NSDate date];
UIColor *backgroundColor = [UIColor blackColor];
UIColor *backgroundColor = [UIColor blueColor];
UIColor *foregroundColor = [UIColor whiteColor];
UIGraphicsBeginImageContextWithOptions(size, true, 1.0);
@ -132,16 +134,34 @@ UIImage * _Nullable drawSvgImage(NSData * _Nonnull data, CGSize size) {
}
if (shape->fill.type != NSVG_PAINT_NONE) {
//CGContextSetFillColorWithColor(context, UIColorRGBA(shape->fill.color, shape->opacity).CGColor);
CGContextSetFillColorWithColor(context, [foregroundColor colorWithAlphaComponent:shape->opacity].CGColor);
bool isFirst = true;
for (NSVGpath *path = shape->paths; path != NULL; path = path->next) {
CGContextBeginPath(context);
if (isFirst) {
CGContextBeginPath(context);
isFirst = false;
}
CGContextMoveToPoint(context, path->pts[0], path->pts[1]);
for (int i = 0; i < path->npts - 1; i += 3) {
float *p = &path->pts[i * 2];
CGContextAddCurveToPoint(context, p[2], p[3], p[4], p[5], p[6], p[7]);
}
if (path->closed) {
switch (shape->fillRule) {
case NSVG_FILLRULE_EVENODD:
CGContextEOFillPath(context);
break;
default:
CGContextFillPath(context);
break;
}
isFirst = true;
}
}
if (!isFirst) {
switch (shape->fillRule) {
case NSVG_FILLRULE_EVENODD:
CGContextEOFillPath(context);
@ -154,6 +174,7 @@ UIImage * _Nullable drawSvgImage(NSData * _Nonnull data, CGSize size) {
}
if (shape->stroke.type != NSVG_PAINT_NONE) {
//CGContextSetStrokeColorWithColor(context, UIColorRGBA(shape->fill.color, shape->opacity).CGColor);
CGContextSetStrokeColorWithColor(context, [foregroundColor colorWithAlphaComponent:shape->opacity].CGColor);
CGContextSetMiterLimit(context, shape->miterLimit);
@ -205,7 +226,7 @@ UIImage * _Nullable drawSvgImage(NSData * _Nonnull data, CGSize size) {
UIGraphicsEndImageContext();
deltaTime = -1.0f * [startTime timeIntervalSinceNow];
printf("drawingTime = %f\n", deltaTime);
printf("drawingTime %fx%f = %f\n", size.width, size.height, deltaTime);
nsvgDelete(image);

11
submodules/Svg/Sources/nanosvg.h
View File

@ -1037,8 +1037,8 @@ static void nsvg__addPath(NSVGparser* p, char closed)
if (p->npts < 4)
return;
if (closed)
nsvg__lineTo(p, p->pts[0], p->pts[1]);
/*if (closed)
nsvg__lineTo(p, p->pts[0], p->pts[1]);*/
path = (NSVGpath*)malloc(sizeof(NSVGpath));
if (path == NULL) goto error;
@ -2683,30 +2683,37 @@ static void nsvg__startElement(void* ud, const char* el, const char** attr)
if (p->pathFlag) // Do not allow nested paths.
return;
nsvg__pushAttr(p);
nsvg__parseAttribs(p, attr);
nsvg__parsePath(p, attr);
nsvg__popAttr(p);
} else if (strcmp(el, "rect") == 0) {
nsvg__pushAttr(p);
nsvg__parseAttribs(p, attr);
nsvg__parseRect(p, attr);
nsvg__popAttr(p);
} else if (strcmp(el, "circle") == 0) {
nsvg__pushAttr(p);
nsvg__parseAttribs(p, attr);
nsvg__parseCircle(p, attr);
nsvg__popAttr(p);
} else if (strcmp(el, "ellipse") == 0) {
nsvg__pushAttr(p);
nsvg__parseAttribs(p, attr);
nsvg__parseEllipse(p, attr);
nsvg__popAttr(p);
} else if (strcmp(el, "line") == 0) {
nsvg__pushAttr(p);
nsvg__parseAttribs(p, attr);
nsvg__parseLine(p, attr);
nsvg__popAttr(p);
} else if (strcmp(el, "polyline") == 0) {
nsvg__pushAttr(p);
nsvg__parseAttribs(p, attr);
nsvg__parsePoly(p, attr, 0);
nsvg__popAttr(p);
} else if (strcmp(el, "polygon") == 0) {
nsvg__pushAttr(p);
nsvg__parseAttribs(p, attr);
nsvg__parsePoly(p, attr, 1);
nsvg__popAttr(p);
} else if (strcmp(el, "linearGradient") == 0) {