diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-02-17 08:41:35 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-02-17 08:41:35 +0000 |
commit | 77cea4c016ed732551b4b94fc5c452180a894123 (patch) | |
tree | 73c4ebafd79c155c763829277f5255212c36f6d1 /Build/source/texk/dvipdfm-x/pdfcolor.c | |
parent | 9c6def6021823454892b24da379284c7487992d9 (diff) |
dvipdfm-x version 20180217: Accept PDF version tag 2.0. (S. Hirata)
git-svn-id: svn://tug.org/texlive/trunk@46658 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/pdfcolor.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/pdfcolor.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Build/source/texk/dvipdfm-x/pdfcolor.c b/Build/source/texk/dvipdfm-x/pdfcolor.c index d1adc6f00fb..b5c67f3999a 100644 --- a/Build/source/texk/dvipdfm-x/pdfcolor.c +++ b/Build/source/texk/dvipdfm-x/pdfcolor.c @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2002-2016 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> @@ -596,19 +596,22 @@ static struct {0x04, 0x00}, /* PDF-1.5 */ {0x04, 0x00}, /* PDF-1.6 */ {0x04, 0x20}, /* PDF-1.7 */ + {0x04, 0x20}, /* Dummy(1.8)*/ + {0x04, 0x20}, /* Dummy(1.9) */ + {0x04, 0x20} /* PDF-2.0 */ }; static int iccp_version_supported (int major, int minor) { - int pdf_ver; + int idx; - pdf_ver = pdf_get_version(); - if (pdf_ver < 8) { - if (icc_versions[pdf_ver].major < major) + idx = pdf_get_version() - 10; + if (idx < 11) { + if (icc_versions[idx].major < major) return 0; - else if (icc_versions[pdf_ver].major == major && - icc_versions[pdf_ver].minor < minor) + else if (icc_versions[idx].major == major && + icc_versions[idx].minor < minor) return 0; else { return 1; |