From: Richard Heck Date: Sun, 31 Jul 2016 01:51:25 +0000 (-0400) Subject: If we cannot find the input format for a graphic, we cannot convert it. X-Git-Tag: 2.2.2~100 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e1bad0610337da2d4948c0eb5fe988e8f9ac73af;p=features.git If we cannot find the input format for a graphic, we cannot convert it. Also includes some minor code cleanup. (cherry picked from commit e1f597e3da26865cb01eab5bef6ad5d9e862ff7a) --- diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index 323eaacd6b..04faae74a4 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -873,15 +873,13 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const if (params().filename.empty()) return string(); - string const orig_file = params().filename.absFileName(); + if (!params().filename.isReadableFile()) + return string(); // The master buffer. This is useful when there are multiple levels // of include files Buffer const * masterBuffer = buffer().masterBuffer(); - if (!params().filename.isReadableFile()) - return string(); - // We place all temporary files in the master buffer's temp dir. // This is possible because we use mangled file names. // FIXME We may want to put these files in some special temporary @@ -897,14 +895,16 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const if (status == FAILURE) return string(); - string output_file = onlyFileName(temp_file.absFileName()); - string const from = formats.getFormatFromFile(temp_file); - if (from.empty()) + if (from.empty()) { LYXERR(Debug::GRAPHICS, "\tCould not get file format."); + return string(); + } string const to = findTargetFormat(from, runparams); string const ext = formats.extension(to); + string const orig_file = params().filename.absFileName(); + string output_file = onlyFileName(temp_file.absFileName()); LYXERR(Debug::GRAPHICS, "\t we have: from " << from << " to " << to); LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);