diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index e94df58..477677e 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +6.0.030 (2013-09-17) + - Bug #835 "PDF417 and Cyrilic simbols" was fixed. + 6.0.029 (2013-09-15) - Constants K_TCPDF_PARSER_THROW_EXCEPTION_ERROR and K_TCPDF_PARSER_IGNORE_DECODING_ERRORS where removed in favor of a new configuration array in the TCPDF_PARSER class. - The TCPDF_PARSER class can now be configured using the new $cfg parameter. diff --git a/README.TXT b/README.TXT index 62cfa63..86ee82d 100644 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.0.029 -Release date: 2013-09-15 +Version: 6.0.030 +Release date: 2013-09-17 Author: Nicola Asuni Copyright (c) 2002-2013: diff --git a/composer.json b/composer.json index 27e71b4..b38b098 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.029", + "version": "6.0.030", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents.", diff --git a/include/barcodes/pdf417.php b/include/barcodes/pdf417.php index 02191b4..4265299 100644 --- a/include/barcodes/pdf417.php +++ b/include/barcodes/pdf417.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.029 + * @version 6.0.030 */ // TCPDF configuration @@ -163,7 +163,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php'); * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
* @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 6.0.029 + * @version 6.0.030 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { diff --git a/tcpdf_import.php b/tcpdf_import.php index 4d71934..09d726b 100644 --- a/tcpdf_import.php +++ b/tcpdf_import.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 1.0.000 + * @version 1.0.001 */ // include the TCPDF class @@ -53,7 +53,7 @@ require_once(dirname(__FILE__).'/tcpdf_parser.php'); * PHP class extension of the TCPDF (http://www.tcpdf.org) library to import existing PDF documents.
* @package com.tecnick.tcpdf * @brief PHP class extension of the TCPDF library to import existing PDF documents. - * @version 1.0.000 + * @version 1.0.001 * @author Nicola Asuni - info@tecnick.com */ class TCPDF_IMPORT extends TCPDF { @@ -71,8 +71,19 @@ class TCPDF_IMPORT extends TCPDF { if ($rawdata === false) { $this->Error('Unable to get the content of the file: '.$filename); } - // parse PDF data - $pdf = new TCPDF_PARSER($rawdata); + // configuration parameters for parser + $cfg = array( + 'die_for_errors' => false, + 'ignore_filter_decoding_errors' => true, + 'ignore_missing_filter_decoders' => true, + ); + try { + // parse PDF data + $pdf = new TCPDF_PARSER($rawdata, $cfg); + } catch (Exception $e) { + die($e->getMessage()); + } + // get the parsed data $data = $pdf->getParsedData(); // release some memory unset($rawdata);