diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2015-07-23 12:29:58 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2015-07-23 12:29:58 +0000 |
commit | 90f3bd40a3945c8f0585224212538a70ea04df3a (patch) | |
tree | 98aca6963bc3d9d73ec955a6c330f4457558fbda | |
parent | f3157a462b1dc22cf359de5a1fa36d9731ca3eb5 (diff) |
dvipdfm-x: Avoid warnings.
git-svn-id: svn://tug.org/texlive/trunk@37932 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 13 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/epdf.c | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/pdfximage.c | 12 |
3 files changed, 14 insertions, 16 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 94feb578cf1..9a3a629b31c 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,15 +1,8 @@ 2015-07-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - * pdfdoc.c, spc_pdfm.c, spc_util.c, xbb.c: Improve obtaining BoundingBox. - -2015-07-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - - * spc_pdfm.c: Fix a bug. Forgot to initialize PageBox. Thanks Y. Terada. - -2015-07-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - - * pdfdoc.c, pdfobj.h, pdfximage.c, spc_util.c, xbb.c: Support - pagebox=artbox etc. in PDF inclusion. It works with a new dvipdfmx.def. + * epdf.c. pdfdoc.c, pdfobj.h, pdfximage.c, spc_pdfm.c, spc_util.c, xbb.c: + Support pagebox=artbox etc. in PDF inclusion. It works with a new + dvipdfmx.def. Thanks Y. Terada. 2015-07-18 Akira Kakuto <kakuto@fuk.kindai.ac.jp> diff --git a/Build/source/texk/dvipdfm-x/epdf.c b/Build/source/texk/dvipdfm-x/epdf.c index 5dcf48cb810..d6305d8f4dd 100644 --- a/Build/source/texk/dvipdfm-x/epdf.c +++ b/Build/source/texk/dvipdfm-x/epdf.c @@ -422,6 +422,11 @@ pdf_include_page (pdf_ximage *ximage, FILE *image_file, const char *filename) page_no = 1; page = pdf_doc_get_page(pf, page_no, NULL, &info.bbox, &resources); +/* + Recover the default value of PageBox +*/ + PageBox = 0; + if(!page) goto error_silent; diff --git a/Build/source/texk/dvipdfm-x/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c index 7f91ac942fd..9e2e680b813 100644 --- a/Build/source/texk/dvipdfm-x/pdfximage.c +++ b/Build/source/texk/dvipdfm-x/pdfximage.c @@ -369,14 +369,14 @@ pdf_ximage_findresource (const char *ident, long page_no, pdf_obj *dict) if (I->ident && !strcmp(ident, I->ident)) { f = I->filename; /* - PageBox can be differrent. So we retry. + PageBox can be differrent. So we retry if PageBox != 0 */ -#if 0 - if (I->page_no == page_no + (page_no < 0 ? I->page_count+1 : 0) && - I->attr_dict == dict) { - return id; + if (PageBox == 0) { + if (I->page_no == page_no + (page_no < 0 ? I->page_count+1 : 0) && + I->attr_dict == dict) { + return id; + } } -#endif } } |