Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / graphics / epstools.cpp

diff --git a/src/graphics/epstools.cpp b/src/graphics/epstools.cpp
index 5fb403c3ecc92f9abab5ad5eda13507a747378ac..d5674ba7d18205c168bb05318e9165ba34469bc6 100644 (file)
--- a/src/graphics/epstools.cpp
+++ b/src/graphics/epstools.cpp
@@ -26,6 +26,7 @@
 #include "Format.h"
 
 #include "support/debug.h"
+#include "support/docstream.h"
 #include "support/filetools.h"
 #include "support/FileName.h"
 #include "support/regex.h"
@@ -46,9 +47,9 @@ string const readBB_from_PSFile(FileName const & file)
        // end of the file. Than we have in the header:
        // %%BoundingBox: (atend)
        // In this case we must check the end.
-       bool const zipped = formats.isZippedFile(file);
+       bool const zipped = theFormats().isZippedFile(file);
        FileName const file_ = zipped ? unzipFile(file) : file;
-       string const format = formats.getFormatFromFile(file_);
+       string const format = theFormats().getFormatFromFile(file_);
 
        if (!Formats::isPostScriptFileFormat(format)) {
                LYXERR(Debug::GRAPHICS, "[readBB_from_PSFile] no(e)ps-format");
@@ -57,8 +58,8 @@ string const readBB_from_PSFile(FileName const & file)
                return string();
        }
 
-       static lyx::regex bbox_re(
-               "^%%BoundingBox:\\s*([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)");
+       static lyx::regex bbox_re("^%%BoundingBox:\\s*([-]*[[:digit:]]+)"
+               "\\s+([-]*[[:digit:]]+)\\s+([-]*[[:digit:]]+)\\s+([-]*[[:digit:]]+)");
        ifstream is(file_.toFilesystemEncoding().c_str());
        while (is) {
                string s;