mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 04:20:27 +01:00
wrlib: add merged code for xpm support in 2 distinct functions
This patch is adding some merged code in create_rimage_from_xpm and is_xpm_error fonctions.
This commit is contained in:
committed by
Carlos R. Mafra
parent
556b0d77a1
commit
4005557bb3
115
wrlib/load_xpm.c
115
wrlib/load_xpm.c
@@ -3,6 +3,7 @@
|
||||
* Raster graphics library
|
||||
*
|
||||
* Copyright (c) 1997-2003 Alfredo K. Kojima
|
||||
* Copyright (c) 2014 Window Maker Team
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
@@ -31,6 +32,120 @@
|
||||
#include "wraster.h"
|
||||
#include "imgformat.h"
|
||||
|
||||
static RImage *create_rimage_from_xpm(RContext *context, XpmImage xpm)
|
||||
{
|
||||
Display *dpy = context->dpy;
|
||||
Colormap cmap = context->cmap;
|
||||
RImage *image;
|
||||
unsigned char *color_table[4];
|
||||
unsigned char *data;
|
||||
int i;
|
||||
int *p;
|
||||
|
||||
if (xpm.height < 1 || xpm.width < 1) {
|
||||
RErrorCode = RERR_BADIMAGEFILE;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (xpm.colorTable == NULL) {
|
||||
RErrorCode = RERR_BADIMAGEFILE;
|
||||
return NULL;
|
||||
}
|
||||
image = RCreateImage(xpm.width, xpm.height, True);
|
||||
if (!image)
|
||||
return NULL;
|
||||
|
||||
/* make color table */
|
||||
for (i = 0; i < 4; i++) {
|
||||
color_table[i] = malloc(xpm.ncolors * sizeof(unsigned char));
|
||||
if (!color_table[i]) {
|
||||
for (i = i - 1; i >= 0; i--) {
|
||||
if (color_table[i])
|
||||
free(color_table[i]);
|
||||
}
|
||||
RReleaseImage(image);
|
||||
RErrorCode = RERR_NOMEMORY;
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < xpm.ncolors; i++) {
|
||||
XColor xcolor;
|
||||
char *color = NULL;
|
||||
|
||||
if (xpm.colorTable[i].c_color)
|
||||
color = xpm.colorTable[i].c_color;
|
||||
else if (xpm.colorTable[i].g_color)
|
||||
color = xpm.colorTable[i].g_color;
|
||||
else if (xpm.colorTable[i].g4_color)
|
||||
color = xpm.colorTable[i].g4_color;
|
||||
else if (xpm.colorTable[i].m_color)
|
||||
color = xpm.colorTable[i].m_color;
|
||||
else if (xpm.colorTable[i].symbolic)
|
||||
color = xpm.colorTable[i].symbolic;
|
||||
|
||||
if (!color) {
|
||||
color_table[0][i] = 0xbe;
|
||||
color_table[1][i] = 0xbe;
|
||||
color_table[2][i] = 0xbe;
|
||||
color_table[3][i] = 0xff;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (strncmp(color, "None", 4) == 0) {
|
||||
color_table[0][i] = 0;
|
||||
color_table[1][i] = 0;
|
||||
color_table[2][i] = 0;
|
||||
color_table[3][i] = 0;
|
||||
continue;
|
||||
}
|
||||
if (XParseColor(dpy, cmap, color, &xcolor)) {
|
||||
color_table[0][i] = xcolor.red >> 8;
|
||||
color_table[1][i] = xcolor.green >> 8;
|
||||
color_table[2][i] = xcolor.blue >> 8;
|
||||
color_table[3][i] = 0xff;
|
||||
} else {
|
||||
color_table[0][i] = 0xbe;
|
||||
color_table[1][i] = 0xbe;
|
||||
color_table[2][i] = 0xbe;
|
||||
color_table[3][i] = 0xff;
|
||||
}
|
||||
}
|
||||
/* convert pixmap to RImage */
|
||||
p = (int *)xpm.data;
|
||||
data = image->data;
|
||||
for (i = 0; i < xpm.width * xpm.height; i++, p++) {
|
||||
*(data++) = color_table[0][*p];
|
||||
*(data++) = color_table[1][*p];
|
||||
*(data++) = color_table[2][*p];
|
||||
*(data++) = color_table[3][*p];
|
||||
}
|
||||
for (i = 0; i < 4; i++)
|
||||
free(color_table[i]);
|
||||
return image;
|
||||
}
|
||||
|
||||
static int is_xpm_error(int status)
|
||||
{
|
||||
if (status == XpmSuccess)
|
||||
return 0;
|
||||
|
||||
switch (status) {
|
||||
case XpmOpenFailed:
|
||||
RErrorCode = RERR_OPEN;
|
||||
break;
|
||||
case XpmFileInvalid:
|
||||
RErrorCode = RERR_BADIMAGEFILE;
|
||||
break;
|
||||
case XpmNoMemory:
|
||||
RErrorCode = RERR_NOMEMORY;
|
||||
break;
|
||||
default:
|
||||
RErrorCode = RERR_BADIMAGEFILE;
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
RImage *RGetImageFromXPMData(RContext * context, char **xpmData)
|
||||
{
|
||||
Display *dpy = context->dpy;
|
||||
|
||||
Reference in New Issue
Block a user