From 23ac569165b66403abfe72e89007675ceaa9bde0 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Tue, 11 Oct 2016 20:39:26 +0800 Subject: Avoid checking argument to fz_drop_*()/fz_free(). As fz_drop_*()/fz_free() all must handle NULL. --- platform/ios/Classes/MuDocRef.m | 3 +-- platform/ios/Classes/MuPageViewNormal.m | 9 +++------ platform/x11/pdfapp.c | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'platform') diff --git a/platform/ios/Classes/MuDocRef.m b/platform/ios/Classes/MuDocRef.m index 5a61dffa..d8d3295a 100644 --- a/platform/ios/Classes/MuDocRef.m +++ b/platform/ios/Classes/MuDocRef.m @@ -32,8 +32,7 @@ { if (self) { - if (doc != NULL) - fz_drop_document(ctx, doc); + fz_drop_document(ctx, doc); [self release]; self = nil; } diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m index 08f38786..7a9d9857 100644 --- a/platform/ios/Classes/MuPageViewNormal.m +++ b/platform/ios/Classes/MuPageViewNormal.m @@ -701,12 +701,9 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa __block CGDataProviderRef block_tileData = tileData; __block CGDataProviderRef block_imageData = imageData; dispatch_async(queue, ^{ - if (block_page_list) - fz_drop_display_list(ctx, block_page_list); - if (block_annot_list) - fz_drop_display_list(ctx, block_annot_list); - if (block_page) - fz_drop_page(ctx, block_page); + fz_drop_display_list(ctx, block_page_list); + fz_drop_display_list(ctx, block_annot_list); + fz_drop_page(ctx, block_page); block_page = nil; CGDataProviderRelease(block_tileData); CGDataProviderRelease(block_imageData); diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c index 8bfaec1d..83744cb1 100644 --- a/platform/x11/pdfapp.c +++ b/platform/x11/pdfapp.c @@ -899,8 +899,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai fz_rect_from_irect(&bounds, &ibounds); /* Draw */ - if (app->image) - fz_drop_pixmap(app->ctx, app->image); + fz_drop_pixmap(app->ctx, app->image); if (app->grayscale) colorspace = fz_device_gray(app->ctx); else -- cgit v1.2.3