3 files changed, 9 insertions, 4 deletions

diff --git a/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc b/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc
index 97faf34..6448f92 100644
--- a/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc
+++ b/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc
@@ -96,7 +96,8 @@ void PreviewPlugin::windowCreated(const BaseCompWindow &window) {
     const OpenGLWindow &gl_window = dynamic_cast<const OpenGLWindow&>(window);
 
     OpenGLRenderingJob job;
-    job.prim_pos_buffer = new OpenGLBuffer(openGLScreen(), GL_ARRAY_BUFFER);
+    job.prim_pos_buffer.reset(
+        new OpenGLBuffer(openGLScreen(), GL_ARRAY_BUFFER));
     job.main_tex_coord_buffer = openGLScreen().defaultTexCoordBuffer();
     job.shape_tex_coord_buffer = openGLScreen().defaultTexCoordBuffer();
     job.alpha = PREVIEW_ALPHA / 255.0f;
diff --git a/util/fbcompose/plugins/xrender/fade/FadePlugin.cc b/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
index ac01189..e9fd97c 100644
--- a/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
+++ b/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
@@ -74,7 +74,10 @@ void FadePlugin::windowMapped(const BaseCompWindow &window) {
     while (true) {
         if (it == m_negative_fades.end()) {
             fade.fade_alpha = 0;
-            fade.fade_picture = new XRenderPicture(xrenderScreen(), m_fade_pict_format, xrenderScreen().pictFilter());
+            fade.fade_picture.reset(
+                new XRenderPicture(
+                    xrenderScreen(), m_fade_pict_format,
+                    xrenderScreen().pictFilter()));
             break;
         } else if (it->window_id == window.window()) {
             fade.fade_alpha = it->fade_alpha;
@@ -105,7 +108,8 @@ void FadePlugin::windowUnmapped(const BaseCompWindow &window) {
         m_positive_fades.erase(it);
     } else {
         fade.fade_alpha = 255;
-        fade.fade_picture = new XRenderPicture(xrenderScreen(), m_fade_pict_format, xrenderScreen().pictFilter());
+        fade.fade_picture.reset( new XRenderPicture(xrenderScreen(),
+            m_fade_pict_format, xrenderScreen().pictFilter()));
     }
 
     if (xr_window.contentPicture()->pictureHandle() != None) {
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
     unsigned long mask_color = 0x01010101 * PREVIEW_ALPHA;
     Pixmap mask_pixmap = createSolidPixmap(screen, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, mask_color);
     XRenderPictFormat *pict_format = XRenderFindStandardFormat(display(), PictStandardARGB32);
-    m_mask_picture = new XRenderPicture(xrenderScreen(), pict_format, FilterFast);
+    m_mask_picture.reset( new XRenderPicture(xrenderScreen(), pict_format, FilterFast));
     m_mask_picture->setPixmap(mask_pixmap, true);
 
     m_previous_damage.width = 0;