diff options
author | Paul Tagliamonte <paultag@fluxbox.org> | 2011-12-08 14:50:56 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2011-12-08 14:51:41 (GMT) |
commit | 1311440217ca494aa2201f405745eb804a7f3112 (patch) | |
tree | b50753ed1e30b23ab14e9e00b479fe8309bb4df7 /util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc | |
parent | d619086b577c7b2a50db00a8cb3dd79a6d33d86b (diff) | |
download | fluxbox_paul-1311440217ca494aa2201f405745eb804a7f3112.zip fluxbox_paul-1311440217ca494aa2201f405745eb804a7f3112.tar.bz2 |
Fixing up the branch to use some of the changes that were made since the fork.
The operator "=" was ditched in favor of .reset(
because (I'm quoting here): "it was an accident waiting
to happen".
Well. It builds now.
Diffstat (limited to 'util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc')
-rw-r--r-- | util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc b/util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc index 14a0e61..fdc4d29 100644 --- a/util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc +++ b/util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc | |||
@@ -59,7 +59,7 @@ PreviewPlugin::PreviewPlugin(const BaseScreen &screen, const std::vector<FbTk::F | |||
59 | unsigned long mask_color = 0x01010101 * PREVIEW_ALPHA; | 59 | unsigned long mask_color = 0x01010101 * PREVIEW_ALPHA; |
60 | Pixmap mask_pixmap = createSolidPixmap(screen, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, mask_color); | 60 | Pixmap mask_pixmap = createSolidPixmap(screen, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, mask_color); |
61 | XRenderPictFormat *pict_format = XRenderFindStandardFormat(display(), PictStandardARGB32); | 61 | XRenderPictFormat *pict_format = XRenderFindStandardFormat(display(), PictStandardARGB32); |
62 | m_mask_picture = new XRenderPicture(xrenderScreen(), pict_format, FilterFast); | 62 | m_mask_picture.reset( new XRenderPicture(xrenderScreen(), pict_format, FilterFast)); |
63 | m_mask_picture->setPixmap(mask_pixmap, true); | 63 | m_mask_picture->setPixmap(mask_pixmap, true); |
64 | 64 | ||
65 | m_previous_damage.width = 0; | 65 | m_previous_damage.width = 0; |