[PATCH 2/2] Queue the conversion of images and process later

[vfr]

From: Vincent van Ravesteijn <v...@lyx.org>

---
 src/Buffer.cpp               |    7 +++++++
 src/insets/InsetGraphics.cpp |   16 +++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 625c0ff..d2720a2 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -3660,6 +3660,13 @@ Buffer::ExportStatus Buffer::doExport(string const & 
target, bool put_in_tempdir
                }
        }
 
+       list<Converters::QueuedItem *> queue = theConverters().getQueue();
+       list<Converters::QueuedItem *>::const_iterator cit = queue.begin();
+       list<Converters::QueuedItem *>::const_iterator cend = queue.end();
+       for (; cit != cend; ++cit) {
+               theConverters().convert(this, *cit);
+       }
+
        string const error_type = (format == "program")
                ? "Build" : params().bufferFormat();
        ErrorList & error_list = d->errorLists[error_type];
diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 123af44..8812dab 100644
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -731,15 +731,13 @@ string InsetGraphics::prepareFile(OutputParams const & 
runparams) const
                << "\t from " << from << " to " << to);
 
        // FIXME (Abdel 12/08/06): Is there a need to show these errors?
-       ErrorList el;
-       if (theConverters().convert(&buffer(), temp_file, to_file, 
params().filename,
-                              from, to, el,
-                              Converters::try_default | 
Converters::try_cache)) {
-               runparams.exportdata->addExternalFile(tex_format,
-                               to_file, output_to_file);
-               runparams.exportdata->addExternalFile("dvi",
-                               to_file, output_to_file);
-       }
+       theConverters().addToQueue(&buffer(), temp_file, to_file, 
params().filename,
+                              from, to, 0,
+                              Converters::try_default | Converters::try_cache);
+       runparams.exportdata->addExternalFile(tex_format,
+                       to_file, output_to_file);
+       runparams.exportdata->addExternalFile("dvi",
+                       to_file, output_to_file);
 
        return stripExtensionIfPossible(output_to_file, runparams.nice);
 }
-- 
1.7.4.1