Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
46a2037e
Commit
46a2037e
authored
Jan 03, 2019
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Fixed compilation error if PWRE_CONFIG_RSVG is set.
parent
a5bbc4ae
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
37 deletions
+7
-37
xtt/lib/glow/qt/glow_draw_qt.cqt
xtt/lib/glow/qt/glow_draw_qt.cqt
+7
-37
No files found.
xtt/lib/glow/qt/glow_draw_qt.cqt
View file @
46a2037e
...
...
@@ -39,10 +39,6 @@
#include <stdlib.h>
#include <string.h>
#if defined PWRE_CONF_RSVG
#include <rsvg.h>
#endif
#include <iostream>
#include "cow_qt_helpers.h"
...
...
@@ -2322,25 +2318,10 @@ int GlowDrawQt::image_scale(int width, int height, glow_tImImage orig_im,
*im = new QImage(((QImage*)orig_im)->scaled(width, height));
} else {
// Scale from orig_im
#if defined PWRE_CONF_RSVG
if (im_data && *im_data && *im) {
RsvgHandle* handle;
const char* imagefile;
if (*im) {
delete ((QImage*)*im);
handle = (RsvgHandle*)*im_data;
imagefile = rsvg_handle_get_base_uri(handle);
*im = rsvg_pixbuf_from_file_at_size(imagefile, width, height, NULL);
} else
#endif
{
if (*im) {
delete ((QImage*)*im);
}
*im = new QImage(((QImage*)orig_im)->scaled(width, height));
}
*im = new QImage(((QImage*)orig_im)->scaled(width, height));
}
return 1;
}
...
...
@@ -2354,23 +2335,12 @@ int GlowDrawQt::image_load(char* imagefile, glow_tImImage* orig_im,
if (*orig_im) {
delete ((QImage*)*orig_im);
}
#if defined PWRE_CONF_RSVG
if (im_data && streq(strchr(imagefile, '.'), ".svg")) {
RsvgHandle* handle;
handle = rsvg_handle_new_from_file(imagefile, NULL);
*im_data = (glow_tImImage*)handle;
*orig_im = (glow_tImImage*)rsvg_pixbuf_from_file(imagefile, NULL);
} else
#endif
{
*orig_im = new QImage(imagefile);
if (!*orig_im) {
if (im) {
*im = 0;
}
return 0;
*orig_im = new QImage(imagefile);
if (((QImage*)*orig_im)->isNull()) {
if (im) {
*im = 0;
}
return 0;
}
if (im) {
*im = new QImage(((QImage*)*orig_im)->copy());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment