[1973] | 1 | This patch is based on texlive-2009-pdftexdir-libpoppler-0.12.patch. |
---|
| 2 | |
---|
| 3 | Fix FTBFS with poppler again, they will never be able to keep APIs |
---|
| 4 | |
---|
| 5 | Thanks to Ubuntu people for that patch |
---|
| 6 | |
---|
| 7 | =================================================================== |
---|
| 8 | diff -up texlive-20091107-source/texk/web2c/luatexdir/image/pdftoepdf.cc.xpdf texlive-20091107-source/texk/web2c/luatexdir/image/pdftoepdf.cc |
---|
| 9 | --- texlive-20091107-source/texk/web2c/luatexdir/image/pdftoepdf.cc.xpdf 2009-06-25 22:05:10.000000000 +0900 |
---|
| 10 | +++ texlive-20091107-source/texk/web2c/luatexdir/image/pdftoepdf.cc 2010-10-01 00:34:22.405000028 +0900 |
---|
| 11 | @@ -666,7 +666,7 @@ static void writeEncodings() |
---|
| 12 | } |
---|
| 13 | for (r = encodingList; r != NULL; r = n) { |
---|
| 14 | n = r->next; |
---|
| 15 | - delete r->font; |
---|
| 16 | +// delete r->font; |
---|
| 17 | delete r; |
---|
| 18 | } |
---|
| 19 | } |
---|
| 20 | @@ -705,6 +705,7 @@ read_pdf_info(image_dict * idict, intege |
---|
| 21 | Page *page; |
---|
| 22 | int rotate; |
---|
| 23 | PDFRectangle *pagebox; |
---|
| 24 | + int minor_pdf_version_found, major_pdf_version_found; |
---|
| 25 | float pdf_version_found, pdf_version_wanted, xsize, ysize, xorig, yorig; |
---|
| 26 | assert(idict != NULL); |
---|
| 27 | assert(img_type(idict) == IMG_TYPE_PDF); |
---|
| 28 | @@ -720,8 +721,11 @@ read_pdf_info(image_dict * idict, intege |
---|
| 29 | // this works only for PDF 1.x -- but since any versions of PDF newer |
---|
| 30 | // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will |
---|
| 31 | // then have to changed drastically anyway. |
---|
| 32 | - pdf_version_found = pdf_doc->doc->getPDFVersion(); |
---|
| 33 | + minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion(); |
---|
| 34 | + major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion(); |
---|
| 35 | + pdf_version_found = major_pdf_version_found + (minor_pdf_version_found * 0.1); |
---|
| 36 | pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1); |
---|
| 37 | + |
---|
| 38 | if (pdf_version_found > pdf_version_wanted + 0.01) { |
---|
| 39 | char msg[] = |
---|
| 40 | "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed"; |
---|
| 41 | |
---|
| 42 | Diff finished. Fri Oct 1 00:35:08 2010 |
---|