luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.QT4]

Browse source 
* BUG: Disable warning messages when rendering a SVG file.

[GB.QT5]
* BUG: Disable warning messages when rendering a SVG file.


git-svn-id: svn://localhost/gambas/trunk@7449 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2015-11-03 16:13:45 +00:00
parent 9d7e77214b
commit 0f5e67b85e
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gb.qt4/src/csvgimage.cpp
View file

@ -28,6 +28,8 @@
#include "cpaint_impl.h" #include "cpaint_impl.h"
#include "csvgimage.h" #include "csvgimage.h"
#include <QtGlobal>
#define MM_TO_PT(_mm) ((_mm) * 72 / 25.4) #define MM_TO_PT(_mm) ((_mm) * 72 / 25.4)
#define PT_TO_MM(_pt) ((_pt) / 72 * 25.4) #define PT_TO_MM(_pt) ((_pt) / 72 * 25.4)
@ -116,6 +118,14 @@ BEGIN_METHOD(SvgImage_Resize, GB_FLOAT width; GB_FLOAT height)
END_METHOD END_METHOD
#ifdef QT5
static void myMessageHandler(QtMsgType, const QMessageLogContext &, const QString &)
#else
static void myMessageHandler(QtMsgType, const char *)
#endif
{
}
static const char *load_file(CSVGIMAGE *_object, const char *path, int len_path) static const char *load_file(CSVGIMAGE *_object, const char *path, int len_path)
{ {
QSvgRenderer *renderer; QSvgRenderer *renderer;
@ -129,7 +139,17 @@ static const char *load_file(CSVGIMAGE *_object, const char *path, int len_path)
data = QByteArray::fromRawData(addr, len); data = QByteArray::fromRawData(addr, len);
#ifdef QT5
qInstallMessageHandler(myMessageHandler);
#else
qInstallMsgHandler(myMessageHandler);
#endif
renderer = new QSvgRenderer(data); renderer = new QSvgRenderer(data);
#ifdef QT5
qInstallMessageHandler(0);
#else
qInstallMsgHandler(0);
#endif
if (!renderer->isValid()) if (!renderer->isValid())
{ {
error = "Unable to load SVG file: unable to create renderer"; error = "Unable to load SVG file: unable to create renderer";