[gs-commits] mupdf/master - 0_6-182-g9e7aac0 - Check dicts for null so we don't get lots of warnings.

Tor Andersson tor at ghostscript.com
Sat Jul 17 01:47:51 UTC 2010


commit 9e7aac06cffe1e3ad4e337b12b09e99876be4c9b
Author: Tor Andersson <tor at ghostscript.com>
Date:   Fri Jul 16 11:56:26 2010 +0000

    Check dicts for null so we don't get lots of warnings.
    
    Ignore-this: da6008cae011adde6a39bf84201475c3
    
    darcs-hash:20100716115626-f546f-77ab3fc672999638c63dfae3d13bf6918fe5f74c.gz

 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mupdf/pdf_page.c b/mupdf/pdf_page.c
index 57f7bb4..d387222 100644
--- a/mupdf/pdf_page.c
+++ b/mupdf/pdf_page.c
@@ -87,11 +87,11 @@ pdf_patternusesblending(fz_obj *dict)
 	fz_obj *obj;
 
 	obj = fz_dictgets(dict, "Resources");
-	if (pdf_resourcesuseblending(obj))
+	if (fz_isdict(obj) && pdf_resourcesuseblending(obj))
 		return 1;
 
 	obj = fz_dictgets(dict, "ExtGState");
-	if (pdf_extgstateusesblending(obj))
+	if (fz_isdict(obj) && pdf_extgstateusesblending(obj))
 		return 1;
 
 	return 0;
@@ -103,7 +103,7 @@ pdf_xobjectusesblending(fz_obj *dict)
 	fz_obj *obj;
 
 	obj = fz_dictgets(dict, "Resources");
-	if (pdf_resourcesuseblending(obj))
+	if (fz_isdict(obj) && pdf_resourcesuseblending(obj))
 		return 1;
 
 	return 0;
@@ -208,7 +208,7 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
 		return fz_rethrow(error, "cannot load page contents (%d %d R)", fz_tonum(obj), fz_togen(obj));
 	}
 
-	if (pdf_resourcesuseblending(page->resources))
+	if (page->resources && pdf_resourcesuseblending(page->resources))
 		page->transparency = 1;
 
 	pdf_logpage("} %p\n", page);

--
git/hooks/post-receive


More information about the gs-commits mailing list