Skip to content
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

iOS bug fix: scaling sometimes resulted in "white lines" on the right and/or bottom of the output image #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

iOS bug fix: scaling sometimes resulted in "white lines" on the right and/or bottom of the output image #51

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
16 changes: 8 additions & 8 deletions src/ios/SOSPicker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ - (void) getPictures:(CDVInvokedUrlCommand *)command {

// Create the an album controller and image picker
ELCAlbumPickerController *albumController = [[ELCAlbumPickerController alloc] init];

if (maximumImagesCount == 1) {
albumController.immediateReturn = true;
albumController.singleSelection = true;
} else {
albumController.immediateReturn = false;
albumController.singleSelection = false;
}

ELCImagePickerController *imagePicker = [[ELCImagePickerController alloc] initWithRootViewController:albumController];
imagePicker.maximumImagesCount = maximumImagesCount;
imagePicker.returnsOriginalImage = 1;
Expand Down Expand Up @@ -69,11 +69,11 @@ - (void)elcImagePickerController:(ELCImagePickerController *)picker didFinishPic
do {
filePath = [NSString stringWithFormat:@"%@/%@%03d.%@", docsPath, CDV_PHOTO_PREFIX, i++, @"jpg"];
} while ([fileMgr fileExistsAtPath:filePath]);

@autoreleasepool {
ALAssetRepresentation *assetRep = [asset defaultRepresentation];
CGImageRef imgRef = NULL;

//defaultRepresentation returns image as it appears in photo picker, rotated and sized,
//so use UIImageOrientationUp when creating our image below.
if (picker.returnsOriginalImage) {
Expand All @@ -82,15 +82,15 @@ - (void)elcImagePickerController:(ELCImagePickerController *)picker didFinishPic
} else {
imgRef = [assetRep fullScreenImage];
}

UIImage* image = [UIImage imageWithCGImage:imgRef scale:1.0f orientation:orientation];
if (self.width == 0 && self.height == 0) {
data = UIImageJPEGRepresentation(image, self.quality/100.0f);
} else {
UIImage* scaledImage = [self imageByScalingNotCroppingForSize:image toSize:targetSize];
data = UIImageJPEGRepresentation(scaledImage, self.quality/100.0f);
}

if (![data writeToFile:filePath options:NSAtomicWrite error:&err]) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsString:[err localizedDescription]];
break;
Expand All @@ -100,7 +100,7 @@ - (void)elcImagePickerController:(ELCImagePickerController *)picker didFinishPic
}

}

if (nil == result) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:resultStrings];
}
Expand Down Expand Up @@ -143,7 +143,7 @@ - (UIImage*)imageByScalingNotCroppingForSize:(UIImage*)anImage toSize:(CGSize)fr
} else {
scaleFactor = widthFactor; // scale to fit width
}
scaledSize = CGSizeMake(width * scaleFactor, height * scaleFactor);
scaledSize = CGSizeMake(floor(width * scaleFactor), floor(height * scaleFactor));
}

UIGraphicsBeginImageContext(scaledSize); // this will resize
Expand Down