comparison src/image.c @ 112438:11f1b4757236

* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash when calling XpmCreatePixmapFromData.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 22 Jan 2011 20:33:12 -0800
parents 9de5a68b57e1
children
comparison
equal deleted inserted replaced
112437:f3d875901372 112438:11f1b4757236
3332 attrs.colormap = FRAME_X_COLORMAP (f); 3332 attrs.colormap = FRAME_X_COLORMAP (f);
3333 attrs.valuemask |= XpmVisual; 3333 attrs.valuemask |= XpmVisual;
3334 attrs.valuemask |= XpmColormap; 3334 attrs.valuemask |= XpmColormap;
3335 3335
3336 rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 3336 rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
3337 bits, &bitmap, &mask, &attrs); 3337 (char **) bits, &bitmap, &mask, &attrs);
3338 if (rc != XpmSuccess) 3338 if (rc != XpmSuccess)
3339 { 3339 {
3340 XpmFreeAttributes (&attrs); 3340 XpmFreeAttributes (&attrs);
3341 return -1; 3341 return -1;
3342 } 3342 }