wip #3975 @0.25

diff --git a/inc/ws/Util/class.ws.pdf.convert.php b/inc/ws/Util/class.ws.pdf.convert.php
index db61247ffe610c4c8b78bd28da6536e7e88b5f84..5c870c1acbcd186d225b3a9c157c29480148e861 100644 (file)
--- a/inc/ws/Util/class.ws.pdf.convert.php
+++ b/inc/ws/Util/class.ws.pdf.convert.php
@@ -28,13 +28,56 @@ class wsPDFConvert
 \r
     public static function makeSWF($in, $out, $page, $resolution = 100, $quality = 90)\r
     {\r
+        if (file_exists($out)) {\r
+            unlink($out);\r
+        }\r
+        $pdf2swf = new CubeIT_CommandLine('/usr/local/swftools/latest/bin/pdf2swf', null, true);\r
+        $pdf2swf->setPath(CONVERTER_PATH);\r
+        $pdf2swf->setArg('p', $page);\r
+        $pdf2swf->setArg('T', 10);\r
+        $pdf2swf->setArg('Q', 30);\r
+        $pdf2swf->setArg('set reordertags', '0');\r
+        $pdf2swf->setArg('fonts');\r
+        $pdf2swf->setArg('set storeallcharacters');\r
+        $pdf2swf->setArg('set subpixels', $resolution / 72);\r
+        $pdf2swf->setArg('set jpegquality', $quality);\r
+        $pdf2swf->setArg('set disablelinks');\r
+        $pdf2swf->setArg('set dots');\r
+        $pdf2swf->setArg(null, $in);\r
+        $pdf2swf->setArg('output', $out);\r
+        $pdf2swf->execute();\r
+        $pdf2swf->debug();\r
 \r
+        if (file_exists($out)) {\r
+            return;\r
+        }\r
+        $pdf2swf = new CubeIT_CommandLine('/usr/local/swftools/latest/bin/pdf2swf', null, true);\r
+        $pdf2swf->setPath(CONVERTER_PATH);\r
+        $pdf2swf->setArg('p', $page);\r
+        $pdf2swf->setArg('T', 10);\r
+        $pdf2swf->setArg('Q', 120);\r
+        $pdf2swf->setArg('set reordertags', '0');\r
+        $pdf2swf->setArg('fonts');\r
+        $pdf2swf->setArg('set poly2bitmap');\r
+        $pdf2swf->setArg('set storeallcharacters');\r
+        $pdf2swf->setArg('set subpixels', $resolution / 72);\r
+        $pdf2swf->setArg('set jpegquality', $quality);\r
+        $pdf2swf->setArg('set disablelinks');\r
+        $pdf2swf->setArg('set dots');\r
+        $pdf2swf->setArg(null, $in);\r
+        $pdf2swf->setArg('output', $out);\r
+        $pdf2swf->execute();\r
+        $pdf2swf->debug();\r
+        if (file_exists($out)) {\r
+            return;\r
+        }\r
         $pdf2swf = new CubeIT_CommandLine('/usr/local/swftools/latest/bin/pdf2swf', null, true);\r
         $pdf2swf->setPath(CONVERTER_PATH);\r
         $pdf2swf->setArg('p', $page);\r
         $pdf2swf->setArg('T', 10);\r
         $pdf2swf->setArg('set reordertags', '0');\r
         $pdf2swf->setArg('fonts');\r
+        $pdf2swf->setArg('set bitmap');\r
         $pdf2swf->setArg('set storeallcharacters');\r
         $pdf2swf->setArg('set subpixels', $resolution / 72);\r
         $pdf2swf->setArg('set jpegquality', $quality);\r