Skip to content

iOS port, expanded SVG filter pipeline, WebKit PSNR test harness #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duncanwilcox wants to merge 1 commit into
base: master
Choose a base branch
from
Open

iOS port, expanded SVG filter pipeline, WebKit PSNR test harness #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions Framework/IJSVG/IJSVG.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Framework/IJSVG/IJSVG/Source/Additions/NSImage+IJSVGAdditions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
// Copyright © 2020 Curtis Hard. All rights reserved.
//

#import <AppKit/AppKit.h>
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>

@class IJSVG;

IJSVG* IJSVGGetFromNSImage(NSImage* image);

Expand Down
20 changes: 20 additions & 0 deletions Framework/IJSVG/IJSVG/Source/Additions/NSImage+IJSVGAdditions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,42 @@
// Copyright © 2020 Curtis Hard. All rights reserved.
//

#import <IJSVG/IJSVG.h>
#if !TARGET_OS_IOS
#import <IJSVG/IJSVGImageRep.h>
#endif
#import <IJSVG/NSImage+IJSVGAdditions.h>

IJSVG* IJSVGGetFromNSImage(NSImage* image)
{
#if TARGET_OS_IOS
#pragma unused(image)
return nil;
#else
for (NSImageRep* rep in image.representations) {
if([rep isKindOfClass:IJSVGImageRep.class]) {
return ((IJSVGImageRep*)rep).SVG;
}
}
return nil;
#endif
}

@implementation NSImage (IJSVGAdditions)

+ (NSImage*)SVGImageNamed:(NSString*)imageName
{
#if TARGET_OS_IOS
IJSVG* svg = [IJSVG SVGNamed:imageName];
if(svg == nil) {
return nil;
}
CGSize size = svg.size;
if(size.width <= 0.f || size.height <= 0.f) {
size = CGSizeMake(24.f, 24.f);
}
return [svg imageWithSize:size];
#else
// find the image
NSBundle* bundle = NSBundle.mainBundle;
NSString* str = nil;
Expand All @@ -48,6 +67,7 @@ + (NSImage*)SVGImageNamed:(NSString*)imageName
return image;
}
return nil;
#endif
}

@end
57 changes: 35 additions & 22 deletions Framework/IJSVG/IJSVG/Source/Colors/IJSVGColor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
// Copyright (c) 2014 Curtis Hard. All rights reserved.
//

#import <AppKit/AppKit.h>
#import <Foundation/Foundation.h>
#import <IJSVG/IJSVGPlatform.h>

NS_ASSUME_NONNULL_BEGIN

typedef NS_OPTIONS(NSInteger, IJSVGColorStringOptions) {
IJSVGColorStringOptionNone = 1 << 0,
Expand Down Expand Up @@ -167,34 +168,46 @@ typedef NS_ENUM(NSInteger, IJSVGPredefinedColor) {
IJSVGColorYellowgreen
};

extern NSString* const IJSVGColorCurrentColorName;
extern NSString * const IJSVGColorCurrentColorName;

@interface IJSVGColor : NSObject

CGFloat* IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightness);
CGFloat* _Nullable IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightness);
BOOL IJSVGColorGetRGBAComponents(NSColor* _Nullable color,
CGFloat* _Nullable red,
CGFloat* _Nullable green,
CGFloat* _Nullable blue,
CGFloat* _Nullable alpha);
CGFloat IJSVGColorAlphaComponent(NSColor* _Nullable color);

+ (NSColor*)computeColorSpace:(NSColor*)color;
+ (NSColorSpace*)defaultColorSpace;
+ (BOOL)isColor:(NSString*)string;
+ (NSString*)colorStringFromColor:(NSColor*)color
+ (NSColor* _Nullable)computeColorSpace:(NSColor* _Nullable)color;
#if TARGET_OS_IOS
+ (CGColorSpaceRef _Nonnull)defaultColorSpace;
#else
+ (NSColorSpace* _Nonnull)defaultColorSpace;
#endif
+ (BOOL)isColor:(NSString* _Nullable)string;
+ (NSString*)colorStringFromColor:(NSColor* _Nullable)color
options:(IJSVGColorStringOptions)options;
+ (NSString*)colorStringFromColor:(NSColor*)color;
+ (NSString*)colorStringFromColor:(NSColor* _Nullable)color;
+ (NSColor*)colorFromHEXInteger:(NSInteger)hex;
+ (NSColor*)computeColor:(id)colour;
+ (BOOL)isNoneOrTransparent:(NSString*)string;
+ (NSColor*)colorFromString:(NSString*)string;
+ (NSColor*)colorFromHEXString:(NSString*)string;
+ (NSColor*)colorFromHEXString:(NSString*)string
containsAlphaComponent:(BOOL*)containsAlphaComponent;
+ (NSColor* _Nullable)computeColor:(id _Nullable)colour;
+ (BOOL)isNoneOrTransparent:(NSString* _Nullable)string;
+ (NSColor* _Nullable)colorFromString:(NSString* _Nullable)string;
+ (NSColor* _Nullable)colorFromHEXString:(NSString* _Nullable)string;
+ (NSColor* _Nullable)colorFromHEXString:(NSString* _Nullable)string
containsAlphaComponent:(BOOL* _Nullable)containsAlphaComponent;
+ (BOOL)HEXContainsAlphaComponent:(NSUInteger)hex;
+ (unsigned long)lengthOfHEXInteger:(NSUInteger)hex;
+ (NSColor*)colorFromRString:(NSString*)rString
gString:(NSString*)gString
bString:(NSString*)bString
aString:(NSString*)aString;
+ (NSColor*)colorFromPredefinedColorName:(NSString*)name;
+ (NSString*)colorNameFromPredefinedColor:(IJSVGPredefinedColor)color;
+ (NSColor*)changeAlphaOnColor:(NSColor*)color
+ (NSColor*)colorFromRString:(NSString* _Nullable)rString
gString:(NSString* _Nullable)gString
bString:(NSString* _Nullable)bString
aString:(NSString* _Nullable)aString;
+ (NSColor* _Nullable)colorFromPredefinedColorName:(NSString* _Nullable)name;
+ (NSString* _Nullable)colorNameFromPredefinedColor:(IJSVGPredefinedColor)color;
+ (NSColor* _Nullable)changeAlphaOnColor:(NSColor* _Nullable)color
to:(CGFloat)alphaValue;

@end

NS_ASSUME_NONNULL_END
Loading