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/OpenGLTexPartitioner.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/OpenGLTexPartitioner.cc')
-rw-r--r-- | util/fbcompose/OpenGLTexPartitioner.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/fbcompose/OpenGLTexPartitioner.cc b/util/fbcompose/OpenGLTexPartitioner.cc index 9ff810b..6d01c9d 100644 --- a/util/fbcompose/OpenGLTexPartitioner.cc +++ b/util/fbcompose/OpenGLTexPartitioner.cc | |||
@@ -73,7 +73,7 @@ void OpenGL2DTexturePartition::setPixmap(Pixmap pixmap, bool manage_pixmap, int | |||
73 | while ((size_t)(total_units) > m_partitions.size()) { | 73 | while ((size_t)(total_units) > m_partitions.size()) { |
74 | TexturePart partition; | 74 | TexturePart partition; |
75 | partition.borders = 0; | 75 | partition.borders = 0; |
76 | partition.texture = new OpenGL2DTexture(m_screen, m_swizzle_alpha_to_one); | 76 | partition.texture.reset( new OpenGL2DTexture(m_screen, m_swizzle_alpha_to_one) ); |
77 | m_partitions.push_back(partition); | 77 | m_partitions.push_back(partition); |
78 | } | 78 | } |
79 | while ((size_t)(total_units) < m_partitions.size()) { | 79 | while ((size_t)(total_units) < m_partitions.size()) { |