~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to plugins/expo/src/glow.h

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
42
42
 * and the size of the texture
43
43
 */
44
44
 
45
 
typedef struct _GlowTextureProperties {
 
45
typedef struct _GlowTextureProperties
 
46
{
46
47
    char *textureData;
47
48
    int  textureSize;
48
49
    int  glowOffset;
55
56
 * the quad on the glow
56
57
 */
57
58
 
58
 
class GlowQuad {
 
59
class GlowQuad
 
60
{
59
61
    public:
60
 
        CompRect          mBox;
 
62
 
 
63
        CompRect          mBox;
61
64
        GLTexture::Matrix mMatrix;
62
65
};
63
66