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

five lines plain loop vs seven lines fancy boost & algorithm

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21870 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-11-29 22:48:35 +00:00
parent 81f21577b7
commit c3c40d3332
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/frontends/qt4/GuiImage.cpp
View File

@ -14,11 +14,11 @@
#include "GuiImage.h"
#include "qt_helpers.h"
#include "support/debug.h"
#include "Format.h"
#include "graphics/GraphicsParams.h"
#include "support/debug.h"
#include "support/FileName.h"
#include "support/lstrings.h" // ascii_lowercase
@ -26,17 +26,8 @@
#include <QImage>
#include <QImageReader>
#include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp>
using lyx::support::ascii_lowercase;
using boost::bind;
using std::endl;
using std::equal_to;
using std::find_if;
using std::string;
namespace lyx {
namespace graphics {
@ -60,13 +51,12 @@ Image::FormatList GuiImage::loadableFormats()
Formats::const_iterator begin = formats.begin();
Formats::const_iterator end = formats.end();
// LYXERR(Debug::GRAPHICS,
// "D:/msys/home/yns/src/lyx-devel/lib/images/banner.png mis of format: "
// << fromqstr(Pic.pictureFormat("D:/msys/home/yns/src/lyx-devel/lib/images/banner.png")))
// if (Pic.pictureFormat("D:/msys/home/yns/src/lyx-devel/lib/images/banner.png"))
// LYXERR(Debug::GRAPHICS, "pictureFormat not returned NULL\n"
// << "Supported formats are: " << Pic.inputFormats());
//LYXERR(Debug::GRAPHICS,
// "D:/msys/home/yns/src/lyx-devel/lib/images/banner.png mis of format: "
// << fromqstr(Pic.pictureFormat("D:/msys/.../banner.png")))
//if (Pic.pictureFormat("D:/msys/.../banner.png"))
// LYXERR(Debug::GRAPHICS, "pictureFormat not returned NULL\n"
// << "Supported formats are: " << Pic.inputFormats());
QList<QByteArray> qt_formats = QImageReader::supportedImageFormats();
@ -80,23 +70,21 @@ Image::FormatList GuiImage::loadableFormats()
LYXERR(Debug::GRAPHICS, (const char *) *it << ", ");
string ext = ascii_lowercase((const char *) *it);
std::string ext = ascii_lowercase((const char *) *it);
// special case
if (ext == "jpeg")
ext = "jpg";
Formats::const_iterator fit =
find_if(begin, end,
bind(equal_to<string>(),
bind(&Format::extension, _1),
ext));
if (fit != end)
fmts.push_back(fit->name());
for (Formats::const_iterator fit = begin; fit != end; ++fit)
if (fit->extension() == ext) {
fmts.push_back(fit->name());
break;
}
}
if (lyxerr.debugging()) {
LYXERR(Debug::GRAPHICS, "\nOf these, LyX recognises the following formats:");
LYXERR(Debug::GRAPHICS, "Of these, LyX recognises the following formats:");
FormatList::const_iterator fbegin = fmts.begin();
FormatList::const_iterator fend = fmts.end();