Revision 1973,
1.9 KB
checked in by munepi, 14 years ago
(diff) |
texlive: rebuilt zlib-1.2.5; applied security patches and some patches for libpoppler-0.12
|
-
This patch is based on texlive-2009-pdftexdir-libpoppler-0.12.patch.
Fix FTBFS with poppler again, they will never be able to keep APIs
Thanks to Ubuntu people for that patch
diff -up texlive-20091107-source/texk/web2c/luatexdir/image/pdftoepdf.cc.xpdf texlive-20091107-source/texk/web2c/luatexdir/image/pdftoepdf.cc
old
|
new
|
static void writeEncodings() |
666 | 666 | } |
667 | 667 | for (r = encodingList; r != NULL; r = n) { |
668 | 668 | n = r->next; |
669 | | delete r->font; |
| 669 | // delete r->font; |
670 | 670 | delete r; |
671 | 671 | } |
672 | 672 | } |
… |
… |
read_pdf_info(image_dict * idict, intege |
705 | 705 | Page *page; |
706 | 706 | int rotate; |
707 | 707 | PDFRectangle *pagebox; |
| 708 | int minor_pdf_version_found, major_pdf_version_found; |
708 | 709 | float pdf_version_found, pdf_version_wanted, xsize, ysize, xorig, yorig; |
709 | 710 | assert(idict != NULL); |
710 | 711 | assert(img_type(idict) == IMG_TYPE_PDF); |
… |
… |
read_pdf_info(image_dict * idict, intege |
720 | 721 | // this works only for PDF 1.x -- but since any versions of PDF newer |
721 | 722 | // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will |
722 | 723 | // then have to changed drastically anyway. |
723 | | pdf_version_found = pdf_doc->doc->getPDFVersion(); |
| 724 | minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion(); |
| 725 | major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion(); |
| 726 | pdf_version_found = major_pdf_version_found + (minor_pdf_version_found * 0.1); |
724 | 727 | pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1); |
| 728 | |
725 | 729 | if (pdf_version_found > pdf_version_wanted + 0.01) { |
726 | 730 | char msg[] = |
727 | 731 | "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed"; |
Note: See
TracBrowser
for help on using the repository browser.