From 95852acd089b4640db273890258089f9ac4972d5 Mon Sep 17 00:00:00 2001 From: fredrossperry Date: Wed, 18 Feb 2015 18:33:19 -0800 Subject: iOS: conform to recent mupdf API changes. --- platform/ios/Classes/MuAnnotation.h | 4 +- platform/ios/Classes/MuAnnotation.m | 10 +-- platform/ios/Classes/MuDocRef.m | 10 +-- platform/ios/Classes/MuDocumentController.m | 38 ++++----- platform/ios/Classes/MuLibraryController.m | 4 +- platform/ios/Classes/MuPageViewNormal.m | 118 ++++++++++++++-------------- platform/ios/Classes/MuPageViewReflow.m | 42 +++++----- platform/ios/Classes/MuPrintPageRenderer.m | 12 +-- platform/ios/common.m | 8 +- 9 files changed, 123 insertions(+), 123 deletions(-) (limited to 'platform/ios') diff --git a/platform/ios/Classes/MuAnnotation.h b/platform/ios/Classes/MuAnnotation.h index d706e371..32192dc4 100644 --- a/platform/ios/Classes/MuAnnotation.h +++ b/platform/ios/Classes/MuAnnotation.h @@ -3,8 +3,8 @@ #import @interface MuAnnotation : NSObject --(id) initFromAnnot:(fz_annot *)annot forDoc:(fz_document *)doc; +-(id) initFromAnnot:(fz_annot *)annot forPage:(fz_page *)page; @property(readonly) int type; @property(readonly) CGRect rect; -+(MuAnnotation *) annotFromAnnot:(fz_annot *)annot forDoc:(fz_document *)doc; ++(MuAnnotation *) annotFromAnnot:(fz_annot *)annot forPage:(fz_page *)page; @end diff --git a/platform/ios/Classes/MuAnnotation.m b/platform/ios/Classes/MuAnnotation.m index e049bc83..89cc9d48 100644 --- a/platform/ios/Classes/MuAnnotation.m +++ b/platform/ios/Classes/MuAnnotation.m @@ -8,14 +8,14 @@ @synthesize type, rect; --(id) initFromAnnot:(fz_annot *)annot forDoc:(fz_document *)doc +-(id) initFromAnnot:(fz_annot *)annot forPage:(fz_page *)page; { self = [super init]; if (self) { fz_rect frect; - type = pdf_annot_type((pdf_annot *)annot); - fz_bound_annot(doc, annot, &frect); + type = pdf_annot_type(ctx, (pdf_annot *)annot); + fz_bound_annot(ctx, page, annot, &frect); rect.origin.x = frect.x0; rect.origin.y = frect.y0; rect.size.width = frect.x1 - frect.x0; @@ -24,8 +24,8 @@ return self; } -+(MuAnnotation *) annotFromAnnot:(fz_annot *)annot forDoc:(fz_document *)doc ++(MuAnnotation *) annotFromAnnot:(fz_annot *)annot forPage:(fz_page *)page; { - return [[[MuAnnotation alloc] initFromAnnot:annot forDoc:doc] autorelease]; + return [[[MuAnnotation alloc] initFromAnnot:annot forPage:page] autorelease]; } @end diff --git a/platform/ios/Classes/MuDocRef.m b/platform/ios/Classes/MuDocRef.m index 44337dc0..9a178484 100644 --- a/platform/ios/Classes/MuDocRef.m +++ b/platform/ios/Classes/MuDocRef.m @@ -23,9 +23,9 @@ } else { - pdf_document *idoc = pdf_specifics(doc); - if (idoc) pdf_enable_js(idoc); - interactive = (idoc != NULL) && (pdf_crypt_version(idoc) == 0); + pdf_document *idoc = pdf_specifics(ctx, doc); + if (idoc) pdf_enable_js(ctx, idoc); + interactive = (idoc != NULL) && (pdf_crypt_version(ctx, idoc) == 0); } } fz_catch(ctx) @@ -33,7 +33,7 @@ if (self) { if (doc != NULL) - fz_drop_document(doc); + fz_drop_document(ctx, doc); [self release]; self = nil; } @@ -46,7 +46,7 @@ { __block fz_document *block_doc = doc; dispatch_async(queue, ^{ - fz_drop_document(block_doc); + fz_drop_document(ctx, block_doc); }); [super dealloc]; } diff --git a/platform/ios/Classes/MuDocumentController.m b/platform/ios/Classes/MuDocumentController.m index 01d8221c..e4cca91d 100644 --- a/platform/ios/Classes/MuDocumentController.m +++ b/platform/ios/Classes/MuDocumentController.m @@ -105,7 +105,7 @@ static void saveDoc(char *current_path, fz_document *doc) if (!err) { - fz_write_document(doc, tmp, &opts); + fz_write_document(ctx, doc, tmp, &opts); written = 1; } } @@ -174,7 +174,7 @@ static void saveDoc(char *current_path, fz_document *doc) dispatch_sync(queue, ^{}); - fz_outline *root = fz_load_outline(doc); + fz_outline *root = fz_load_outline(ctx, doc); if (root) { NSMutableArray *titles = [[NSMutableArray alloc] init]; NSMutableArray *pages = [[NSMutableArray alloc] init]; @@ -227,7 +227,7 @@ static void saveDoc(char *current_path, fz_document *doc) [[NSUserDefaults standardUserDefaults] setObject: key forKey: @"OpenDocumentKey"]; current = [[NSUserDefaults standardUserDefaults] integerForKey: key]; - if (current < 0 || current >= fz_count_pages(doc)) + if (current < 0 || current >= fz_count_pages(ctx, doc)) current = 0; UIView *view = [[UIView alloc] initWithFrame: CGRectZero]; @@ -271,7 +271,7 @@ static void saveDoc(char *current_path, fz_document *doc) slider = [[UISlider alloc] initWithFrame: CGRectZero]; [slider setMinimumValue: 0]; - [slider setMaximumValue: fz_count_pages(doc) - 1]; + [slider setMaximumValue: fz_count_pages(ctx, doc) - 1]; [slider addTarget: self action: @selector(onSlide:) forControlEvents: UIControlEventValueChanged]; if ([[[UIDevice currentDevice] systemVersion] floatValue] < 7.0) @@ -361,7 +361,7 @@ static void saveDoc(char *current_path, fz_document *doc) if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0) [[[self navigationController] toolbar] addSubview:slider]; - [indicator setText: [NSString stringWithFormat: @" %d of %d ", current+1, fz_count_pages(doc)]]; + [indicator setText: [NSString stringWithFormat: @" %d of %d ", current+1, fz_count_pages(ctx, doc)]]; [[self navigationController] setToolbarHidden: NO animated: animated]; } @@ -375,7 +375,7 @@ static void saveDoc(char *current_path, fz_document *doc) height = size.height; [canvas setContentInset: UIEdgeInsetsZero]; - [canvas setContentSize: CGSizeMake(fz_count_pages(doc) * width, height)]; + [canvas setContentSize: CGSizeMake(fz_count_pages(ctx, doc) * width, height)]; [canvas setContentOffset: CGPointMake(current * width, 0)]; [sliderWrapper setWidth: SLIDER_W]; @@ -391,7 +391,7 @@ static void saveDoc(char *current_path, fz_document *doc) [[[self navigationController] toolbar] setNeedsLayout]; // force layout! // use max_width so we don't clamp the content offset too early during animation - [canvas setContentSize: CGSizeMake(fz_count_pages(doc) * max_width, height)]; + [canvas setContentSize: CGSizeMake(fz_count_pages(ctx, doc) * max_width, height)]; [canvas setContentOffset: CGPointMake(current * width, 0)]; for (UIView *view in [canvas subviews]) { @@ -582,8 +582,8 @@ static void saveDoc(char *current_path, fz_document *doc) - (void) onShare: (id)sender { - pdf_document *idoc = pdf_specifics(doc); - if (idoc && pdf_has_unsaved_changes(idoc)) + pdf_document *idoc = pdf_specifics(ctx, doc); + if (idoc && pdf_has_unsaved_changes(ctx, idoc)) { UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:AlertTitle message:ShareAlertMessage delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"Save and Share", nil]; [alertView show]; @@ -744,8 +744,8 @@ static void saveDoc(char *current_path, fz_document *doc) - (void) onBack: (id)sender { - pdf_document *idoc = pdf_specifics(doc); - if (idoc && pdf_has_unsaved_changes(idoc)) + pdf_document *idoc = pdf_specifics(ctx, doc); + if (idoc && pdf_has_unsaved_changes(ctx, idoc)) { UIAlertView *saveAlert = [[UIAlertView alloc] initWithTitle:AlertTitle message:CloseAlertMessage delegate:self @@ -827,7 +827,7 @@ static void saveDoc(char *current_path, fz_document *doc) cancelSearch = NO; dispatch_async(queue, ^{ - for (int i = start; i >= 0 && i < fz_count_pages(doc); i += dir) { + for (int i = start; i >= 0 && i < fz_count_pages(ctx, doc); i += dir) { int n = search_page(doc, i, needle, NULL); if (n) { dispatch_async(dispatch_get_main_queue(), ^{ @@ -898,7 +898,7 @@ static void saveDoc(char *current_path, fz_document *doc) { int number = [slider value]; if ([slider isTracking]) - [indicator setText: [NSString stringWithFormat: @" %d of %d ", number+1, fz_count_pages(doc)]]; + [indicator setText: [NSString stringWithFormat: @" %d of %d ", number+1, fz_count_pages(ctx, doc)]]; else [self gotoPage: number animated: NO]; } @@ -1032,7 +1032,7 @@ static void saveDoc(char *current_path, fz_document *doc) [[NSUserDefaults standardUserDefaults] setInteger: current forKey: key]; - [indicator setText: [NSString stringWithFormat: @" %d of %d ", current+1, fz_count_pages(doc)]]; + [indicator setText: [NSString stringWithFormat: @" %d of %d ", current+1, fz_count_pages(ctx, doc)]]; [slider setValue: current]; // swap the distant page views out @@ -1059,7 +1059,7 @@ static void saveDoc(char *current_path, fz_document *doc) - (void) createPageView: (int)number { - if (number < 0 || number >= fz_count_pages(doc)) + if (number < 0 || number >= fz_count_pages(ctx, doc)) return; int found = 0; for (UIView *view in [canvas subviews]) @@ -1082,8 +1082,8 @@ static void saveDoc(char *current_path, fz_document *doc) { if (number < 0) number = 0; - if (number >= fz_count_pages(doc)) - number = fz_count_pages(doc) - 1; + if (number >= fz_count_pages(ctx, doc)) + number = fz_count_pages(ctx, doc) - 1; if (current == number) return; if (animated) { @@ -1106,7 +1106,7 @@ static void saveDoc(char *current_path, fz_document *doc) [canvas setContentOffset: CGPointMake(number * width, 0)]; [slider setValue: number]; - [indicator setText: [NSString stringWithFormat: @" %d of %d ", number+1, fz_count_pages(doc)]]; + [indicator setText: [NSString stringWithFormat: @" %d of %d ", number+1, fz_count_pages(ctx, doc)]]; [UIView commitAnimations]; } else { @@ -1156,7 +1156,7 @@ static void saveDoc(char *current_path, fz_document *doc) // We need to set these here, because during the animation we may use a wider // size (the maximum of the landscape/portrait widths), to avoid clipping during // the rotation. - [canvas setContentSize: CGSizeMake(fz_count_pages(doc) * width, height)]; + [canvas setContentSize: CGSizeMake(fz_count_pages(ctx, doc) * width, height)]; [canvas setContentOffset: CGPointMake(current * width, 0)]; } diff --git a/platform/ios/Classes/MuLibraryController.m b/platform/ios/Classes/MuLibraryController.m index 529253e2..c57fc206 100644 --- a/platform/ios/Classes/MuLibraryController.m +++ b/platform/ios/Classes/MuLibraryController.m @@ -212,7 +212,7 @@ static NSString *moveOutOfInbox(NSString *docpath) return; } - if (fz_needs_password(doc->doc)) + if (fz_needs_password(ctx, doc->doc)) [self askForPassword: @"'%@' needs a password:"]; else [self onPasswordOkay]; @@ -236,7 +236,7 @@ static NSString *moveOutOfInbox(NSString *docpath) char *password = (char*) [[[alertView textFieldAtIndex: 0] text] UTF8String]; [alertView dismissWithClickedButtonIndex: buttonIndex animated: TRUE]; if (buttonIndex == 1) { - if (fz_authenticate_password(doc->doc, password)) + if (fz_authenticate_password(ctx, doc->doc, password)) [self onPasswordOkay]; else [self askForPassword: @"Wrong password for '%@'. Try again:"]; diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m index 5e115ea0..9c48ead8 100644 --- a/platform/ios/Classes/MuPageViewNormal.m +++ b/platform/ios/Classes/MuPageViewNormal.m @@ -21,18 +21,18 @@ static UIImage *newImageWithPixmap(fz_pixmap *pix, CGDataProviderRef cgdata) static NSArray *enumerateWidgetRects(fz_document *doc, fz_page *page) { - pdf_document *idoc = pdf_specifics(doc); + pdf_document *idoc = pdf_specifics(ctx, doc); pdf_widget *widget; NSMutableArray *arr = [NSMutableArray arrayWithCapacity:10]; if (!idoc) return nil; - for (widget = pdf_first_widget(idoc, (pdf_page *)page); widget; widget = pdf_next_widget(widget)) + for (widget = pdf_first_widget(ctx, idoc, (pdf_page *)page); widget; widget = pdf_next_widget(ctx, widget)) { fz_rect rect; - pdf_bound_widget(widget, &rect); + pdf_bound_widget(ctx, widget, &rect); [arr addObject:[NSValue valueWithCGRect:CGRectMake( rect.x0, rect.y0, @@ -48,8 +48,8 @@ static NSArray *enumerateAnnotations(fz_document *doc, fz_page *page) fz_annot *annot; NSMutableArray *arr = [NSMutableArray arrayWithCapacity:10]; - for (annot = fz_first_annot(doc, page); annot; annot = fz_next_annot(doc, annot)) - [arr addObject:[MuAnnotation annotFromAnnot:annot forDoc:doc]]; + for (annot = fz_first_annot(ctx, page); annot; annot = fz_next_annot(ctx, page, annot)) + [arr addObject:[MuAnnotation annotFromAnnot:annot forPage:page]]; return [arr retain]; } @@ -77,8 +77,8 @@ static NSArray *enumerateWords(fz_document *doc, fz_page *page) sheet = fz_new_text_sheet(ctx); text = fz_new_text_page(ctx); dev = fz_new_text_device(ctx, sheet, text); - fz_run_page(doc, page, dev, &fz_identity, NULL); - fz_drop_device(dev); + fz_run_page(ctx, page, dev, &fz_identity, NULL); + fz_drop_device(ctx, dev); dev = NULL; for (b = 0; b < text->len; b++) @@ -111,7 +111,7 @@ static NSArray *enumerateWords(fz_document *doc, fz_page *page) fz_rect bbox; CGRect rect; - fz_text_char_bbox(&bbox, span, c); + fz_text_char_bbox(ctx, &bbox, span, c); rect = CGRectMake(bbox.x0, bbox.y0, bbox.x1 - bbox.x0, bbox.y1 - bbox.y0); if (ch->c != ' ') @@ -140,7 +140,7 @@ static NSArray *enumerateWords(fz_document *doc, fz_page *page) { fz_drop_text_page(ctx, text); fz_drop_text_sheet(ctx, sheet); - fz_drop_device(dev); + fz_drop_device(ctx, dev); } fz_catch(ctx) { @@ -159,7 +159,7 @@ static void addMarkupAnnot(fz_document *doc, fz_page *page, int type, NSArray *r float line_height; float line_thickness; - idoc = pdf_specifics(doc); + idoc = pdf_specifics(ctx, doc); if (!idoc) return; @@ -218,9 +218,9 @@ static void addMarkupAnnot(fz_document *doc, fz_page *page, int type, NSArray *r quadpts[i*4+3].y = top; } - annot = pdf_create_annot(idoc, (pdf_page *)page, type); - pdf_set_markup_annot_quadpoints(idoc, annot, quadpts, rects.count*4); - pdf_set_markup_appearance(idoc, annot, color, alpha, line_thickness, line_height); + annot = pdf_create_annot(ctx, idoc, (pdf_page *)page, type); + pdf_set_markup_annot_quadpoints(ctx, idoc, annot, quadpts, rects.count*4); + pdf_set_markup_appearance(ctx, idoc, annot, color, alpha, line_thickness, line_height); } fz_always(ctx) { @@ -240,7 +240,7 @@ static void addInkAnnot(fz_document *doc, fz_page *page, NSArray *curves) int total; float color[3] = {1.0, 0.0, 0.0}; - idoc = pdf_specifics(doc); + idoc = pdf_specifics(ctx, doc); if (!idoc) return; @@ -280,8 +280,8 @@ static void addInkAnnot(fz_document *doc, fz_page *page, NSArray *curves) } } - annot = pdf_create_annot(idoc, (pdf_page *)page, FZ_ANNOT_INK); - pdf_set_ink_annot_list(idoc, annot, pts, counts, n, color, INK_THICKNESS); + annot = pdf_create_annot(ctx, idoc, (pdf_page *)page, FZ_ANNOT_INK); + pdf_set_ink_annot_list(ctx, idoc, annot, pts, counts, n, color, INK_THICKNESS); } fz_always(ctx) { @@ -296,19 +296,19 @@ static void addInkAnnot(fz_document *doc, fz_page *page, NSArray *curves) static void deleteAnnotation(fz_document *doc, fz_page *page, int index) { - pdf_document *idoc = pdf_specifics(doc); + pdf_document *idoc = pdf_specifics(ctx, doc); if (!idoc) return; fz_try(ctx) { int i; - fz_annot *annot = fz_first_annot(doc, page); + fz_annot *annot = fz_first_annot(ctx, page); for (i = 0; i < index && annot; i++) - annot = fz_next_annot(doc, annot); + annot = fz_next_annot(ctx, page, annot); if (annot) - pdf_delete_annot(idoc, (pdf_page *)page, (pdf_annot *)annot); + pdf_delete_annot(ctx, idoc, (pdf_page *)page, (pdf_annot *)annot); } fz_catch(ctx) { @@ -324,13 +324,13 @@ static int setFocussedWidgetText(fz_document *doc, fz_page *page, const char *te fz_try(ctx) { - pdf_document *idoc = pdf_specifics(doc); + pdf_document *idoc = pdf_specifics(ctx, doc); if (idoc) { - pdf_widget *focus = pdf_focused_widget(idoc); + pdf_widget *focus = pdf_focused_widget(ctx, idoc); if (focus) { - accepted = pdf_text_widget_set_text(idoc, focus, (char *)text); + accepted = pdf_text_widget_set_text(ctx, idoc, focus, (char *)text); } } } @@ -350,13 +350,13 @@ static int setFocussedWidgetChoice(fz_document *doc, fz_page *page, const char * fz_try(ctx) { - pdf_document *idoc = pdf_specifics(doc); + pdf_document *idoc = pdf_specifics(ctx, doc); if (idoc) { - pdf_widget *focus = pdf_focused_widget(idoc); + pdf_widget *focus = pdf_focused_widget(ctx, idoc); if (focus) { - pdf_choice_widget_set_value(idoc, focus, 1, (char **)&text); + pdf_choice_widget_set_value(ctx, idoc, focus, 1, (char **)&text); accepted = 1; } } @@ -379,11 +379,11 @@ static fz_display_list *create_page_list(fz_document *doc, fz_page *page) { list = fz_new_display_list(ctx); dev = fz_new_list_device(ctx, list); - fz_run_page_contents(doc, page, dev, &fz_identity, NULL); + fz_run_page_contents(ctx, page, dev, &fz_identity, NULL); } fz_always(ctx) { - fz_drop_device(dev); + fz_drop_device(ctx, dev); } fz_catch(ctx) { @@ -402,18 +402,18 @@ static fz_display_list *create_annot_list(fz_document *doc, fz_page *page) fz_try(ctx) { fz_annot *annot; - pdf_document *idoc = pdf_specifics(doc); + pdf_document *idoc = pdf_specifics(ctx, doc); if (idoc) - pdf_update_page(idoc, (pdf_page *)page); + pdf_update_page(ctx, idoc, (pdf_page *)page); list = fz_new_display_list(ctx); dev = fz_new_list_device(ctx, list); - for (annot = fz_first_annot(doc, page); annot; annot = fz_next_annot(doc, annot)) - fz_run_annot(doc, page, annot, dev, &fz_identity, NULL); + for (annot = fz_first_annot(ctx, page); annot; annot = fz_next_annot(ctx, page, annot)) + fz_run_annot(ctx, page, annot, dev, &fz_identity, NULL); } fz_always(ctx) { - fz_drop_device(dev); + fz_drop_device(ctx, dev); } fz_catch(ctx) { @@ -456,12 +456,12 @@ static fz_pixmap *renderPixmap(fz_document *doc, fz_display_list *page_list, fz_ fz_clear_pixmap_with_value(ctx, pix, 255); dev = fz_new_draw_device(ctx, pix); - fz_run_display_list(page_list, dev, &ctm, &rect, NULL); - fz_run_display_list(annot_list, dev, &ctm, &rect, NULL); + fz_run_display_list(ctx, page_list, dev, &ctm, &rect, NULL); + fz_run_display_list(ctx, annot_list, dev, &ctm, &rect, NULL); } fz_always(ctx) { - fz_drop_device(dev); + fz_drop_device(ctx, dev); } fz_catch(ctx) { @@ -497,18 +497,18 @@ static rect_list *updatePage(fz_document *doc, fz_page *page) fz_var(list); fz_try(ctx) { - pdf_document *idoc = pdf_specifics(doc); + pdf_document *idoc = pdf_specifics(ctx, doc); if (idoc) { fz_annot *annot; - pdf_update_page(idoc, (pdf_page *)page); - while ((annot = (fz_annot *)pdf_poll_changed_annot(idoc, (pdf_page *)page)) != NULL) + pdf_update_page(ctx, idoc, (pdf_page *)page); + while ((annot = (fz_annot *)pdf_poll_changed_annot(ctx, idoc, (pdf_page *)page)) != NULL) { rect_list *node = fz_malloc_struct(ctx, rect_list); - fz_bound_annot(doc, annot, &node->rect); + fz_bound_annot(ctx, page, annot, &node->rect); node->next = list; list = node; } @@ -561,9 +561,9 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa { fz_clear_pixmap_rect_with_value(ctx, pixmap, 255, &abox); dev = fz_new_draw_device_with_bbox(ctx, pixmap, &abox); - fz_run_display_list(page_list, dev, &ctm, &arect, NULL); - fz_run_display_list(annot_list, dev, &ctm, &arect, NULL); - fz_drop_device(dev); + fz_run_display_list(ctx, page_list, dev, &ctm, &arect, NULL); + fz_run_display_list(ctx, annot_list, dev, &ctm, &arect, NULL); + fz_drop_device(ctx, dev); dev = NULL; } rlist = rlist->next; @@ -571,7 +571,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa } fz_always(ctx) { - fz_drop_device(dev); + fz_drop_device(ctx, dev); } fz_catch(ctx) { @@ -618,8 +618,8 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa fz_try(ctx) { fz_rect bounds; - page = fz_load_page(doc, number); - fz_bound_page(doc, page, &bounds); + page = fz_load_page(ctx, doc, number); + fz_bound_page(ctx, page, &bounds); pageSize.width = bounds.x1 - bounds.x0; pageSize.height = bounds.y1 - bounds.y0; } @@ -687,7 +687,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa __block fz_display_list *block_page_list = page_list; __block fz_display_list *block_annot_list = annot_list; __block fz_page *block_page = page; - __block fz_document *block_doc = docRef->doc; +// __block fz_document *block_doc = docRef->doc; __block CGDataProviderRef block_tileData = tileData; __block CGDataProviderRef block_imageData = imageData; dispatch_async(queue, ^{ @@ -696,7 +696,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa if (block_annot_list) fz_drop_display_list(ctx, block_annot_list); if (block_page) - fz_free_page(block_doc, block_page); + fz_drop_page(ctx, block_page); block_page = nil; CGDataProviderRelease(block_tileData); CGDataProviderRelease(block_imageData); @@ -725,7 +725,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa if (!linkView) { dispatch_async(queue, ^{ [self ensurePageLoaded]; - fz_link *links = fz_load_links(doc, page); + fz_link *links = fz_load_links(ctx, page); dispatch_async(dispatch_get_main_queue(), ^{ linkView = [[MuHitView alloc] initWithLinks: links forDocument: doc]; dispatch_async(queue, ^{ @@ -904,7 +904,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa - (void) loadAnnotations { - if (number < 0 || number >= fz_count_pages(doc)) + if (number < 0 || number >= fz_count_pages(ctx, doc)) return; NSArray *annots = enumerateAnnotations(doc, page); @@ -916,7 +916,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa - (void) loadPage { - if (number < 0 || number >= fz_count_pages(doc)) + if (number < 0 || number >= fz_count_pages(ctx, doc)) return; dispatch_async(queue, ^{ if (!cancel) { @@ -1261,7 +1261,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa - (int) passTapToPage:(CGPoint)pt { - pdf_document *idoc = pdf_specifics(doc); + pdf_document *idoc = pdf_specifics(ctx, doc); pdf_ui_event event; int changed = 0; pdf_widget *focus; @@ -1279,18 +1279,18 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa event.event.pointer.pt.x = pt.x; event.event.pointer.pt.y = pt.y; event.event.pointer.ptype = PDF_POINTER_DOWN; - changed = pdf_pass_event(idoc, (pdf_page *)page, &event); + changed = pdf_pass_event(ctx, idoc, (pdf_page *)page, &event); event.event.pointer.ptype = PDF_POINTER_UP; - changed |= pdf_pass_event(idoc, (pdf_page *)page, &event); + changed |= pdf_pass_event(ctx, idoc, (pdf_page *)page, &event); - focus = pdf_focused_widget(idoc); + focus = pdf_focused_widget(ctx, idoc); if (focus) { - switch (pdf_widget_get_type(focus)) + switch (pdf_widget_get_type(ctx, focus)) { case PDF_WIDGET_TYPE_TEXT: { - text = pdf_text_widget_text(idoc, focus); + text = pdf_text_widget_text(ctx, idoc, focus); NSString *stext = [[NSString stringWithUTF8String:text?text:""] retain]; dispatch_async(dispatch_get_main_queue(), ^{ [self invokeTextDialog:stext]; @@ -1302,9 +1302,9 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa case PDF_WIDGET_TYPE_LISTBOX: case PDF_WIDGET_TYPE_COMBOBOX: { - int nopts = pdf_choice_widget_options(idoc, focus, NULL); + int nopts = pdf_choice_widget_options(ctx, idoc, focus, NULL); opts = fz_malloc(ctx, nopts * sizeof(*opts)); - (void)pdf_choice_widget_options(idoc, focus, opts); + (void)pdf_choice_widget_options(ctx, idoc, focus, opts); NSMutableArray *arr = [[NSMutableArray arrayWithCapacity:nopts] retain]; for (int i = 0; i < nopts; i++) { diff --git a/platform/ios/Classes/MuPageViewReflow.m b/platform/ios/Classes/MuPageViewReflow.m index a9716df5..44f4f4ae 100644 --- a/platform/ios/Classes/MuPageViewReflow.m +++ b/platform/ios/Classes/MuPageViewReflow.m @@ -25,32 +25,32 @@ NSString *textAsHtml(fz_document *doc, int pageNum) sheet = fz_new_text_sheet(ctx); text = fz_new_text_page(ctx); dev = fz_new_text_device(ctx, sheet, text); - page = fz_load_page(doc, pageNum); - fz_run_page(doc, page, dev, &ctm, NULL); - fz_drop_device(dev); + page = fz_load_page(ctx, doc, pageNum); + fz_run_page(ctx, page, dev, &ctm, NULL); + fz_drop_device(ctx, dev); dev = NULL; fz_analyze_text(ctx, sheet, text); buf = fz_new_buffer(ctx, 256); out = fz_new_output_with_buffer(ctx, buf); - fz_printf(out, "\n"); - fz_printf(out, "\n"); - fz_printf(out, "
"); + fz_printf(ctx, out, "\n"); + fz_printf(ctx, out, "\n"); + fz_printf(ctx, out, "
"); fz_print_text_page_html(ctx, out, text); - fz_printf(out, "
\n"); - fz_printf(out, "\n\n"); - fz_close_output(out); + fz_printf(ctx, out, "\n\n"); + out = NULL; str = [[[NSString alloc] initWithBytes:buf->data length:buf->len encoding:NSUTF8StringEncoding] autorelease]; @@ -59,10 +59,10 @@ NSString *textAsHtml(fz_document *doc, int pageNum) { fz_drop_text_page(ctx, text); fz_drop_text_sheet(ctx, sheet); - fz_drop_device(dev); - fz_close_output(out); + fz_drop_device(ctx, dev); + fz_drop_output(ctx, out); fz_drop_buffer(ctx, buf); - fz_free_page(doc, page); + fz_drop_page(ctx, page); } fz_catch(ctx) { diff --git a/platform/ios/Classes/MuPrintPageRenderer.m b/platform/ios/Classes/MuPrintPageRenderer.m index 9408a6e3..19b7e62f 100644 --- a/platform/ios/Classes/MuPrintPageRenderer.m +++ b/platform/ios/Classes/MuPrintPageRenderer.m @@ -30,7 +30,7 @@ const int MaxStripPixels = 1024*1024; dispatch_sync(queue, ^{ fz_try(ctx) { - npages = fz_count_pages(docRef->doc); + npages = fz_count_pages(ctx, docRef->doc); } fz_catch(ctx); }); @@ -44,7 +44,7 @@ static fz_page *getPage(fz_document *doc, int pageIndex) dispatch_sync(queue, ^{ fz_try(ctx) { - page = fz_load_page(doc, pageIndex); + page = fz_load_page(ctx, doc, pageIndex); } fz_catch(ctx) { @@ -63,7 +63,7 @@ static CGSize getPageSize(fz_document *doc, fz_page *page) fz_try(ctx) { fz_rect bounds; - fz_bound_page(doc, page, &bounds); + fz_bound_page(ctx, page, &bounds); size.width = bounds.x1 - bounds.x0; size.height = bounds.y1 - bounds.y0; } @@ -97,7 +97,7 @@ static fz_pixmap *createPixMap(CGSize size) static void freePage(fz_document *doc, fz_page *page) { dispatch_sync(queue, ^{ - fz_free_page(doc, page); + fz_drop_page(ctx, page); }); } @@ -110,11 +110,11 @@ static void renderPage(fz_document *doc, fz_page *page, fz_pixmap *pix, fz_matri { dev = fz_new_draw_device(ctx, pix); fz_clear_pixmap_with_value(ctx, pix, 0xFF); - fz_run_page(doc, page, dev, ctm, NULL); + fz_run_page(ctx, page, dev, ctm, NULL); } fz_always(ctx) { - fz_drop_device(dev); + fz_drop_device(ctx, dev); } fz_catch(ctx) { diff --git a/platform/ios/common.m b/platform/ios/common.m index 6ca320e9..6f62329a 100644 --- a/platform/ios/common.m +++ b/platform/ios/common.m @@ -19,19 +19,19 @@ static fz_rect hit_bbox[500]; int search_page(fz_document *doc, int number, char *needle, fz_cookie *cookie) { - fz_page *page = fz_load_page(doc, number); + fz_page *page = fz_load_page(ctx, doc, number); fz_text_sheet *sheet = fz_new_text_sheet(ctx); fz_text_page *text = fz_new_text_page(ctx); fz_device *dev = fz_new_text_device(ctx, sheet, text); - fz_run_page(doc, page, dev, &fz_identity, cookie); - fz_drop_device(dev); + fz_run_page(ctx, page, dev, &fz_identity, cookie); + fz_drop_device(ctx, dev); hit_count = fz_search_text_page(ctx, text, needle, hit_bbox, nelem(hit_bbox)); fz_drop_text_page(ctx, text); fz_drop_text_sheet(ctx, sheet); - fz_free_page(doc, page); + fz_drop_page(ctx, page); return hit_count; } -- cgit v1.2.3