From 3e31ba0630d42e66ad7006871bcbf2b483d55860 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 1 Apr 2013 16:25:31 +0000 Subject: More C cleanups --- src/graph/view3D/lighting3d.c | 6 ++++-- src/graph/view3D/quit3d.c | 6 ++++-- src/graph/view3D/save3d.c | 6 ++++-- src/graph/view3D/viewport3d.c | 4 ++-- src/graph/view3D/volume3d.c | 6 ++++-- 5 files changed, 18 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/graph/view3D/lighting3d.c b/src/graph/view3D/lighting3d.c index ff6f9dad..666c708c 100644 --- a/src/graph/view3D/lighting3d.c +++ b/src/graph/view3D/lighting3d.c @@ -94,9 +94,11 @@ makeLightingPanel(void) Pixmap lightbits,lightmask; XColor foreColor, backColor; - lightbits = XCreateBitmapFromData(dsply,rtWindow, lightBitmap_bits, + lightbits = XCreateBitmapFromData(dsply,rtWindow, + (const char*) lightBitmap_bits, lightBitmap_width,lightBitmap_height); - lightmask = XCreateBitmapFromData(dsply,rtWindow, lightMask_bits, + lightmask = XCreateBitmapFromData(dsply,rtWindow, + (const char*) lightMask_bits, lightMask_width,lightMask_height); cwAttrib.background_pixel = backgroundColor; cwAttrib.border_pixel = foregroundColor; diff --git a/src/graph/view3D/quit3d.c b/src/graph/view3D/quit3d.c index 4a76103b..bcbcd707 100644 --- a/src/graph/view3D/quit3d.c +++ b/src/graph/view3D/quit3d.c @@ -70,9 +70,11 @@ makeQuitPanel(void) Pixmap quitbits, quitmask; XColor quitterColor,qColor; - quitbits = XCreateBitmapFromData(dsply,rtWindow, volumeBitmap_bits, + quitbits = XCreateBitmapFromData(dsply,rtWindow, + (const char*) volumeBitmap_bits, volumeBitmap_width,volumeBitmap_height); - quitmask = XCreateBitmapFromData(dsply,rtWindow,volumeMask_bits, + quitmask = XCreateBitmapFromData(dsply,rtWindow, + (const char*) volumeMask_bits, volumeMask_width,volumeMask_height); quitter.background_pixel = backgroundColor; quitter.border_pixel = foregroundColor; diff --git a/src/graph/view3D/save3d.c b/src/graph/view3D/save3d.c index 5c41eb72..be86090f 100644 --- a/src/graph/view3D/save3d.c +++ b/src/graph/view3D/save3d.c @@ -70,9 +70,11 @@ makeSavePanel(void) Pixmap savebits, savemask; XColor saveColor,sColor; - savebits = XCreateBitmapFromData(dsply,rtWindow, volumeBitmap_bits, + savebits = XCreateBitmapFromData(dsply,rtWindow, + (const char*) volumeBitmap_bits, volumeBitmap_width,volumeBitmap_height); - savemask = XCreateBitmapFromData(dsply,rtWindow,volumeMask_bits, + savemask = XCreateBitmapFromData(dsply,rtWindow, + (const char*) volumeMask_bits, volumeMask_width,volumeMask_height); saver.background_pixel = backgroundColor; saver.border_pixel = foregroundColor; diff --git a/src/graph/view3D/viewport3d.c b/src/graph/view3D/viewport3d.c index d560f9e5..eed96b72 100644 --- a/src/graph/view3D/viewport3d.c +++ b/src/graph/view3D/viewport3d.c @@ -631,10 +631,10 @@ makeViewport (void) TRANSLATE(-viewport->deltaX,-viewport->deltaY,0.0,T); /**** make the windows for the viewport ****/ spadbits = XCreateBitmapFromData(dsply,rtWindow, - spadBitmap_bits, + (const char*) spadBitmap_bits, spadBitmap_width,spadBitmap_height); spadmask = XCreateBitmapFromData(dsply,rtWindow, - spadMask_bits, + (const char*) spadMask_bits, spadMask_width,spadMask_height); viewAttrib.background_pixel = backgroundColor; viewAttrib.border_pixel = foregroundColor; diff --git a/src/graph/view3D/volume3d.c b/src/graph/view3D/volume3d.c index 1a44affc..348a39d6 100644 --- a/src/graph/view3D/volume3d.c +++ b/src/graph/view3D/volume3d.c @@ -266,9 +266,11 @@ makeVolumePanel (void) Pixmap volumebits, volumemask; XColor foreColor, backColor; - volumebits = XCreateBitmapFromData(dsply,rtWindow,volumeBitmap_bits, + volumebits = XCreateBitmapFromData(dsply,rtWindow, + (const char*) volumeBitmap_bits, volumeBitmap_width,volumeBitmap_height); - volumemask = XCreateBitmapFromData(dsply,rtWindow,volumeMask_bits, + volumemask = XCreateBitmapFromData(dsply,rtWindow, + (const char*) volumeMask_bits, volumeMask_width,volumeMask_height); cwAttrib.background_pixel = backgroundColor; cwAttrib.border_pixel = foregroundColor; -- cgit v1.2.3