X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fextrusion.c;fp=hacks%2Fglx%2Fextrusion.c;h=08786b29be7195f45c017eaa1ed7d0dbcfcf3459;hp=1073b7465e5c467eb4f207753545ac15b8e06a99;hb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213 diff --git a/hacks/glx/extrusion.c b/hacks/glx/extrusion.c index 1073b746..08786b29 100644 --- a/hacks/glx/extrusion.c +++ b/hacks/glx/extrusion.c @@ -218,11 +218,16 @@ static void Create_Texture(ModeInfo *mi, const char *filename) int format; if ( !strncmp(filename, "BUILTIN", 7)) - image = Generate_Image(&width, &height, &format); + { + BUILTIN: + image = Generate_Image(&width, &height, &format); + } else { XImage *ximage = xpm_file_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi), MI_COLORMAP (mi), filename); + if (!ximage) + goto BUILTIN; image = (GLubyte *) ximage->data; width = ximage->width; height = ximage->height;