← Back to branch summary

~nabil-stendardo/ubuntu/quantal/compiz/fix-segfault-related-to-shaders-and-uniforms

« back to all changes in this revision

Viewing changes to plugins/copytex/src/copytex.cpp

  • Committer: timo.jyrinki at canonical
  • Date: 2012-09-18 07:56:42 UTC
  • Revision ID: timo.jyrinki@canonical.com-20120918075642-3dkx9ccbg77bk1gy
https://launchpad.net/bugs/927168
Check that pixmaps which aren't managed by us actually exist before
binding. (LP: #927168)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/copytex/src/copytex.cpp
37
37
};
38
38
 
39
39
GLTexture::List
40
 
CopyPixmap::bindPixmapToTexture (Pixmap pixmap,
41
 
                                 int width,
42
 
                                 int height,
43
 
                                 int depth)
 
40
CopyPixmap::bindPixmapToTexture (Pixmap                       pixmap,
 
41
                                 int                          width,
 
42
                                 int                          height,
 
43
                                 int                          depth,
 
44
                                 compiz::opengl::PixmapSource source)
44
45
{
45
46
    if (depth != 32 && depth != 24)
46
47
        return GLTexture::List ();