anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +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/branches/BRANCH_1_4_X@13318 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-03-10 12:44:03 +00:00
parent b7b123fc40
commit cd1f5d793c
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1,6 +1,6 @@
dnl Process with autoconf to generate configure script -*- sh -*-
AC_INIT(LyX,1.4.0,[lyx-devel@lists.lyx.org],[lyx])
AC_INIT(LyX,1.4.0svn,[lyx-devel@lists.lyx.org],[lyx])
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(src/main.C)
AC_CONFIG_HEADERS([src/config.h])

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