Skip to content

Commit

Permalink
Merge branch '1.1.0' into fixing-viewboxes-and-viewports
Browse files Browse the repository at this point in the history
  • Loading branch information
adamgit authored and adamgit committed Apr 13, 2013
2 parents f221189 + dc9f755 commit 90bd8e8
Show file tree
Hide file tree
Showing 48 changed files with 632 additions and 286 deletions.
4 changes: 2 additions & 2 deletions Demo-iOS.xcodeproj/project.pbxproj
Expand Up @@ -506,7 +506,7 @@
"../../iOS/**",
"../../Core/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
SDKROOT = iphoneos;
Expand All @@ -532,7 +532,7 @@
"../../iOS/**",
"../../Core/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
56 changes: 51 additions & 5 deletions SVGKit-iOS.xcodeproj/project.pbxproj
Expand Up @@ -7,6 +7,14 @@
objects = {

/* Begin PBXBuildFile section */
036A524C16E87693008C1140 /* NSCharacterSet+SVGKExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 036A524A16E87693008C1140 /* NSCharacterSet+SVGKExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
036A524D16E87693008C1140 /* NSCharacterSet+SVGKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 036A524B16E87693008C1140 /* NSCharacterSet+SVGKExtensions.m */; };
6616CB11171078E800109FF3 /* SVGKSourceString.h in Headers */ = {isa = PBXBuildFile; fileRef = 6616CB0F171078E800109FF3 /* SVGKSourceString.h */; settings = {ATTRIBUTES = (Public, ); }; };
6616CB12171078E800109FF3 /* SVGKSourceString.m in Sources */ = {isa = PBXBuildFile; fileRef = 6616CB10171078E800109FF3 /* SVGKSourceString.m */; };
6616CB151710790200109FF3 /* SVGKSourceLocalFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6616CB131710790200109FF3 /* SVGKSourceLocalFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
6616CB161710790200109FF3 /* SVGKSourceLocalFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6616CB141710790200109FF3 /* SVGKSourceLocalFile.m */; };
6616CB191710798300109FF3 /* SVGKSourceURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6616CB171710798300109FF3 /* SVGKSourceURL.h */; settings = {ATTRIBUTES = (Public, ); }; };
6616CB1A1710798300109FF3 /* SVGKSourceURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6616CB181710798300109FF3 /* SVGKSourceURL.m */; };
661ADBF216CC2FBE006F4BC3 /* SVGTextPositioningElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 661ADBF016CC2FBE006F4BC3 /* SVGTextPositioningElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
661ADBF316CC2FBE006F4BC3 /* SVGTextPositioningElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 661ADBF116CC2FBE006F4BC3 /* SVGTextPositioningElement.m */; };
661ADBF716CC2FCA006F4BC3 /* SVGTextContentElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 661ADBF516CC2FCA006F4BC3 /* SVGTextContentElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -215,13 +223,21 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
036A524A16E87693008C1140 /* NSCharacterSet+SVGKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSCharacterSet+SVGKExtensions.h"; sourceTree = "<group>"; };
036A524B16E87693008C1140 /* NSCharacterSet+SVGKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSCharacterSet+SVGKExtensions.m"; sourceTree = "<group>"; };
6616CB0F171078E800109FF3 /* SVGKSourceString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGKSourceString.h; sourceTree = "<group>"; };
6616CB10171078E800109FF3 /* SVGKSourceString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGKSourceString.m; sourceTree = "<group>"; };
6616CB131710790200109FF3 /* SVGKSourceLocalFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGKSourceLocalFile.h; sourceTree = "<group>"; };
6616CB141710790200109FF3 /* SVGKSourceLocalFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGKSourceLocalFile.m; sourceTree = "<group>"; };
6616CB171710798300109FF3 /* SVGKSourceURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGKSourceURL.h; sourceTree = "<group>"; };
6616CB181710798300109FF3 /* SVGKSourceURL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGKSourceURL.m; sourceTree = "<group>"; };
661ADBF016CC2FBE006F4BC3 /* SVGTextPositioningElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextPositioningElement.h; sourceTree = "<group>"; };
661ADBF116CC2FBE006F4BC3 /* SVGTextPositioningElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGTextPositioningElement.m; sourceTree = "<group>"; };
661ADBF516CC2FCA006F4BC3 /* SVGTextContentElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextContentElement.h; sourceTree = "<group>"; };
661ADBF616CC2FCA006F4BC3 /* SVGTextContentElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGTextContentElement.m; sourceTree = "<group>"; };
661ADBFB16CC364F006F4BC3 /* SVGTextPositioningElement_Mutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextPositioningElement_Mutable.h; sourceTree = "<group>"; };
66372F5916960D4E008C6C56 /* SVGRect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGRect.m; sourceTree = "<group>"; };
6639618E16145D0400E58CCA /* libSVGKit-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSVGKit-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6639618E16145D0400E58CCA /* libSVGKit-iOS.1.1.0pre.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSVGKit-iOS.1.1.0pre.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6639619116145D0400E58CCA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
6639633F16145DDC00E58CCA /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
6639634116148CDF00E58CCA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -429,6 +445,19 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
6616CB0E171078E800109FF3 /* Sources */ = {
isa = PBXGroup;
children = (
6616CB0F171078E800109FF3 /* SVGKSourceString.h */,
6616CB10171078E800109FF3 /* SVGKSourceString.m */,
6616CB131710790200109FF3 /* SVGKSourceLocalFile.h */,
6616CB141710790200109FF3 /* SVGKSourceLocalFile.m */,
6616CB171710798300109FF3 /* SVGKSourceURL.h */,
6616CB181710798300109FF3 /* SVGKSourceURL.m */,
);
path = Sources;
sourceTree = "<group>";
};
6639618316145D0400E58CCA = {
isa = PBXGroup;
children = (
Expand All @@ -442,7 +471,7 @@
6639618F16145D0400E58CCA /* Products */ = {
isa = PBXGroup;
children = (
6639618E16145D0400E58CCA /* libSVGKit-iOS.a */,
6639618E16145D0400E58CCA /* libSVGKit-iOS.1.1.0pre.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -471,6 +500,7 @@
children = (
66E8630C1688C2770059C9C4 /* DOM classes */,
66E8636F1688C2770059C9C4 /* Exporters */,
6616CB0E171078E800109FF3 /* Sources */,
66E863721688C2770059C9C4 /* Parsers */,
66E863831688C2770059C9C4 /* QuartzCore additions */,
66E8638C1688C2780059C9C4 /* SVGKImage.h */,
Expand Down Expand Up @@ -730,6 +760,8 @@
66E863911688C2780059C9C4 /* UIKit additions */ = {
isa = PBXGroup;
children = (
036A524A16E87693008C1140 /* NSCharacterSet+SVGKExtensions.h */,
036A524B16E87693008C1140 /* NSCharacterSet+SVGKExtensions.m */,
66E863921688C2780059C9C4 /* SVGKFastImageView.h */,
66E863931688C2780059C9C4 /* SVGKFastImageView.m */,
66E863941688C2780059C9C4 /* SVGKImageView.h */,
Expand Down Expand Up @@ -867,6 +899,10 @@
661ADBFC16CC364F006F4BC3 /* SVGTextPositioningElement_Mutable.h in Headers */,
661AE44916D13DA8005E69D9 /* SVGTransformable.h in Headers */,
661AE44A16D13DAD005E69D9 /* SVGFitToViewBox.h in Headers */,
036A524C16E87693008C1140 /* NSCharacterSet+SVGKExtensions.h in Headers */,
6616CB11171078E800109FF3 /* SVGKSourceString.h in Headers */,
6616CB151710790200109FF3 /* SVGKSourceLocalFile.h in Headers */,
6616CB191710798300109FF3 /* SVGKSourceURL.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -889,7 +925,7 @@
);
name = "SVGKit-iOS";
productName = "SVGKit-iOS";
productReference = 6639618E16145D0400E58CCA /* libSVGKit-iOS.a */;
productReference = 6639618E16145D0400E58CCA /* libSVGKit-iOS.1.1.0pre.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
Expand Down Expand Up @@ -1022,6 +1058,10 @@
663FD01516CAEF0D00CCBFB3 /* SVGHelperUtilities.m in Sources */,
661ADBF316CC2FBE006F4BC3 /* SVGTextPositioningElement.m in Sources */,
661ADBF816CC2FCA006F4BC3 /* SVGTextContentElement.m in Sources */,
036A524D16E87693008C1140 /* NSCharacterSet+SVGKExtensions.m in Sources */,
6616CB12171078E800109FF3 /* SVGKSourceString.m in Sources */,
6616CB161710790200109FF3 /* SVGKSourceLocalFile.m in Sources */,
6616CB1A1710798300109FF3 /* SVGKSourceURL.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -1035,6 +1075,7 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Lei Lei (JV5Y7A3TGE)";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
Expand All @@ -1049,6 +1090,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
PROVISIONING_PROFILE = "B8829AC4-04C1-4193-8D27-8543F41E0D20";
SDKROOT = iphoneos;
};
name = Debug;
Expand All @@ -1060,13 +1102,15 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Lei Lei (JV5Y7A3TGE)";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
PROVISIONING_PROFILE = "B8829AC4-04C1-4193-8D27-8543F41E0D20";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
};
Expand All @@ -1076,6 +1120,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DSTROOT = /tmp/SVGKit_iOS.dst;
DYLIB_CURRENT_VERSION = 1.1.0pre;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "XCodeProjectData/SVGKit-iOS/SVGKit-iOS-Prefix.pch";
HEADER_SEARCH_PATHS = /usr/include/libxml2;
Expand All @@ -1085,7 +1130,7 @@
"\"$(SRCROOT)/Source/Core\"",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "$(TARGET_NAME).${DYLIB_CURRENT_VERSION}";
SKIP_INSTALL = YES;
};
name = Debug;
Expand All @@ -1094,6 +1139,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DSTROOT = /tmp/SVGKit_iOS.dst;
DYLIB_CURRENT_VERSION = 1.1.0pre;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "XCodeProjectData/SVGKit-iOS/SVGKit-iOS-Prefix.pch";
HEADER_SEARCH_PATHS = /usr/include/libxml2;
Expand All @@ -1103,7 +1149,7 @@
"\"$(SRCROOT)/Source/Core\"",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "$(TARGET_NAME).${DYLIB_CURRENT_VERSION}";
SKIP_INSTALL = YES;
};
name = Release;
Expand Down
1 change: 1 addition & 0 deletions Source/DOM classes/Core DOM/Attr.m
Expand Up @@ -53,6 +53,7 @@ - (id)initWithNamespace:(NSString*) ns qualifiedName:(NSString*) qn value:(NSStr
- (void)dealloc {
self.name = nil;
self.value = nil;
self.ownerElement = nil;
[super dealloc];
}

Expand Down
5 changes: 5 additions & 0 deletions Source/DOM classes/Core DOM/CSSPrimitiveValue.m
Expand Up @@ -22,6 +22,11 @@ @implementation CSSPrimitiveValue

@synthesize primitiveType;

- (void)dealloc {
self.internalString = nil;
[super dealloc];
}

- (id)init
{
self = [super initWithUnitType:CSS_PRIMITIVE_VALUE];
Expand Down
7 changes: 7 additions & 0 deletions Source/DOM classes/Core DOM/CSSRule.m
Expand Up @@ -8,4 +8,11 @@ @implementation CSSRule
@synthesize parentStyleSheet;
@synthesize parentRule;

- (void)dealloc {
self.cssText = nil;
self.parentRule = nil;
self.parentStyleSheet = nil;
[super dealloc];
}

@end
5 changes: 5 additions & 0 deletions Source/DOM classes/Core DOM/CSSRuleList.m
Expand Up @@ -5,6 +5,11 @@ @implementation CSSRuleList

@synthesize internalArray;

- (void)dealloc {
self.internalArray = nil;
[super dealloc];
}

- (id)init
{
self = [super init];
Expand Down
8 changes: 8 additions & 0 deletions Source/DOM classes/Core DOM/CSSStyleDeclaration.m
Expand Up @@ -18,6 +18,13 @@ @implementation CSSStyleDeclaration
@synthesize length;
@synthesize parentRule;

- (void)dealloc {
[_cssText release];
self.parentRule = nil;
self.internalDictionaryOfStylesByCSSClass = nil;
[super dealloc];
}

- (id)init
{
self = [super init];
Expand All @@ -44,6 +51,7 @@ -(void)setCssText:(NSString *)newCSSText
NSMutableDictionary* processedStyles = [self NSDictionaryFromCSSAttributes:_cssText];

self.internalDictionaryOfStylesByCSSClass = processedStyles;

}

-(NSMutableDictionary *) NSDictionaryFromCSSAttributes: (NSString *)css {
Expand Down
6 changes: 6 additions & 0 deletions Source/DOM classes/Core DOM/CSSStyleRule.m
Expand Up @@ -6,6 +6,12 @@ @implementation CSSStyleRule
@synthesize selectorText;
@synthesize style;

- (void)dealloc {
self.style = nil;
self.selectorText = nil;
[super dealloc];
}

- (id)init
{
NSAssert(FALSE, @"Can't be init'd, use the right method, idiot");
Expand Down
6 changes: 6 additions & 0 deletions Source/DOM classes/Core DOM/CSSStyleSheet.m
Expand Up @@ -9,6 +9,12 @@ @implementation CSSStyleSheet
@synthesize ownerRule;
@synthesize cssRules;

- (void)dealloc {
self.ownerRule = nil;
self.cssRules = nil;
[super dealloc];
}

/**
Used to insert a new rule into the style sheet. The new rule now becomes part of the cascade.
Expand Down
5 changes: 5 additions & 0 deletions Source/DOM classes/Core DOM/CSSValue.m
Expand Up @@ -6,6 +6,11 @@ @implementation CSSValue
@synthesize cssText = _cssText;
@synthesize cssValueType;

- (void)dealloc {
[_cssText release];
[super dealloc];
}

- (id)init
{
NSAssert(FALSE, @"This class cannot be init'd using init. It would break it, badly. Use the correct init call instead (if you don't know what that is, you shouldn't be init'ing this class)");
Expand Down
5 changes: 5 additions & 0 deletions Source/DOM classes/Core DOM/CSSValueList.m
Expand Up @@ -11,6 +11,11 @@ @implementation CSSValueList

@synthesize internalArray;

- (void)dealloc {
self.internalArray = nil;
[super dealloc];
}

- (id)init
{
self = [super initWithUnitType:CSS_VALUE_LIST];
Expand Down
5 changes: 5 additions & 0 deletions Source/DOM classes/Core DOM/CharacterData.m
Expand Up @@ -14,6 +14,11 @@ @implementation CharacterData

@synthesize length;

- (void)dealloc {
[data release];
[super dealloc];
}

-(NSString*) substringData:(unsigned long) offset count:(unsigned long) count
{
NSAssert( FALSE, @"Not implemented yet" );
Expand Down
7 changes: 7 additions & 0 deletions Source/DOM classes/Core DOM/Document.m
Expand Up @@ -12,6 +12,13 @@ @implementation Document
@synthesize documentElement;


- (void)dealloc {
[doctype release];
[implementation release];
[documentElement release];
[super dealloc];
}

-(Element*) createElement:(NSString*) tagName
{
Element* newElement = [[Element alloc] initWithLocalName:tagName attributes:nil];
Expand Down
10 changes: 10 additions & 0 deletions Source/DOM classes/Core DOM/DocumentType.m
Expand Up @@ -40,4 +40,14 @@ @implementation DocumentType
// Introduced in DOM Level 2:
@synthesize internalSubset;

- (void)dealloc {
[name release];
[entities release];
[notations release];
[publicId release];
[systemId release];
[internalSubset release];
[super dealloc];
}

@end
5 changes: 5 additions & 0 deletions Source/DOM classes/Core DOM/Element.m
Expand Up @@ -11,6 +11,11 @@ @implementation Element

@synthesize tagName;

- (void)dealloc {
self.tagName = nil;
[super dealloc];
}

- (id)initWithLocalName:(NSString*) n attributes:(NSMutableDictionary*) attributes {
self = [super initType:DOMNodeType_ELEMENT_NODE name:n];
if (self) {
Expand Down
5 changes: 5 additions & 0 deletions Source/DOM classes/Core DOM/MediaList.m
Expand Up @@ -5,6 +5,11 @@ @implementation MediaList
@synthesize mediaText;
@synthesize length;

- (void)dealloc {
[mediaText release];
[super dealloc];
}

-(NSString*) item:(unsigned long) index
{
NSAssert( FALSE, @"Not implemented yet");
Expand Down
11 changes: 11 additions & 0 deletions Source/DOM classes/Core DOM/Node.m
Expand Up @@ -33,6 +33,17 @@ @implementation Node

@synthesize localName;

- (void)dealloc {
[nodeName release];
[nodeValue release];
[childNodes release];
[attributes release];
[prefix release];
[namespaceURI release];
[localName release];
[super dealloc];
}

- (id)init
{
NSAssert( FALSE, @"This class has no init method - it MUST NOT be init'd via init - you MUST use one of the multi-argument constructors instead" );
Expand Down

0 comments on commit 90bd8e8

Please sign in to comment.