zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-08 01:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master fix conflicts

Browse Source
This commit is contained in:
Horcrux
2017-01-09 11:11:12 +08:00
parent 44860a02ff d5246a5def
commit f9fe7bdc4e
78 changed files with 1582 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/Utils/RCTConvert+RNSVG.h
+8 -1
View File
@@ -10,7 +10,8 @@
#import <CoreText/CoreText.h>
#import "RCTConvert+RNSVG.h"
#import "RNSVGCGFloatArray.h"
#import "RCTConvert.h"
#import "RNSVGTextFrame.h"
#import <React/RCTConvert.h>
#import "RNSVGCGFCRule.h"
#import "RNSVGVBMOS.h"
#import "RNSVGTextAnchor.h"
@@ -19,13 +20,19 @@
@interface RCTConvert (RNSVG)
<<<<<<< HEAD
+ (CGPathRef)CGPath:(id)json;
+ (RNSVGTextAnchor)RNSVGTextAnchor:(id)json;
=======
+ (CGPathRef)CGPath:(NSString *)d;
+ (CTTextAlignment)CTTextAlignment:(id)json;
>>>>>>> master
+ (RNSVGCGFCRule)RNSVGCGFCRule:(id)json;
+ (RNSVGVBMOS)RNSVGVBMOS:(id)json;
+ (RNSVGCGFloatArray)RNSVGCGFloatArray:(id)json;
+ (RNSVGBrush *)RNSVGBrush:(id)json;
+ (NSArray *)RNSVGBezier:(id)json;
+ (CGRect)CGRect:(id)json offset:(NSUInteger)offset;
+ (CGColorRef)CGColor:(id)json offset:(NSUInteger)offset;