wait #6530 @1.25

diff --git a/src/CommandLine/Poppler.php b/src/CommandLine/Poppler.php
index bc553597078a37dbe0e83c1197e898e008e21fdc..598aeaef3953eb3b05e40f8eb96acedad6595df5 100644 (file)
--- a/src/CommandLine/Poppler.php
+++ b/src/CommandLine/Poppler.php
@@ -56,7 +56,7 @@ class Poppler
             } else {
                 $dest = str_replace('.' . $extension, '', $to);
             }
-            if (file_exists($cacheFile)) {
+            if (Files::isNotEmpty($cacheFile)) {
                 if (null === $to) {
                     return $cacheFile;
                 }
@@ -111,6 +111,14 @@ class Poppler
         return $res;
     }
 
+    /**
+     * @param $file
+     * @param $page
+     * @param $destfile
+     * @param $rect
+     * @param $invertPaper
+     * @return CommandLine
+     */
     protected static function _pdftocairoRect($file, $page, $destfile, $rect, $invertPaper = false)
     {
         $pdftocairo = new CommandLine('pdftocairo');
@@ -119,6 +127,7 @@ class Poppler
         $pdftocairo->setArg('-paperh', round($invertPaper ? $rect['width'] : $rect['height']));
         self::_crop($pdftocairo, $page, $rect, 1, 1);
         self::_exec($pdftocairo, $file, $destfile);
+        return $pdftocairo;
     }
 
     /**

diff --git a/src/Graphics/Image.php b/src/Graphics/Image.php
index 1529c679473b24f5413872d21d54aacda65341b4..282fcb7a991a5b5e8748951e4b66bcf6c86500b8 100644 (file)
--- a/src/Graphics/Image.php
+++ b/src/Graphics/Image.php
@@ -126,10 +126,10 @@ class Image
     public static function fixSVGDimensions($source, $preserveAspectRatio = "none")
     {
         $fixed = str_replace('.svg', '.f.svg', $source);
-        if (file_exists($fixed) && filemtime($fixed) >= filemtime($source)) {
+        if (Files::isNotEmpty($fixed) && filemtime($fixed) >= filemtime($source)) {
             return $fixed;
         }
-        if (file_exists($fixed) && is_link($fixed)) {
+        if (file_exists($fixed) && (is_link($fixed) || filesize($fixed) === 0)) {
             unlink($fixed);
         }
         try {