mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-13 22:49:20 +00:00
If we cannot find the input format for a graphic, we cannot convert it.
Also includes some minor code cleanup.
(cherry picked from commit e1f597e3da
)
This commit is contained in:
parent
21ccd006ee
commit
e1bad06103
@ -873,15 +873,13 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const
|
|||||||
if (params().filename.empty())
|
if (params().filename.empty())
|
||||||
return string();
|
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
|
// The master buffer. This is useful when there are multiple levels
|
||||||
// of include files
|
// of include files
|
||||||
Buffer const * masterBuffer = buffer().masterBuffer();
|
Buffer const * masterBuffer = buffer().masterBuffer();
|
||||||
|
|
||||||
if (!params().filename.isReadableFile())
|
|
||||||
return string();
|
|
||||||
|
|
||||||
// We place all temporary files in the master buffer's temp dir.
|
// We place all temporary files in the master buffer's temp dir.
|
||||||
// This is possible because we use mangled file names.
|
// This is possible because we use mangled file names.
|
||||||
// FIXME We may want to put these files in some special temporary
|
// 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)
|
if (status == FAILURE)
|
||||||
return string();
|
return string();
|
||||||
|
|
||||||
string output_file = onlyFileName(temp_file.absFileName());
|
|
||||||
|
|
||||||
string const from = formats.getFormatFromFile(temp_file);
|
string const from = formats.getFormatFromFile(temp_file);
|
||||||
if (from.empty())
|
if (from.empty()) {
|
||||||
LYXERR(Debug::GRAPHICS, "\tCould not get file format.");
|
LYXERR(Debug::GRAPHICS, "\tCould not get file format.");
|
||||||
|
return string();
|
||||||
|
}
|
||||||
|
|
||||||
string const to = findTargetFormat(from, runparams);
|
string const to = findTargetFormat(from, runparams);
|
||||||
string const ext = formats.extension(to);
|
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, "\t we have: from " << from << " to " << to);
|
||||||
LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);
|
LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user