anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix fix of bug 2192

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13317 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-03-10 12:38:21 +00:00
parent d5da885f21
commit d8845c9f9c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/ChangeLog
View File

@ -1,3 +1,7 @@
2006-02-17 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* GraphicsCacheItem.C (findTargetFormat): fix previous fix
2006-01-11 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* GraphicsCacheItem.C (convertToDisplayFormat): handle unknown

5
src/graphics/GraphicsCacheItem.C
View File

@ -335,9 +335,12 @@ string const findTargetFormat(string const & from)
typedef lyx::graphics::Image::FormatList FormatList;
FormatList const formats = lyx::graphics::Image::loadableFormats();
// There must be a format to load from.
BOOST_ASSERT(!formats.empty());
// Use the standard converter if we don't know the format to load
// from.
if (!formats.empty())
if (from.empty())
return string("ppm");
// First ascertain if we can load directly with no conversion