Skip to content

Fix snapshot diff bug with resolution #198

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix snapshot diff bug with resolution #198

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
17 changes: 13 additions & 4 deletions src/iOSSnapshotTestCaseCore/Categories/UIImage+Diff.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,25 @@ - (UIImage *)fb_diffWithImage:(UIImage *)image
if (!image) {
return nil;
}
CGSize imageSize = CGSizeMake(MAX(self.size.width, image.size.width), MAX(self.size.height, image.size.height));

CGFloat scaleFactor = self.scale / (MAX(self.scale, image.scale));
CGAffineTransform scaleTransform = CGAffineTransformScale(CGAffineTransformIdentity, scaleFactor, scaleFactor);
CGSize scaledSize = CGSizeApplyAffineTransform(self.size, scaleTransform);

CGFloat imageScaleFactor = image.scale / (MAX(self.scale, image.scale));
CGAffineTransform imageScaleTransform = CGAffineTransformScale(CGAffineTransformIdentity, imageScaleFactor, imageScaleFactor);
CGSize imageScaledSize = CGSizeApplyAffineTransform(image.size, imageScaleTransform);

CGSize imageSize = CGSizeMake(MAX(scaledSize.width, imageScaledSize.width), MAX(scaledSize.height, imageScaledSize.height));
UIGraphicsBeginImageContextWithOptions(imageSize, YES, 0);
CGContextRef context = UIGraphicsGetCurrentContext();
[self drawInRect:CGRectMake(0, 0, self.size.width, self.size.height)];
[self drawInRect:CGRectMake(0, 0, scaledSize.width, scaledSize.height)];
CGContextSetAlpha(context, 0.5);
CGContextBeginTransparencyLayer(context, NULL);
[image drawInRect:CGRectMake(0, 0, image.size.width, image.size.height)];
[image drawInRect:CGRectMake(0, 0, imageScaledSize.width, imageScaledSize.height)];
CGContextSetBlendMode(context, kCGBlendModeDifference);
CGContextSetFillColorWithColor(context, [UIColor whiteColor].CGColor);
CGContextFillRect(context, CGRectMake(0, 0, self.size.width, self.size.height));
CGContextFillRect(context, CGRectMake(0, 0, scaledSize.width, scaledSize.height));
CGContextEndTransparencyLayer(context);
UIImage *returnImage = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();
Expand Down