anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not duplicate jpg format

Browse Source 
Some qt versions report both "jpeg" and "jpg" as loadable file extensions.
In this case the jpg format was added twice previously. This does not happen
anymore with the new code, and it works as well if only "jpg" or only "jpeg"
is reported.
This commit is contained in:
Georg Baum 2016-06-02 22:31:27 +02:00
parent d2424c6998
commit 8d255ced2a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/frontends/qt4/GuiApplication.cpp
View File

@ -227,14 +227,25 @@ vector<string> loadableImageFormats()
if (qt_formats.empty())
LYXERR(Debug::GRAPHICS, "\nQt4 Problem: No Format available!");
bool jpeg_found = false;
bool jpg_found = false;
for (QList<QByteArray>::const_iterator it = qt_formats.begin(); it != qt_formats.end(); ++it) {
LYXERR(Debug::GRAPHICS, (const char *) *it << ", ");
string ext = ascii_lowercase((const char *) *it);
// special case
if (ext == "jpeg")
if (ext == "jpeg") {
jpeg_found = true;
if (jpg_found)
continue;
ext = "jpg";
}
else if (ext == "jpg") {
jpg_found = true;
if (jpeg_found)
continue;
}
fmts.push_back(ext);
}