Merge branch 'master' into biblatex2

[features.git] / src / graphics / GraphicsCache.cpp

diff --git a/src/graphics/GraphicsCache.cpp b/src/graphics/GraphicsCache.cpp
index b816926c8dff7901b874fe71b58bce8ef6999f94..a3b8ebd3a9e835fbb106ba26586211532f0c057f 100644 (file)
--- a/src/graphics/GraphicsCache.cpp
+++ b/src/graphics/GraphicsCache.cpp
@@ -44,7 +44,6 @@ public:
 };
 
 
-// FIXME THREAD
 Cache & Cache::get()
 {
        // Now return the cache
@@ -94,18 +93,15 @@ vector<string> const & Cache::loadableFormats() const
                vector<string>::const_iterator fbegin = fmts.begin();
                vector<string>::const_iterator fend = fmts.end();
                for (vector<string>::const_iterator fit = fbegin; fit != fend; ++fit) {
-                       if (fit != fbegin)
-                               LYXERR(Debug::GRAPHICS, ", ");
-                       LYXERR(Debug::GRAPHICS, *fit);
+                       LYXERR(Debug::GRAPHICS, *fit << ',');
                }
-               LYXERR(Debug::GRAPHICS, '\n');
        }
 
        return fmts;
 }
 
 
-void Cache::add(FileName const & file) const
+void Cache::add(FileName const & file, FileName const & doc_file) const
 {
        // Is the file in the cache already?
        if (inCache(file)) {
@@ -114,7 +110,7 @@ void Cache::add(FileName const & file) const
                return;
        }
 
-       pimpl_->cache[file] = ItemPtr(new CacheItem(file));
+       pimpl_->cache[file] = ItemPtr(new CacheItem(file, doc_file));
 }