tTh/libtthimage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more clean...

Browse Source
This commit is contained in:
tTh
2022-08-22 17:53:30 +02:00
parent ce49cc7a08
commit 530d2755d3
9 changed files with 65 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Lib/palettes.c
+30 -57
View File
@@ -24,23 +24,19 @@ Image_save_color_Map(char *file, char *name, RGB_map *map)
int foo;
FILE *fp;
if ( (fp=fopen(file, "w")) == NULL )
{
if ( (fp=fopen(file, "w")) == NULL ) {
fprintf(stderr, "Save Color Map: err fopen\n");
return FILE_CREATE_ERR;
}
if ( map->nbre == 0 )
{
if ( map->nbre == 0 ) {
fprintf(stderr, "Save Color Map: empty map\n");
}
for (foo=0; foo<map->nbre; foo++)
{
for (foo=0; foo<map->nbre; foo++) {
fprintf(fp, "%3d %3d %3d",
map->red[foo], map->green[foo], map->blue[foo]);
switch (foo)
{
switch (foo) {
case 0:
if (name != NULL)
fprintf(fp, " Name: %s", name);
@@ -85,20 +81,17 @@ FILE *fp;
int nbre, r, g, b, foo, errcode;
char buffer[256];
if ( name != NULL )
{
if (strlen(name)>IMG_OBJNAME_LEN)
return STRING_TOO_LONG;
if ( name != NULL ) {
if (strlen(name)>IMG_OBJNAME_LEN) return STRING_TOO_LONG;
strcpy(where->name, name);
}
else strcpy(where->name, "no name");
/*
* patch du 11 Décembre 2001: on utilise une fonction qui recherche le
* fichier dans differents endroits. Cf 'musopen.c' pour + de détails.
* fichier dans differents endroits. Cf 'mustopen.c' pour + de détails.
*/
if ((fp=Image_must_fopen(file, "r", 0)) == NULL)
{
if ((fp=Image_must_fopen(file, "r", 0)) == NULL) {
/* safety poke */
where->nbre = 0;
fprintf(stderr, "Load color MAP: %s not found\n", file);
@@ -108,11 +101,9 @@ if ((fp=Image_must_fopen(file, "r", 0)) == NULL)
nbre = 0; errcode = 0;
where->nbre = 0; /* kill bad value */
while ( fgets(buffer, 250, fp) != NULL )
{
while ( fgets(buffer, 250, fp) != NULL ) {
foo = sscanf(buffer, "%d %d %d", &r, &g, &b);
if (foo != 3)
{
if (foo != 3) {
fprintf(stderr, "line %d: [%s]\n", nbre, buffer);
errcode = BAD_COLOR_NUMBER; break;
}
@@ -120,8 +111,7 @@ while ( fgets(buffer, 250, fp) != NULL )
where->green[nbre] = g;
where->blue[nbre] = b;
nbre++;
if (nbre > 256)
{
if (nbre > 256) {
fprintf(stderr, "load color map: nbre = %d\n", nbre);
errcode = MAP_TOO_BIG; break;
}
@@ -146,8 +136,7 @@ int foo;
fprintf(stderr, "Image attach Map: cette fonction n'est pas finie\n");
foo = Image_load_color_Map(nom_map, "", &map);
if (foo == 0)
{
if (foo == 0) {
fprintf(stderr, "Attach Map: foo is zero ?\n");
}
@@ -163,15 +152,13 @@ int foo;
fprintf(stderr, "making a random map named '%s'\n", nom);
if (nbre < 0 || nbre > 255)
{
if (nbre < 0 || nbre > 255) {
fprintf(stderr, "make random map: nbre = %d\n", map->nbre);
return BAD_COLOR_NUMBER;
}
map->nbre = nbre;
for (foo=0; foo<nbre; foo++)
{
for (foo=0; foo<nbre; foo++) {
map->red[foo] = rand() & 0xff;
map->green[foo] = rand() & 0xff;
map->blue[foo] = rand() & 0xff;
@@ -196,8 +183,7 @@ strcpy(map->name, "* FMBL roulaize *");
map->nbre = 64;
for (foo=0; foo<64; foo++)
{
for (foo=0; foo<64; foo++) {
r = ((foo >> 0) & 0x03) * 85;
g = ((foo >> 2) & 0x03) * 85;
b = ((foo >> 4) & 0x03) * 85;
@@ -232,8 +218,7 @@ for (foo=0; foo<8; foo++)
fprintf(stderr, " %3d %g\n", foo, pars[foo]);
#endif
for (foo=0; foo<256; foo++)
{
for (foo=0; foo<256; foo++) {
dfoo = (double)foo / 255.0 * M_PI * 2;
dra = sin((pars[0] * dfoo) + pars[3]);
dga = sin((pars[1] * dfoo) + pars[4]);
@@ -262,27 +247,23 @@ fprintf(stderr, "Image mix palette: work in progress...\n");
k2 = 10000 - k;
for (idx=0; idx<256; idx++)
{
for (idx=0; idx<256; idx++) {
if (idx < p1->nbre)
{
r1 = p1->red[idx];
g1 = p1->green[idx];
b1 = p1->blue[idx];
}
else
{
else {
r1 = g1 = b1 = 0;
}
if (idx < p2->nbre)
{
if (idx < p2->nbre) {
r2 = p2->red[idx];
g2 = p2->green[idx];
b2 = p2->blue[idx];
}
else
{
else {
r2 = g2 = b2 = 0;
}
@@ -315,19 +296,16 @@ int foo;
int maxval = -99999;
#endif
if (p->nbre < 1 || p->nbre > 256)
{
if (p->nbre < 1 || p->nbre > 256) {
fprintf(stderr, "%s: RGB_map %p has %d entries ?\n",
__func__, p, p->nbre);
}
for (foo=0; foo<p->nbre; foo++)
{
for (foo=0; foo<p->nbre; foo++) {
p->red[foo] = round((double)p->red[foo] * v);
p->green[foo] = round((double)p->green[foo] * v);
p->blue[foo] = round((double)p->blue[foo] * v);
if (clip_it)
{
if (clip_it) {
if (p->red[foo] < 0) p->red[foo] = 0;
if (p->red[foo] > 255) p->red[foo] = 255;
if (p->green[foo] < 0) p->green[foo] = 0;
@@ -356,19 +334,16 @@ int Image_scale3_palette(RGB_map *p, double rk, double gk, double bk,
{
int foo;
if (p->nbre < 1 || p->nbre > 256)
{
if (p->nbre < 1 || p->nbre > 256) {
fprintf(stderr, "%s: RGB_map %p has %d entries ?\n",
__func__, p, p->nbre);
}
for (foo=0; foo<p->nbre; foo++)
{
for (foo=0; foo<p->nbre; foo++) {
p->red[foo] = round((double)p->red[foo] * rk);
p->green[foo] = round((double)p->green[foo] * gk);
p->blue[foo] = round((double)p->blue[foo] * bk);
if (clip_it)
{
if (clip_it) {
if (p->red[foo] < 0) p->red[foo] = 0;
if (p->red[foo] > 255) p->red[foo] = 255;
if (p->green[foo] < 0) p->green[foo] = 0;
@@ -395,8 +370,7 @@ int foo;
fprintf(stderr, "%s (( %p '%s' '%s' ))\n", __func__, p, fname, comment);
#endif
if (NULL==p)
{
if (NULL == p) {
fprintf(stderr, "in %s, can't gruik au nill map\n", __func__);
abort();
}
@@ -405,8 +379,7 @@ if (NULL==p)
fprintf(stderr, "we have %d colors in palette at %p\n", p->nbre, p);
#endif
if ( (fp=fopen(fname, "w")) == NULL )
{
if ( (fp=fopen(fname, "w")) == NULL ) {
fprintf(stderr, "%s: err fopen %s\n", __func__, fname);
return FILE_CREATE_ERR;
}
@@ -414,8 +387,8 @@ fprintf(fp, "P3\n%d 1\n255\n", p->nbre);
if (NULL != comment) {
fprintf(fp, "# %s\n", comment);
}
for (foo=0; foo<p->nbre; foo++)
{
for (foo=0; foo<p->nbre; foo++) {
fprintf(fp, "%3d %3d %3d\n", p->red[foo], p->green[foo], p->blue[foo]);
}