Revision: 14497
          http://sourceforge.net/p/skim-app/code/14497
Author:   hofman
Date:     2024-09-30 16:07:16 +0000 (Mon, 30 Sep 2024)
Log Message:
-----------
Don't bother scaling when using a scale of 1

Modified Paths:
--------------
    trunk/SKTransitionController.m

Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m      2024-09-30 15:28:29 UTC (rev 14496)
+++ trunk/SKTransitionController.m      2024-09-30 16:07:16 UTC (rev 14497)
@@ -281,6 +281,7 @@
 // rect and bounds are in pixels
 - (CIFilter *)transitionFilterWithName:(NSString *)name rect:(CGRect)rect 
extent:(CGRect)extent scale:(CGFloat)scale forward:(BOOL)forward 
initialImage:(CIImage *)initialImage finalImage:(CIImage *)finalImage {
     CIFilter *transitionFilter = [CIFilter filterWithName:name];
+    BOOL scaled = fabs(scale - 1.0) > 0.0;
     
     [transitionFilter setDefaults];
     
@@ -312,15 +313,15 @@
                 value = [NSNumber numberWithBool:forward == NO];
             else if ([[NSSet setWithObjects:@"inputForward", @"inputLeft", 
nil] containsObject:key])
                 value = [NSNumber numberWithBool:forward];
-        } else if ([type isEqualToString:kCIAttributeTypeDistance]) {
+        } else if (scaled && [type isEqualToString:kCIAttributeTypeDistance]) {
             if ([transitionFilter valueForKey:key] == nil) continue;
             CGFloat width = [[transitionFilter valueForKey:key] doubleValue];
             value = [NSNumber numberWithDouble:scale * width];
-        } else if ([type isEqualToString:kCIAttributeTypePosition]) {
+        } else if (scaled && [type isEqualToString:kCIAttributeTypePosition]) {
             if ([transitionFilter valueForKey:key] == nil) continue;
             CGPoint point = [[transitionFilter valueForKey:key] CGPointValue];
             value = [CIVector vectorWithCGPoint:CGPointMake(scale * point.x, 
scale * point.y)];
-        } else if ([type isEqualToString:kCIAttributeTypeRectangle]) {
+        } else if (scaled && [type isEqualToString:kCIAttributeTypeRectangle]) 
{
             if ([transitionFilter valueForKey:key] == nil) continue;
             CGRect r = [[transitionFilter valueForKey:key] CGRectValue];
             value = [CIVector vectorWithCGRect:CGRectMake(scale * 
CGRectGetMinX(r), scale * CGRectGetMinY(r), scale * CGRectGetWidth(r), scale * 
CGRectGetHeight(r))];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to