diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-02-01 11:27:10 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-02-01 11:27:10 +0100 |
commit | b05f482dd219acd5f5c7e9669ad8bd168ba224c6 (patch) | |
tree | 4c89e1dc27201b34e35a8d9e3e8e461531978443 /inc/3rdparty/libraries/tcpdf | |
parent | 3dcd85c075998ecdf2d54c5661c42e24080067d5 (diff) | |
parent | bc6f5a8086b331bf21cdfcac799788264d8cd3b2 (diff) | |
download | wallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.tar.gz wallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.tar.zst wallabag-b05f482dd219acd5f5c7e9669ad8bd168ba224c6.zip |
Merge branch 'dev' into reloadarticle
Diffstat (limited to 'inc/3rdparty/libraries/tcpdf')
-rw-r--r-- | inc/3rdparty/libraries/tcpdf/tcpdf.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/inc/3rdparty/libraries/tcpdf/tcpdf.php b/inc/3rdparty/libraries/tcpdf/tcpdf.php index 78694a0e..70c1747a 100644 --- a/inc/3rdparty/libraries/tcpdf/tcpdf.php +++ b/inc/3rdparty/libraries/tcpdf/tcpdf.php | |||
@@ -2927,11 +2927,17 @@ class TCPDF { | |||
2927 | public function Error($msg) { | 2927 | public function Error($msg) { |
2928 | // unset all class variables | 2928 | // unset all class variables |
2929 | $this->_destroy(true); | 2929 | $this->_destroy(true); |
2930 | throw new Exception('TCPDF ERROR: '.$msg); | ||
2931 | /* | ||
2932 | |||
2933 | I had problems with the constants for some reason, so here we force | ||
2934 | |||
2935 | $this->_destroy(true); | ||
2930 | if (defined('K_TCPDF_THROW_EXCEPTION_ERROR') AND !K_TCPDF_THROW_EXCEPTION_ERROR) { | 2936 | if (defined('K_TCPDF_THROW_EXCEPTION_ERROR') AND !K_TCPDF_THROW_EXCEPTION_ERROR) { |
2931 | die('<strong>TCPDF ERROR: </strong>'.$msg); | 2937 | die('<strong>TCPDF ERROR: </strong>'.$msg); |
2932 | } else { | 2938 | } else { |
2933 | throw new Exception('TCPDF ERROR: '.$msg); | 2939 | throw new Exception('TCPDF ERROR: '.$msg); |
2934 | } | 2940 | }*/ |
2935 | } | 2941 | } |
2936 | 2942 | ||
2937 | /** | 2943 | /** |
@@ -6915,7 +6921,7 @@ class TCPDF { | |||
6915 | $ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k; | 6921 | $ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k; |
6916 | $imsize = array($pw, $ph); | 6922 | $imsize = array($pw, $ph); |
6917 | } else { | 6923 | } else { |
6918 | $this->Error('[Image] Unable to get the size of the image: '.$file); | 6924 | $this->Error('[Image] Unable to fetch image: '.$file); |
6919 | } | 6925 | } |
6920 | } | 6926 | } |
6921 | // file hash | 6927 | // file hash |