Fix some typos in comments.

[mikachu/openbox.git] / render / mask.c

diff --git a/render/mask.c b/render/mask.c
index d0f375b..b6e3c44 100644 (file)
--- a/render/mask.c
+++ b/render/mask.c
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   mask.c for the Openbox window manager
+   Copyright (c) 2003-2007   Dana Jansens
+   Copyright (c) 2003        Derek Foreman
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "render.h"
 #include "color.h"
 #include "mask.h"
@@ -10,7 +29,7 @@ RrPixmapMask *RrPixmapMaskNew(const RrInstance *inst,
     m->width = w;
     m->height = h;
     /* round up to nearest byte */
-    m->data = g_memdup(data, (w * h + 7) / 8);
+    m->data = g_memdup(data, (w + 7) / 8 * h);
     m->mask = XCreateBitmapFromData(RrDisplay(inst), RrRootWindow(inst),
                                     data, w, h);
     return m;
@@ -27,8 +46,8 @@ void RrPixmapMaskFree(RrPixmapMask *m)
 
 void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area)
 {
-    int x, y;
-    if (m->mask == None) return; /* no mask given */
+    gint x, y;
+    if (m->mask == NULL) return; /* no mask given */
 
     /* set the clip region */
     x = area->x + (area->width - m->mask->width) / 2;
@@ -56,7 +75,7 @@ RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src)
     m->width = src->width;
     m->height = src->height;
     /* round up to nearest byte */
-    m->data = g_memdup(src->data, (src->width * src->height + 7) / 8);
+    m->data = g_memdup(src->data, (src->width + 7) / 8 * src->height);
     m->mask = XCreateBitmapFromData(RrDisplay(m->inst), RrRootWindow(m->inst),
                                     m->data, m->width, m->height);
     return m;