aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2019-02-02 09:53:26 +0100
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2019-02-02 09:53:26 +0100
commit979cc2e0ee235fd6f1bbb5e52fae25111ba87430 (patch)
tree2358df82a1abb6af85b120c5fc9e592ec3c07ae6
parentaee6d0791f2aba3a3f93d3d940013c0a4e49f50d (diff)
downloadtracker.lv2-979cc2e0ee235fd6f1bbb5e52fae25111ba87430.zip
tracker.lv2-979cc2e0ee235fd6f1bbb5e52fae25111ba87430.tar.gz
tracker.lv2-979cc2e0ee235fd6f1bbb5e52fae25111ba87430.tar.bz2
tracker.lv2-979cc2e0ee235fd6f1bbb5e52fae25111ba87430.tar.xz
Squashed 'pugl/' changes from 035884a..2986f31
2986f31 omk: fix compiler warnings. 371c2ec omk: fix memory leak. git-subtree-dir: pugl git-subtree-split: 2986f3130eb5f9d0fd36e098a9b401bc5a44f4ce
-rw-r--r--pugl/cairo_gl.h3
-rw-r--r--pugl/pugl_internal.h2
-rw-r--r--pugl/pugl_x11.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/pugl/cairo_gl.h b/pugl/cairo_gl.h
index 5c0f1f9..fb4cb2a 100644
--- a/pugl/cairo_gl.h
+++ b/pugl/cairo_gl.h
@@ -48,7 +48,8 @@ pugl_cairo_gl_free(PuglCairoGL* ctx)
}
static void
-pugl_cairo_gl_configure(PuglCairoGL* ctx, int width, int height)
+pugl_cairo_gl_configure(PuglCairoGL* ctx,
+ int width __attribute__((unused)), int height __attribute__((unused)))
{
glDisable(GL_DEPTH_TEST);
glEnable(GL_BLEND);
diff --git a/pugl/pugl_internal.h b/pugl/pugl_internal.h
index 45084de..5976cd7 100644
--- a/pugl/pugl_internal.h
+++ b/pugl/pugl_internal.h
@@ -64,7 +64,7 @@ struct PuglViewImpl {
PuglInternals* puglInitInternals(void);
PuglView*
-puglInit(int* pargc, char** argv)
+puglInit(int* pargc __attribute__((unused)), char** argv __attribute__((unused)))
{
PuglView* view = (PuglView*)calloc(1, sizeof(PuglView));
if (!view) {
diff --git a/pugl/pugl_x11.c b/pugl/pugl_x11.c
index 28fe99f..5c20782 100644
--- a/pugl/pugl_x11.c
+++ b/pugl/pugl_x11.c
@@ -476,6 +476,7 @@ translateEvent(PuglView* view, XEvent xevent)
if (!strcmp(type, "WM_PROTOCOLS")) {
event.type = PUGL_CLOSE;
}
+ XFree(type);
break;
}
case ConfigureNotify:
@@ -521,6 +522,7 @@ translateEvent(PuglView* view, XEvent xevent)
case 7: event.scroll.dx = 1.0f; break;
}
}
+ __attribute__((fallthrough));
// nobreak
case ButtonRelease:
if (xevent.xbutton.button < 4 || xevent.xbutton.button > 7) {
@@ -798,7 +800,7 @@ puglGetNativeWindow(PuglView* view)
}
void*
-puglGetContext(PuglView* view)
+puglGetContext(PuglView* view __attribute__((unused)))
{
#ifdef PUGL_HAVE_CAIRO
if (view->ctx_type & PUGL_CAIRO) {