Revision: 12765 http://sourceforge.net/p/skim-app/code/12765 Author: hofman Date: 2022-02-06 15:00:47 +0000 (Sun, 06 Feb 2022) Log Message: ----------- Implement customAttributes both as class and instance method for compatibility of different OS versions
Modified Paths: -------------- trunk/SkimTransitions/AccelerationTransition/SKTAccelerationTransition.m trunk/SkimTransitions/BlindsTransition/SKTBlindsTransition.m trunk/SkimTransitions/BlurTransition/SKTBlurTransition.m trunk/SkimTransitions/BoxInTransition/SKTBoxInTransition.m trunk/SkimTransitions/BoxOutTransition/SKTBoxOutTransition.m trunk/SkimTransitions/CoverTransition/SKTCoverTransition.m trunk/SkimTransitions/CubeTransition/SKTCubeTransition.m trunk/SkimTransitions/FlipTransition/SKTFlipTransition.m trunk/SkimTransitions/HoleTransition/SKTHoleTransition.m trunk/SkimTransitions/MeltdownTransition/SKTMeltdownTransition.m trunk/SkimTransitions/PageTurnTransform/SKTPageTurnTransition.m trunk/SkimTransitions/PinchTransition/SKTPinchTransition.m trunk/SkimTransitions/PixelateTransition/SKTPixelateTransition.m trunk/SkimTransitions/RadarTransition/SKTRadarTransition.m trunk/SkimTransitions/RadialSwipeTransition/SKTRadialSwipeTransition.m trunk/SkimTransitions/RevealTransition/SKTRevealTransition.m trunk/SkimTransitions/SinkTransition/SKTSinkTransition.m trunk/SkimTransitions/SlideTransition/SKTSlideTransition.m trunk/SkimTransitions/SplitInTransition/SKTSplitInTransition.m trunk/SkimTransitions/SplitOutTransition/SKTSplitOutTransition.m trunk/SkimTransitions/StripsTransition/SKTStripsTransition.m trunk/SkimTransitions/SwapTransition/SKTSwapTransition.m trunk/SkimTransitions/WarpFadeTransition/SKTWarpFadeTransition.m trunk/SkimTransitions/WarpSwitchTransition/SKTWarpSwitchTransition.m trunk/SkimTransitions/ZoomTransition/SKTZoomTransition.m Modified: trunk/SkimTransitions/AccelerationTransition/SKTAccelerationTransition.m =================================================================== --- trunk/SkimTransitions/AccelerationTransition/SKTAccelerationTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/AccelerationTransition/SKTAccelerationTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -17,7 +17,7 @@ @synthesize inputImage, inputTargetImage, inputCenter, inputExtent, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -44,6 +44,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/BlindsTransition/SKTBlindsTransition.m =================================================================== --- trunk/SkimTransitions/BlindsTransition/SKTBlindsTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/BlindsTransition/SKTBlindsTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -58,6 +58,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/BlurTransition/SKTBlurTransition.m =================================================================== --- trunk/SkimTransitions/BlurTransition/SKTBlurTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/BlurTransition/SKTBlurTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -16,7 +16,7 @@ @synthesize inputImage, inputTargetImage, inputAngle, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -43,6 +43,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/BoxInTransition/SKTBoxInTransition.m =================================================================== --- trunk/SkimTransitions/BoxInTransition/SKTBoxInTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/BoxInTransition/SKTBoxInTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -58,6 +58,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/BoxOutTransition/SKTBoxOutTransition.m =================================================================== --- trunk/SkimTransitions/BoxOutTransition/SKTBoxOutTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/BoxOutTransition/SKTBoxOutTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -58,6 +58,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/CoverTransition/SKTCoverTransition.m =================================================================== --- trunk/SkimTransitions/CoverTransition/SKTCoverTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/CoverTransition/SKTCoverTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -33,7 +33,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -65,6 +65,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(CIVector *)offset { if (sampler == 1) { R = CGRectOffset(R, -[offset X], -[offset Y]); Modified: trunk/SkimTransitions/CubeTransition/SKTCubeTransition.m =================================================================== --- trunk/SkimTransitions/CubeTransition/SKTCubeTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/CubeTransition/SKTCubeTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -19,7 +19,7 @@ @synthesize inputImage, inputTargetImage, inputExtent, inputAngle, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -51,6 +51,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // we actually draw a pentagon, because we want to collapse the side at t=0 and t=1 static CGFloat ANGLE = 0.0; static CGFloat TAN_1 = 0.0; Modified: trunk/SkimTransitions/FlipTransition/SKTFlipTransition.m =================================================================== --- trunk/SkimTransitions/FlipTransition/SKTFlipTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/FlipTransition/SKTFlipTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -19,7 +19,7 @@ @synthesize inputImage, inputTargetImage, inputExtent, inputAngle, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -51,6 +51,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + static inline NSInteger directionForAngles(CGFloat angle, CGFloat cornerAngle) { while (angle <= M_PI) angle += 2.0 * M_PI; Modified: trunk/SkimTransitions/HoleTransition/SKTHoleTransition.m =================================================================== --- trunk/SkimTransitions/HoleTransition/SKTHoleTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/HoleTransition/SKTHoleTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -58,6 +58,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(CIVector *)center { CGFloat x = [center X]; CGFloat y = [center Y]; Modified: trunk/SkimTransitions/MeltdownTransition/SKTMeltdownTransition.m =================================================================== --- trunk/SkimTransitions/MeltdownTransition/SKTMeltdownTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/MeltdownTransition/SKTMeltdownTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -33,7 +33,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -65,6 +65,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(NSArray *)array { CGFloat amount = [[array objectAtIndex:0] doubleValue]; CGFloat radius = [[array objectAtIndex:1] doubleValue]; Modified: trunk/SkimTransitions/PageTurnTransform/SKTPageTurnTransition.m =================================================================== --- trunk/SkimTransitions/PageTurnTransform/SKTPageTurnTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/PageTurnTransform/SKTPageTurnTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -19,7 +19,7 @@ @synthesize inputImage, inputTargetImage, inputExtent, inputAngle, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -51,6 +51,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + static inline NSInteger directionForAngles(CGFloat angle, CGFloat cornerAngle) { while (angle <= M_PI) angle += 2.0 * M_PI; Modified: trunk/SkimTransitions/PinchTransition/SKTPinchTransition.m =================================================================== --- trunk/SkimTransitions/PinchTransition/SKTPinchTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/PinchTransition/SKTPinchTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -14,7 +14,7 @@ @synthesize inputImage, inputTargetImage, inputCenter, inputExtent, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -41,6 +41,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/PixelateTransition/SKTPixelateTransition.m =================================================================== --- trunk/SkimTransitions/PixelateTransition/SKTPixelateTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/PixelateTransition/SKTPixelateTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -15,7 +15,7 @@ @synthesize inputImage, inputTargetImage, inputScale, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -41,6 +41,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/RadarTransition/SKTRadarTransition.m =================================================================== --- trunk/SkimTransitions/RadarTransition/SKTRadarTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/RadarTransition/SKTRadarTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -73,6 +73,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/RadialSwipeTransition/SKTRadialSwipeTransition.m =================================================================== --- trunk/SkimTransitions/RadialSwipeTransition/SKTRadialSwipeTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/RadialSwipeTransition/SKTRadialSwipeTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -19,7 +19,7 @@ @synthesize inputImage, inputTargetImage, inputExtent, inputWidth, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -56,6 +56,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/RevealTransition/SKTRevealTransition.m =================================================================== --- trunk/SkimTransitions/RevealTransition/SKTRevealTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/RevealTransition/SKTRevealTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -33,7 +33,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -65,6 +65,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(CIVector *)offset { if (sampler == 0) { R = CGRectOffset(R, [offset X], [offset Y]); Modified: trunk/SkimTransitions/SinkTransition/SKTSinkTransition.m =================================================================== --- trunk/SkimTransitions/SinkTransition/SKTSinkTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/SinkTransition/SKTSinkTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -58,6 +58,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(CISampler *)img { if (sampler == 0) { return [img extent]; Modified: trunk/SkimTransitions/SlideTransition/SKTSlideTransition.m =================================================================== --- trunk/SkimTransitions/SlideTransition/SKTSlideTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/SlideTransition/SKTSlideTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -33,7 +33,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -65,6 +65,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(NSArray *)userInfo { CIVector *offset = [userInfo objectAtIndex:sampler]; return CGRectOffset(R, [offset X], [offset Y]); Modified: trunk/SkimTransitions/SplitInTransition/SKTSplitInTransition.m =================================================================== --- trunk/SkimTransitions/SplitInTransition/SKTSplitInTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/SplitInTransition/SKTSplitInTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -58,6 +58,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/SplitOutTransition/SKTSplitOutTransition.m =================================================================== --- trunk/SkimTransitions/SplitOutTransition/SKTSplitOutTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/SplitOutTransition/SKTSplitOutTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -58,6 +58,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/StripsTransition/SKTStripsTransition.m =================================================================== --- trunk/SkimTransitions/StripsTransition/SKTStripsTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/StripsTransition/SKTStripsTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -31,7 +31,7 @@ return [super init]; } -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -63,6 +63,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(NSNumber *)offset { if (sampler == 0) { R = CGRectInset(R, -[offset doubleValue], 0.0); Modified: trunk/SkimTransitions/SwapTransition/SKTSwapTransition.m =================================================================== --- trunk/SkimTransitions/SwapTransition/SKTSwapTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/SwapTransition/SKTSwapTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -19,7 +19,7 @@ @synthesize inputImage, inputTargetImage, inputExtent, inputAngle, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -51,6 +51,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + static inline NSInteger directionForAngles(CGFloat angle, CGFloat cornerAngle) { while (angle <= M_PI) angle += 2.0 * M_PI; Modified: trunk/SkimTransitions/WarpFadeTransition/SKTWarpFadeTransition.m =================================================================== --- trunk/SkimTransitions/WarpFadeTransition/SKTWarpFadeTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/WarpFadeTransition/SKTWarpFadeTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -14,7 +14,7 @@ @synthesize inputImage, inputTargetImage, inputCenter, inputExtent, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -41,6 +41,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/WarpSwitchTransition/SKTWarpSwitchTransition.m =================================================================== --- trunk/SkimTransitions/WarpSwitchTransition/SKTWarpSwitchTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/WarpSwitchTransition/SKTWarpSwitchTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -14,7 +14,7 @@ @synthesize inputImage, inputTargetImage, inputCenter, inputExtent, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -41,6 +41,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { Modified: trunk/SkimTransitions/ZoomTransition/SKTZoomTransition.m =================================================================== --- trunk/SkimTransitions/ZoomTransition/SKTZoomTransition.m 2022-02-06 00:20:31 UTC (rev 12764) +++ trunk/SkimTransitions/ZoomTransition/SKTZoomTransition.m 2022-02-06 15:00:47 UTC (rev 12765) @@ -14,7 +14,7 @@ @synthesize inputImage, inputTargetImage, inputTime; -- (NSDictionary *)customAttributes ++ (NSDictionary *)customAttributes { return [NSDictionary dictionaryWithObjectsAndKeys: @@ -31,6 +31,11 @@ nil]; } +- (NSDictionary *)customAttributes +{ + return [[self class] customAttributes]; +} + // called when setting up for fragment program and also calls fragment program - (CIImage *)outputImage { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit