diff options
Diffstat (limited to 'platform/ios')
-rw-r--r-- | platform/ios/Classes/MuDocRef.m | 4 | ||||
-rw-r--r-- | platform/ios/Classes/MuDocumentController.m | 2 | ||||
-rw-r--r-- | platform/ios/Classes/MuPageViewNormal.m | 18 | ||||
-rw-r--r-- | platform/ios/Classes/MuPageViewReflow.m | 8 | ||||
-rw-r--r-- | platform/ios/Classes/MuPrintPageRenderer.m | 2 | ||||
-rw-r--r-- | platform/ios/common.m | 6 |
6 files changed, 20 insertions, 20 deletions
diff --git a/platform/ios/Classes/MuDocRef.m b/platform/ios/Classes/MuDocRef.m index bd2b87c0..44337dc0 100644 --- a/platform/ios/Classes/MuDocRef.m +++ b/platform/ios/Classes/MuDocRef.m @@ -33,7 +33,7 @@ if (self) { if (doc != NULL) - fz_close_document(doc); + fz_drop_document(doc); [self release]; self = nil; } @@ -46,7 +46,7 @@ { __block fz_document *block_doc = doc; dispatch_async(queue, ^{ - fz_close_document(block_doc); + fz_drop_document(block_doc); }); [super dealloc]; } diff --git a/platform/ios/Classes/MuDocumentController.m b/platform/ios/Classes/MuDocumentController.m index 3c0391a8..01d8221c 100644 --- a/platform/ios/Classes/MuDocumentController.m +++ b/platform/ios/Classes/MuDocumentController.m @@ -183,7 +183,7 @@ static void saveDoc(char *current_path, fz_document *doc) outline = [[MuOutlineController alloc] initWithTarget: self titles: titles pages: pages]; [titles release]; [pages release]; - fz_free_outline(ctx, root); + fz_drop_outline(ctx, root); } return self; diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m index 3c461a00..5e115ea0 100644 --- a/platform/ios/Classes/MuPageViewNormal.m +++ b/platform/ios/Classes/MuPageViewNormal.m @@ -78,7 +78,7 @@ static NSArray *enumerateWords(fz_document *doc, fz_page *page) text = fz_new_text_page(ctx); dev = fz_new_text_device(ctx, sheet, text); fz_run_page(doc, page, dev, &fz_identity, NULL); - fz_free_device(dev); + fz_drop_device(dev); dev = NULL; for (b = 0; b < text->len; b++) @@ -138,9 +138,9 @@ static NSArray *enumerateWords(fz_document *doc, fz_page *page) } fz_always(ctx); { - fz_free_text_page(ctx, text); - fz_free_text_sheet(ctx, sheet); - fz_free_device(dev); + fz_drop_text_page(ctx, text); + fz_drop_text_sheet(ctx, sheet); + fz_drop_device(dev); } fz_catch(ctx) { @@ -383,7 +383,7 @@ static fz_display_list *create_page_list(fz_document *doc, fz_page *page) } fz_always(ctx) { - fz_free_device(dev); + fz_drop_device(dev); } fz_catch(ctx) { @@ -413,7 +413,7 @@ static fz_display_list *create_annot_list(fz_document *doc, fz_page *page) } fz_always(ctx) { - fz_free_device(dev); + fz_drop_device(dev); } fz_catch(ctx) { @@ -461,7 +461,7 @@ static fz_pixmap *renderPixmap(fz_document *doc, fz_display_list *page_list, fz_ } fz_always(ctx) { - fz_free_device(dev); + fz_drop_device(dev); } fz_catch(ctx) { @@ -563,7 +563,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa 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_free_device(dev); + fz_drop_device(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_free_device(dev); + fz_drop_device(dev); } fz_catch(ctx) { diff --git a/platform/ios/Classes/MuPageViewReflow.m b/platform/ios/Classes/MuPageViewReflow.m index bc0e2c79..a9716df5 100644 --- a/platform/ios/Classes/MuPageViewReflow.m +++ b/platform/ios/Classes/MuPageViewReflow.m @@ -27,7 +27,7 @@ NSString *textAsHtml(fz_document *doc, int pageNum) dev = fz_new_text_device(ctx, sheet, text); page = fz_load_page(doc, pageNum); fz_run_page(doc, page, dev, &ctm, NULL); - fz_free_device(dev); + fz_drop_device(dev); dev = NULL; fz_analyze_text(ctx, sheet, text); @@ -57,9 +57,9 @@ NSString *textAsHtml(fz_document *doc, int pageNum) } fz_always(ctx) { - fz_free_text_page(ctx, text); - fz_free_text_sheet(ctx, sheet); - fz_free_device(dev); + fz_drop_text_page(ctx, text); + fz_drop_text_sheet(ctx, sheet); + fz_drop_device(dev); fz_close_output(out); fz_drop_buffer(ctx, buf); fz_free_page(doc, page); diff --git a/platform/ios/Classes/MuPrintPageRenderer.m b/platform/ios/Classes/MuPrintPageRenderer.m index 36f66ee9..9408a6e3 100644 --- a/platform/ios/Classes/MuPrintPageRenderer.m +++ b/platform/ios/Classes/MuPrintPageRenderer.m @@ -114,7 +114,7 @@ static void renderPage(fz_document *doc, fz_page *page, fz_pixmap *pix, fz_matri } fz_always(ctx) { - fz_free_device(dev); + fz_drop_device(dev); } fz_catch(ctx) { diff --git a/platform/ios/common.m b/platform/ios/common.m index f4a1676d..6ca320e9 100644 --- a/platform/ios/common.m +++ b/platform/ios/common.m @@ -25,12 +25,12 @@ int search_page(fz_document *doc, int number, char *needle, fz_cookie *cookie) 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_free_device(dev); + fz_drop_device(dev); hit_count = fz_search_text_page(ctx, text, needle, hit_bbox, nelem(hit_bbox)); - fz_free_text_page(ctx, text); - fz_free_text_sheet(ctx, sheet); + fz_drop_text_page(ctx, text); + fz_drop_text_sheet(ctx, sheet); fz_free_page(doc, page); return hit_count; |