vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++ cannot invoke other constructors 

BUG: 324004
FIXED-IN: 4.11.1
BUG: 112274
icc-effect-5.14.5
Thomas Lübking 2013-08-25 16:17:20 +02:00
parent 4ba6764a57
commit 1d778f4600
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libkwineffects/kwinxrenderutils.cpp
View File

@ -110,13 +110,18 @@ static xcb_render_picture_t createPicture(xcb_pixmap_t pix, int depth)
XRenderPicture::XRenderPicture(const QPixmap &pix) XRenderPicture::XRenderPicture(const QPixmap &pix)
{ {
if (Extensions::nonNativePixmaps()) { if (Extensions::nonNativePixmaps()) {
XRenderPicture(pix.toImage()); fromImage(pix.toImage());
} else { } else {
d = new XRenderPictureData(createPicture(pix.handle(), pix.depth())); d = new XRenderPictureData(createPicture(pix.handle(), pix.depth()));
} }
} }
XRenderPicture::XRenderPicture(const QImage &img) XRenderPicture::XRenderPicture(const QImage &img)
{
fromImage(img);
}
void XRenderPicture::fromImage(const QImage &img)
{ {
const int depth = img.depth(); const int depth = img.depth();
xcb_pixmap_t xpix = xcb_generate_id(connection()); xcb_pixmap_t xpix = xcb_generate_id(connection());

1
libkwineffects/kwinxrenderutils.h
View File

@ -74,6 +74,7 @@ public:
XRenderPicture(xcb_pixmap_t pix, int depth); XRenderPicture(xcb_pixmap_t pix, int depth);
operator xcb_render_picture_t(); operator xcb_render_picture_t();
private: private:
void fromImage(const QImage &img);
KSharedPtr< XRenderPictureData > d; KSharedPtr< XRenderPictureData > d;
}; };