c++ cannot invoke other constructors
BUG: 324004 FIXED-IN: 4.11.1 BUG: 112274
This commit is contained in:
parent
4ba6764a57
commit
1d778f4600
2 changed files with 7 additions and 1 deletions
|
@ -110,13 +110,18 @@ static xcb_render_picture_t createPicture(xcb_pixmap_t pix, int depth)
|
|||
XRenderPicture::XRenderPicture(const QPixmap &pix)
|
||||
{
|
||||
if (Extensions::nonNativePixmaps()) {
|
||||
XRenderPicture(pix.toImage());
|
||||
fromImage(pix.toImage());
|
||||
} else {
|
||||
d = new XRenderPictureData(createPicture(pix.handle(), pix.depth()));
|
||||
}
|
||||
}
|
||||
|
||||
XRenderPicture::XRenderPicture(const QImage &img)
|
||||
{
|
||||
fromImage(img);
|
||||
}
|
||||
|
||||
void XRenderPicture::fromImage(const QImage &img)
|
||||
{
|
||||
const int depth = img.depth();
|
||||
xcb_pixmap_t xpix = xcb_generate_id(connection());
|
||||
|
|
|
@ -74,6 +74,7 @@ public:
|
|||
XRenderPicture(xcb_pixmap_t pix, int depth);
|
||||
operator xcb_render_picture_t();
|
||||
private:
|
||||
void fromImage(const QImage &img);
|
||||
KSharedPtr< XRenderPictureData > d;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue