diff options
| author | Paul Tagliamonte <paultag@fluxbox.org> | 2011-12-10 16:43:24 (GMT) |
|---|---|---|
| committer | Paul Tagliamonte <paultag@fluxbox.org> | 2011-12-10 16:43:24 (GMT) |
| commit | 5e75c312050185267b05388a3991b932b447a75f (patch) | |
| tree | b7b39d55993e612f7bfb373a161f6f5cb4a1f81f /util/fbcompose/OpenGLTexPartitioner.cc | |
| parent | 596c283553fb2da7e9204621347462bb46b83c4d (diff) | |
| download | fluxbox_paul-5e75c312050185267b05388a3991b932b447a75f.zip fluxbox_paul-5e75c312050185267b05388a3991b932b447a75f.tar.bz2 | |
Fixing up the branch to use some of the changes that were made since the fork.fluxbox-gsoc-2011-integration
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()) { |