diff --git a/EXPhotoViewer/EXPhotoViewer.h b/EXPhotoViewer/EXPhotoViewer.h index 1e5a01a..a5f3230 100644 --- a/EXPhotoViewer/EXPhotoViewer.h +++ b/EXPhotoViewer/EXPhotoViewer.h @@ -11,5 +11,6 @@ @interface EXPhotoViewer : UIViewController + (void) showImageFrom:(UIImageView*) image; ++ (void) showImageFrom:(UIImageView*) image originalImage:(UIImage*)originalImage; @end diff --git a/EXPhotoViewer/EXPhotoViewer.m b/EXPhotoViewer/EXPhotoViewer.m index cdf6f2c..a040298 100644 --- a/EXPhotoViewer/EXPhotoViewer.m +++ b/EXPhotoViewer/EXPhotoViewer.m @@ -27,7 +27,14 @@ @implementation EXPhotoViewer + (void) showImageFrom:(UIImageView*) imageView { if (imageView.image) { EXPhotoViewer* viewer = [EXPhotoViewer new]; - [viewer showImageFrom:imageView]; + [viewer showImageFrom:imageView originalImage:imageView.image]; + } +} + ++ (void) showImageFrom:(UIImageView*) imageView originalImage:(UIImage*)originalImage { + if (imageView.image) { + EXPhotoViewer* viewer = [EXPhotoViewer new]; + [viewer showImageFrom:imageView originalImage:originalImage]; } } @@ -59,7 +66,7 @@ -(UIViewController *) rootViewController{ return controller; } -- (void) showImageFrom:(UIImageView*) imageView { +- (void) showImageFrom:(UIImageView*) imageView originalImage:(UIImage*)originalImage{ UIViewController * controller = [self rootViewController]; self.tempViewContainer = [[UIView alloc] initWithFrame:controller.view.bounds]; @@ -79,7 +86,8 @@ - (void) showImageFrom:(UIImageView*) imageView { [controller.view addSubview:self.view]; - self.theImageView.image = imageView.image; + //self.theImageView.image = imageView.image; + self.theImageView.image = originalImage; self.originalImageRect = [imageView convertRect:imageView.bounds toView:self.view]; self.theImageView.frame = self.originalImageRect;