summaryrefslogtreecommitdiff
path: root/platform/ios/Classes/MuPageViewNormal.m
diff options
context:
space:
mode:
Diffstat (limited to 'platform/ios/Classes/MuPageViewNormal.m')
-rw-r--r--platform/ios/Classes/MuPageViewNormal.m80
1 files changed, 40 insertions, 40 deletions
diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m
index d40ef0e1..e60f006d 100644
--- a/platform/ios/Classes/MuPageViewNormal.m
+++ b/platform/ios/Classes/MuPageViewNormal.m
@@ -131,7 +131,7 @@ static NSArray *enumerateWords(fz_document *doc, fz_page *page)
if (word.string.length > 0)
[wds addObject:word];
- if ([wds count] > 0)
+ if (wds.count > 0)
[lns addObject:wds];
}
}
@@ -203,7 +203,7 @@ static void addMarkupAnnot(fz_document *doc, fz_page *page, int type, NSArray *r
quadpts = fz_malloc_array(ctx, (int)rects.count * 4, sizeof(fz_point));
for (i = 0; i < rects.count; i++)
{
- CGRect rect = [[rects objectAtIndex:i] CGRectValue];
+ CGRect rect = [rects[i] CGRectValue];
float top = rect.origin.y;
float bot = top + rect.size.height;
float left = rect.origin.x;
@@ -258,7 +258,7 @@ static void addInkAnnot(fz_document *doc, fz_page *page, NSArray *curves)
for (i = 0; i < n; i++)
{
- NSArray *curve = [curves objectAtIndex:i];
+ NSArray *curve = curves[i];
counts[i] = (int)curve.count;
total += (int)curve.count;
}
@@ -268,12 +268,12 @@ static void addInkAnnot(fz_document *doc, fz_page *page, NSArray *curves)
k = 0;
for (i = 0; i < n; i++)
{
- NSArray *curve = [curves objectAtIndex:i];
+ NSArray *curve = curves[i];
int count = counts[i];
for (j = 0; j < count; j++)
{
- CGPoint pt = [[curve objectAtIndex:j] CGPointValue];
+ CGPoint pt = [curve[j] CGPointValue];
pts[k].x = pt.x;
pts[k].y = pt.y;
k++;
@@ -655,8 +655,8 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
[self setShowsVerticalScrollIndicator: NO];
[self setShowsHorizontalScrollIndicator: NO];
- [self setDecelerationRate: UIScrollViewDecelerationRateFast];
- [self setDelegate: self];
+ self.decelerationRate = UIScrollViewDecelerationRateFast;
+ self.delegate = self;
// zoomDidFinish/Begin events fire before bounce animation completes,
// making a mess when we rearrange views during the animation.
@@ -731,7 +731,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
fz_drop_link(ctx, links);
});
if (imageView) {
- [linkView setFrame: [imageView frame]];
+ linkView.frame = imageView.frame;
[linkView setPageSize: pageSize];
}
[self addSubview: linkView];
@@ -756,7 +756,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
}
hitView = [[MuHitView alloc] initWithSearchResults: count forDocument: doc];
if (imageView) {
- [hitView setFrame: [imageView frame]];
+ hitView.frame = imageView.frame;
[hitView setPageSize: pageSize];
}
[self addSubview: hitView];
@@ -780,7 +780,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
textSelectView = [[MuTextSelectView alloc] initWithWords:words pageSize:pageSize];
[words release];
if (imageView)
- [textSelectView setFrame:[imageView frame]];
+ textSelectView.frame = imageView.frame;
[self addSubview:textSelectView];
});
});
@@ -790,7 +790,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
{
inkView = [[MuInkView alloc] initWithPageSize:pageSize];
if (imageView)
- [inkView setFrame:[imageView frame]];
+ inkView.frame = imageView.frame;
[self addSubview:inkView];
}
@@ -810,7 +810,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
-(void) saveSelectionAsMarkup:(int)type
{
- NSArray *rects = [textSelectView selectionRects];
+ NSArray *rects = textSelectView.selectionRects;
if (rects.count == 0)
return;
@@ -851,7 +851,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
selectedAnnotationIndex = i;
[annotSelectView removeFromSuperview];
[annotSelectView release];
- annotSelectView = [[MuAnnotSelectView alloc] initWithAnnot:[annotations objectAtIndex:i] pageSize:pageSize];
+ annotSelectView = [[MuAnnotSelectView alloc] initWithAnnot:annotations[i] pageSize:pageSize];
[self addSubview:annotSelectView];
}
@@ -890,8 +890,8 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
tileView = nil;
}
- [self setMinimumZoomScale: 1];
- [self setMaximumZoomScale: 5];
+ self.minimumZoomScale = 1;
+ self.maximumZoomScale = 5;
[self setZoomScale: 1 animated: animated];
}
@@ -963,7 +963,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
if (annotSelectView)
[self bringSubviewToFront:annotSelectView];
} else {
- [imageView setImage: image];
+ imageView.image = image;
}
[self resizeImage];
@@ -975,10 +975,10 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
CGSize imageSize = imageView.image.size;
CGSize scale = fitPageToScreen(imageSize, self.bounds.size);
if (fabs(scale.width - 1) > 0.1) {
- CGRect frame = [imageView frame];
+ CGRect frame = imageView.frame;
frame.size.width = imageSize.width * scale.width;
frame.size.height = imageSize.height * scale.height;
- [imageView setFrame: frame];
+ imageView.frame = frame;
printf("resized view; queuing up a reload (%d)\n", number);
dispatch_async(queue, ^{
@@ -992,7 +992,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
[imageView sizeToFit];
}
- [self setContentSize: imageView.frame.size];
+ self.contentSize = imageView.frame.size;
[self layoutIfNeeded];
}
@@ -1035,22 +1035,22 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
if (imageView)
{
- CGRect frm = [imageView frame];
+ CGRect frm = imageView.frame;
if (hitView)
- [hitView setFrame: frm];
+ hitView.frame = frm;
if (linkView)
- [linkView setFrame:frm];
+ linkView.frame = frm;
if (textSelectView)
- [textSelectView setFrame:frm];
+ textSelectView.frame = frm;
if (inkView)
- [inkView setFrame:frm];
+ inkView.frame = frm;
if (annotSelectView)
- [annotSelectView setFrame:frm];
+ annotSelectView.frame = frm;
}
}
@@ -1107,7 +1107,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
}
tileView = [[UIImageView alloc] initWithFrame: frame];
- [tileView setImage: image];
+ tileView.image = image;
[self addSubview: tileView];
if (hitView)
[self bringSubviewToFront: hitView];
@@ -1157,19 +1157,19 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
{
if (imageView)
{
- CGRect frm = [imageView frame];
+ CGRect frm = imageView.frame;
if (hitView)
- [hitView setFrame: frm];
+ hitView.frame = frm;
if (textSelectView)
- [textSelectView setFrame:frm];
+ textSelectView.frame = frm;
if (inkView)
- [inkView setFrame:frm];
+ inkView.frame = frm;
if (annotSelectView)
- [annotSelectView setFrame:frm];
+ annotSelectView.frame = frm;
}
}
@@ -1187,7 +1187,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
dispatch_async(dispatch_get_main_queue(), ^{
BOOL isValid = CGRectEqualToRect(tframe, tileFrame) && tscale == tileScale;
if (isValid)
- [tileView setImage:timage];
+ tileView.image = timage;
[timage release];
});
}
@@ -1197,7 +1197,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
drop_list(rlist);
UIImage *image = newImageWithPixmap(image_pix, imageData);
dispatch_async(dispatch_get_main_queue(), ^{
- [imageView setImage:image];
+ imageView.image = image;
[image release];
});
}
@@ -1219,7 +1219,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
{
[dialogCreator invokeTextDialog:text okayAction:^(NSString *newText) {
dispatch_async(queue, ^{
- BOOL accepted = setFocussedWidgetText(doc, page, [newText UTF8String]);
+ BOOL accepted = setFocussedWidgetText(doc, page, newText.UTF8String);
if (accepted)
{
dispatch_async(dispatch_get_main_queue(), ^{
@@ -1240,7 +1240,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
{
[dialogCreator invokeChoiceDialog:choices okayAction:^(NSArray *selection) {
dispatch_async(queue, ^{
- BOOL accepted = setFocussedWidgetChoice(doc, page, [[selection objectAtIndex:0] UTF8String]);
+ BOOL accepted = setFocussedWidgetChoice(doc, page, [selection[0] UTF8String]);
if (accepted)
{
dispatch_async(dispatch_get_main_queue(), ^{
@@ -1290,7 +1290,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
case PDF_WIDGET_TYPE_TEXT:
{
text = pdf_text_widget_text(ctx, idoc, focus);
- NSString *stext = [[NSString stringWithUTF8String:text?text:""] retain];
+ NSString *stext = [@(text?text:"") retain];
dispatch_async(dispatch_get_main_queue(), ^{
[self invokeTextDialog:stext];
[stext release];
@@ -1307,10 +1307,10 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
NSMutableArray *arr = [[NSMutableArray arrayWithCapacity:nopts] retain];
for (int i = 0; i < nopts; i++)
{
- NSString *utf8 = [NSString stringWithUTF8String:opts[i]];
+ NSString *utf8 = @(opts[i]);
// FIXME: temporary patch to handle the library not converting to utf8
if (utf8 == nil)
- utf8 = [NSString stringWithCString:opts[i] encoding:NSASCIIStringEncoding];
+ utf8 = @(opts[i]);
if (utf8 != nil)
[arr addObject:utf8];
}
@@ -1352,7 +1352,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
for (i = 0; i < annotations.count; i++)
{
- MuAnnotation *annot = [annotations objectAtIndex:i];
+ MuAnnotation *annot = annotations[i];
if (annot.type != FZ_ANNOT_WIDGET && CGRectContainsPoint(annot.rect, ipt))
{
[self selectAnnotation:i];
@@ -1364,7 +1364,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
for (i = 0; i < widgetRects.count; i++)
{
- CGRect r = [[widgetRects objectAtIndex:i] CGRectValue];
+ CGRect r = [widgetRects[i] CGRectValue];
if (CGRectContainsPoint(r, ipt))
{
dispatch_async(queue, ^{
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 14:45:17 +0000