old
/
legacy-imlib2
3
0
Fork 4
Code Issues 3 Pull Requests Projects Releases Wiki Activity

x11_color.c: Make most __imlib_AllocColors*() functions static

This commit is contained in:
Kim Woelders 2022-03-06 14:13:31 +01:00
parent 3debc9d46d
commit 238bfdfa21
2 changed files with 64 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/lib/x11_color.c
View File

@ -70,62 +70,7 @@ __imlib_BestVisual(Display * d, int screen, int *depth_return)
return v;
}
DATA8 *
__imlib_AllocColorTable(Display * d, Colormap cmap, DATA8 * type_return,
Visual * v)
{
DATA8 *color_lut = NULL;
if (v->bits_per_rgb > 1)
{
if ((_max_colors >= 256)
&& (color_lut = __imlib_AllocColors332(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 216)
&& (color_lut = __imlib_AllocColors666(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 128)
&& (color_lut = __imlib_AllocColors232(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 64)
&& (color_lut = __imlib_AllocColors222(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 32)
&& (color_lut = __imlib_AllocColors221(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 16)
&& (color_lut = __imlib_AllocColors121(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
}
if ((_max_colors >= 8) && (color_lut = __imlib_AllocColors111(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
color_lut = __imlib_AllocColors1(d, cmap, v);
*type_return = _pal_type;
return color_lut;
}
DATA8 *
static DATA8 *
__imlib_AllocColors332(Display * d, Colormap cmap, Visual * v)
{
int r, g, b, i;
@ -182,7 +127,7 @@ __imlib_AllocColors332(Display * d, Colormap cmap, Visual * v)
return color_lut;
}
DATA8 *
static DATA8 *
__imlib_AllocColors666(Display * d, Colormap cmap, Visual * v)
{
int r, g, b, i;
@ -239,7 +184,7 @@ __imlib_AllocColors666(Display * d, Colormap cmap, Visual * v)
return color_lut;
}
DATA8 *
static DATA8 *
__imlib_AllocColors232(Display * d, Colormap cmap, Visual * v)
{
int r, g, b, i;
@ -296,7 +241,7 @@ __imlib_AllocColors232(Display * d, Colormap cmap, Visual * v)
return color_lut;
}
DATA8 *
static DATA8 *
__imlib_AllocColors222(Display * d, Colormap cmap, Visual * v)
{
int r, g, b, i;
@ -353,7 +298,7 @@ __imlib_AllocColors222(Display * d, Colormap cmap, Visual * v)
return color_lut;
}
DATA8 *
static DATA8 *
__imlib_AllocColors221(Display * d, Colormap cmap, Visual * v)
{
int r, g, b, i;
@ -411,7 +356,7 @@ __imlib_AllocColors221(Display * d, Colormap cmap, Visual * v)
return color_lut;
}
DATA8 *
static DATA8 *
__imlib_AllocColors121(Display * d, Colormap cmap, Visual * v)
{
int r, g, b, i;
@ -470,7 +415,7 @@ __imlib_AllocColors121(Display * d, Colormap cmap, Visual * v)
return color_lut;
}
DATA8 *
static DATA8 *
__imlib_AllocColors111(Display * d, Colormap cmap, Visual * v)
{
int r, g, b, i;
@ -530,7 +475,7 @@ __imlib_AllocColors111(Display * d, Colormap cmap, Visual * v)
return color_lut;
}
DATA8 *
static DATA8 *
__imlib_AllocColors1(Display * d, Colormap cmap, Visual * v)
{
XColor xcl;
@ -550,3 +495,58 @@ __imlib_AllocColors1(Display * d, Colormap cmap, Visual * v)
_pal_type = 6;
return color_lut;
}
DATA8 *
__imlib_AllocColorTable(Display * d, Colormap cmap, DATA8 * type_return,
Visual * v)
{
DATA8 *color_lut = NULL;
if (v->bits_per_rgb > 1)
{
if ((_max_colors >= 256)
&& (color_lut = __imlib_AllocColors332(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 216)
&& (color_lut = __imlib_AllocColors666(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 128)
&& (color_lut = __imlib_AllocColors232(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 64)
&& (color_lut = __imlib_AllocColors222(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 32)
&& (color_lut = __imlib_AllocColors221(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
if ((_max_colors >= 16)
&& (color_lut = __imlib_AllocColors121(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
}
if ((_max_colors >= 8) && (color_lut = __imlib_AllocColors111(d, cmap, v)))
{
*type_return = _pal_type;
return color_lut;
}
color_lut = __imlib_AllocColors1(d, cmap, v);
*type_return = _pal_type;
return color_lut;
}

17
src/lib/x11_color.h
View File

@ -8,23 +8,8 @@ extern DATA16 _max_colors;
int __imlib_XActualDepth(Display * d, Visual * v);
Visual *__imlib_BestVisual(Display * d, int screen,
int *depth_return);
DATA8 *__imlib_AllocColorTable(Display * d, Colormap cmap,
DATA8 * type_return, Visual * v);
DATA8 *__imlib_AllocColors332(Display * d, Colormap cmap,
Visual * v);
DATA8 *__imlib_AllocColors666(Display * d, Colormap cmap,
Visual * v);
DATA8 *__imlib_AllocColors232(Display * d, Colormap cmap,
Visual * v);
DATA8 *__imlib_AllocColors222(Display * d, Colormap cmap,
Visual * v);
DATA8 *__imlib_AllocColors221(Display * d, Colormap cmap,
Visual * v);
DATA8 *__imlib_AllocColors121(Display * d, Colormap cmap,
Visual * v);
DATA8 *__imlib_AllocColors111(Display * d, Colormap cmap,
Visual * v);
DATA8 *__imlib_AllocColors1(Display * d, Colormap cmap,
Visual * v);
#endif /* X11_COLOR_H */