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

Compare commits

base: tTh:ba7ba3d66638dc85b2e066ecb57852a8716cb587
Branches Tags
tTh:master
..
compare: tTh:226d1b39a9d7412bb9853af88d07336f2fcd274a
Branches Tags
tTh:master

No commits in common. "ba7ba3d66638dc85b2e066ecb57852a8716cb587" and "226d1b39a9d7412bb9853af88d07336f2fcd274a" have entirely different histories.
ba7ba3d666 ... 226d1b39a9

14 changed files with 84 additions and 125 deletions
Show Stats Expand all files Collapse all files

50
Lib/patterns.c
View File

@ -9,7 +9,8 @@
#include "../tthimage.h"
/*::------------------------------------------------------------------::*/
int Image_pattern_000(Image_Desc *img, int foo)
int
Image_pattern_000(Image_Desc *img, int foo)
{
int x, y, xx, yy, r, g, b;
@ -17,9 +18,11 @@ int x, y, xx, yy, r, g, b;
fprintf(stderr, "%s : foo = %d\n", __func__, foo);
#endif
for (x=0; x<img->width; x++) {
for (x=0; x<img->width; x++)
{
xx = (x * 256) / img->width;
for (y=0; y<img->height; y++) {
for (y=0; y<img->height; y++)
{
yy = (y * 256) / img->height;
r = xx & yy & foo;
g = ((xx * yy) & 0xf8 );
@ -34,7 +37,8 @@ for (x=0; x<img->width; x++) {
return FUNC_IS_BETA;
}
/*::------------------------------------------------------------------::*/
int Image_pattern_001(Image_Desc *img, int foo)
int
Image_pattern_001(Image_Desc *img, int foo)
{
int x, y;
@ -46,10 +50,11 @@ for (x=0; x<img->width; x++)
for (y=0; y<img->height; y++)
Image_plotRGB(img, x, y, x^y^foo, (x*y)>>4, x&y);
return FUNC_IS_BETA;
return FUNC_NOT_FINISH;
}
/*::------------------------------------------------------------------::*/
int Image_pattern_002(Image_Desc *img, int foo)
int
Image_pattern_002(Image_Desc *img, int foo)
{
int x, y, x2, y2;
@ -57,9 +62,11 @@ int x, y, x2, y2;
fprintf(stderr, "Pattern 002: %d\n", foo);
#endif
for (x=0; x<img->width; x++) {
for (x=0; x<img->width; x++)
{
x2 = (x * 256) / img->width;
for (y=0; y<img->height; y++) {
for (y=0; y<img->height; y++)
{
y2 = (y * 256) / img->height;
Image_plotRGB(img, x, y, (x2/2)&(y2/2)&foo, (x2*y2)>>3, x2^y2);
}
@ -68,7 +75,8 @@ for (x=0; x<img->width; x++) {
return FUNC_IS_BETA;
}
/*::------------------------------------------------------------------::*/
int Image_pattern_003(Image_Desc *img, int foo)
int
Image_pattern_003(Image_Desc *img, int foo)
{
int x, x2, y, y2;
@ -77,9 +85,11 @@ fprintf(stderr, "Pattern 003: foo is %d\n", foo);
#endif
/* added some ugly code the 28 february 2008 */
for (x=0; x<img->width; x++) {
for (x=0; x<img->width; x++)
{
x2 = (x * 256) / img->width;
for (y=0; y<img->height; y++) {
for (y=0; y<img->height; y++)
{
y2 = (y * 256) / img->height;
Image_plotRGB(img, x, y, (x2/4)&(y2/4)&foo, (x2*y2)>>5, x2^y2);
}
@ -88,7 +98,8 @@ for (x=0; x<img->width; x++) {
return FUNC_NOT_FINISH;
}
/*::------------------------------------------------------------------::*/
int Image_pattern_004(Image_Desc *img, int a, int b, int c, int d)
int
Image_pattern_004(Image_Desc *img, int a, int b, int c, int d)
{
#if DEBUG_LEVEL
fprintf(stderr, "Pattern 004: %d, %d, %d, %d\n", a, b, c, d);
@ -111,9 +122,11 @@ if (NULL == map) {
return NULL_POINTER;
}
for (y=0; y<img->height; y++) {
for (y=0; y<img->height; y++)
{
fy = (double)y;
for (x=0; x<img->width; x++) {
for (x=0; x<img->width; x++)
{
fx = (double)x;
idx = (int)(127.0+(sin(fx)*cos(fy)*254.99));
@ -127,7 +140,8 @@ for (y=0; y<img->height; y++) {
return FUNC_NOT_FINISH;
}
/*::------------------------------------------------------------------::*/
int Image_pattern_042(Image_Desc *img, int foo)
int
Image_pattern_042(Image_Desc *img, int foo)
{
int x, y, r, g, b;
@ -136,8 +150,10 @@ fprintf(stderr, "Pattern 042: threshold level is %d\n", foo);
#endif
r = g = b = 42;
for (x=0; x<img->width; x++) {
for (y=0; y<img->height; y++) {
for (x=0; x<img->width; x++)
{
for (y=0; y<img->height; y++)
{
r += rand() % 4;
if (r > foo) r = 0;

49
Lib/patterns3.c
View File

@ -16,15 +16,15 @@
/*
* c'est quasiment impossible de documenter cette fonction.
*/
int Image_pattern_100(Image_Desc *dst, int kr, int kg, int kb)
int
Image_pattern_100(Image_Desc *dst, int kr, int kg, int kb)
{
int x, y, r,g, b;
fprintf(stderr, ">>> %s ( %p %d %d %d )\n", __func__,
dst, kr, kg, kb);
for (x=0; x<dst->width; x++) {
for (y=0; y<dst->height; y++) {
for (x=0; x<dst->width; x++)
{
for (y=0; y<dst->height; y++)
{
r = abs(x+y-(dst->width/3)) * kr;
g = abs(x-y-(dst->height/3)) * kg;
b = (rand() % 42) + kb;
@ -36,19 +36,19 @@ for (x=0; x<dst->width; x++) {
return FUNC_IS_BETA;
}
/*::------------------------------------------------------------------::*/
int Image_pattern_101(Image_Desc *dst, int kr, int kg, int kb)
int
Image_pattern_101(Image_Desc *dst, int kr, int kg, int kb)
{
int x, y, r,g, b;
fprintf(stderr, ">>> %s ( %p %d %d %d )\n", __func__,
dst, kr, kg, kb);
if (kr == 0) kr = 1;
if (kg == 0) kg = 1;
if (kb == 0) kb = 1;
for (x=0; x<dst->width; x++) {
for (y=0; y<dst->height; y++) {
for (x=0; x<dst->width; x++)
{
for (y=0; y<dst->height; y++)
{
if (x < dst->width/2)
{ r=x/kr; g=y/kg; b=x/kb; }
else
@ -59,15 +59,18 @@ for (x=0; x<dst->width; x++) {
return FUNC_IS_BETA;
}
/*::------------------------------------------------------------------::*/
int Image_pattern_102(Image_Desc *dst, int param, int kr, int kg, int kb)
int
Image_pattern_102(Image_Desc *dst, int param, int kr, int kg, int kb)
{
int x, y, r,g, b;
for (x=0; x<dst->width; x++) {
for (y=0; y<dst->height; y++) {
for (x=0; x<dst->width; x++)
{
for (y=0; y<dst->height; y++)
{
r = x ^ kr;
g = y ^ kg;
b = (x+y+param) ^ kb;
b = (x+y) ^ kb;
Image_plotRGB(dst, x, y, r, g, b);
}
}
@ -77,20 +80,26 @@ return FUNC_NOT_FINISH;
/*::------------------------------------------------------------------::*/
/* hop, 31 mars 2008, une petite evolution stochastique de base...
* */
int Image_pattern_103(Image_Desc *dst, int param, int kr, int kg, int kb)
int
Image_pattern_103(Image_Desc *dst, int param, int kr, int kg, int kb)
{
int x, y, r, g, b;
long surface;
double dx, dy;
#if DEBUG_LEVEL
fprintf(stderr, "%s: acting on image %p\n", __func__, dst);
#endif
for (x=0; x<dst->width; x++) {
surface = dst->width * dst->height;
for (x=0; x<dst->width; x++)
{
dx = (double)x / (double)dst->width;
for (y=0; y<dst->height; y++) {
for (y=0; y<dst->height; y++)
{
dy = (double)x / (double)dst->height;
r = (int)(256.0 * sqrt(dx * dy)); /* XXX */
r = (int)round(256.0 * sqrt(dx * dy)); /* XXX */
g = b = rand() & 0xf0;
Image_plotRGB(dst, x, y, r, g, b);
}

12
Lib/patterns4.c
View File

@ -23,12 +23,6 @@ int x, y, v, delta;
delta = high - low;
if (0 == delta) {
fprintf(stderr, "%s: bad low/high parameters %d %d <- delta is 0\n",
__func__, low, high);
return DIVISOR_IS_ZERO;
}
for (x=0; x<dst->width; x++)
{
for (y=0; y<dst->height; y++)
@ -50,12 +44,6 @@ int x, y, r, g, b, delta;
delta = high - low;
if (0 == delta) {
fprintf(stderr, "%s: bad low/high parameters %d %d <- delta is 0\n",
__func__, low, high);
return DIVISOR_IS_ZERO;
}
for (x=0; x<dst->width; x++)
{
for (y=0; y<dst->height; y++)

2
Tools/Makefile
View File

@ -81,7 +81,7 @@ tga_extract: tga_extract.c $(DEPS) fonctions.o
# gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_pattern: tga_pattern.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
#-----------------------------------------------------------------

11
Tools/README.md
View File

@ -43,14 +43,6 @@ Paramètres mal documentés.
## tga_combine
```
Usage:
tga_combine s1.tga s2.tga MODE d.tga [PARAMS]
```
Il existe plein de façon de combiner deux images, la commande
`testtga list` vous les fera découvrir, la cinquième va vous étonner.
## tga_dither
Comment drastiquement réduire le nombre de couleurs d'une image ?
@ -75,9 +67,6 @@ La génération de diverses image de test ou de calibration.
## tga_pattern
Les résultats sont très ésotériques et l'aide en ligne est
vraiment trop nulle...
## tga_remap
## tga_television

4
Tools/fonctions.c
View File

@ -159,10 +159,6 @@ cptr = strtok(cptr, ",");
while (NULL != cptr) {
fprintf(stderr, "%3d %p = '%s'\n", idx, cptr, cptr);
foo = sscanf(cptr, "%d", &val);
if (1 != foo) {
fprintf(stderr, "%s: err sscanf on '%s'\n", __func__, cptr);
exit(1);
}
/*
* no error check ?
*/

2
Tools/tga_alpha.c
View File

@ -58,8 +58,8 @@ int main(int argc, char *argv[])
{
Image_Desc *src, *dst;
int foo;
RGB_map map;
int idx, commande, nbargs;
/* XXX RGB_map map; */
dump_command_line(argc, argv, 0);

4
Tools/tga_combine.c
View File

@ -101,14 +101,14 @@ Image_print_version(0);
fputs("Usage:\n", stderr);
fputs("\ttga_combine s1.tga s2.tga MODE d.tga [PARAMS]\n", stderr);
fputs("\n", stderr);
if (flag) liste_mots_clefs(les_types, 42);
if (flag) liste_mots_clefs(les_types, 0);
exit(0);
}
/*::------------------------------------------------------------------::*/
int combine_proto(Image_Desc *sa, Image_Desc *sb, Image_Desc *dest)
{
fprintf(stderr, "%s: %p + %p -> %p\n", __func__, sa, sb, dest);
fprintf(stderr, "%p + %p -> %p\n", sa, sb, dest);
return 42;
}

12
Tools/tga_effects.c
View File

@ -134,10 +134,6 @@ int contours_du_gris(Image_Desc *src, Image_Desc *dst)
Image_Desc *tmp;
int foo;
#if DEBUG_LEVEL
fprintf(stderr, ">>> %s ( %p %p )\n", src, dst);
#endif
tmp = Image_clone(src, 1);
foo = Image_to_gray(src, tmp, 0);
@ -146,13 +142,13 @@ fprintf(stderr, "to_gray %d\n", foo);
#endif
foo = Image_seuil_RGB(tmp, tmp, 64, 128, 192);
fprintf(stderr, "%s: seuil rgb -> %d\n", __func__, foo);
#if DEBUG_LEVEL
fprintf(stderr, "seuil rgb %d\n", foo);
#endif
Image_2x2_contours_0(tmp);
Image_copy(tmp, dst);
Image_DeAllocate(tmp); free(tmp);
return 42;
}
/*::------------------------------------------------------------------::*/
@ -206,7 +202,7 @@ fprintf(stderr, "%s :\n\t%p %p %s %d\n", __func__,
#endif
foo = Image_Glitch_simple(src, dst, nbre);
fprintf(stderr, "glitch (%s) simple -> %d\n", type, foo);
fprintf(stderr, "glitch simple -> %d\n", foo);
return 0;
}

9
Tools/tga_equalize.c
View File

@ -127,13 +127,12 @@ switch (commande)
break;
}
if (foo) {
fprintf(stderr, "%s: retour = %d, %s\n", argv[0],
foo, Image_err2str(foo));
}
#if DEBUG_LEVEL
if (foo)
fprintf(stderr, "retour = %d, %s\n", foo, Image_err2str(foo));
#endif
foo = Image_TGA_save(argv[3], dst, 0);
return 0;
}
/*::------------------------------------------------------------------::*/

4
Tools/tga_outils.h
View File

@ -7,7 +7,7 @@
#include "../tthimage.h"
#define TGA_OUTILS_VERSION "0.62"
#define TGA_OUTILS_VERSION "0.61"
/*
* 13 Dec 2001: v0.11 a cause du 'mustopen' pour les palettes.
* 11 Fev 2002: v0.12 a cause du '-ansi' (hein Kerdeuzz, on y vient)
@ -22,7 +22,7 @@
* 18 Nov 2022: Vx.xx added parse_size_param
*/
#define TGA_OUTILS_COPYLEFT "(dwtfywl) TontonTh 2023"
#define TGA_OUTILS_COPYLEFT "(dwtfywl) TontonTh 2022"
#define TGA_WWW_SITE "http://la.buvette.org/devel/libimage/"
#define PERR(txt) fprintf(stderr, "\t| %s\n", (txt))

37
Tools/tga_pattern.c
View File

@ -28,35 +28,27 @@ struct type
#define TEXTURE_1 21
#define TEXTURE_2 22
#define TEXTURE_3 23
#define EXPOV_0 24
#define PATT_100 30
#define PATT_101 31
#define EXPOV_0 30
#define PATT_102 32 /* new June 2003 */
#define GRAYNOISE2 40
#define RGBNOISE1 50
#define RGBNOISE2 51
#define CHECK_BW 80
#define PATT_000 90
#define PATT_001 91
#define PATT_002 92
static char no_help[] = "no help...";
mot_clef mots_clef[] =
{
{ "graynoise", GRAYNOISE, "ii", "bruit gris" },
{ "rgbnoise", RGBNOISE, "ii", "bruit RGB" },
{ "graynoise", GRAYNOISE, "ii", "bruit gris" },
{ "rgbnoise", RGBNOISE, "ii", "bruit RGB" },
{ "42", REPONSE, "ii", no_help },
{ "reponse", REPONSE, "ii", no_help },
{ "text1", TEXTURE_1, "ii", no_help },
{ "text2", TEXTURE_2, "iii", no_help },
{ "expov", EXPOV_0, "iii", no_help },
{ "cent", PATT_100, "iii", "kr kg kb" },
{ "centun", PATT_101, "iii", "kr kg kb" },
{ "centdeux", PATT_102, "iiii", no_help },
{ "first", PATT_000, "i", "byte mask" },
{ "second", PATT_001, "i", "magic value" },
{ "third", PATT_002, "i", "magic value" },
{ "first", PATT_000, "i", "byte mask" },
{ "graynoise2", GRAYNOISE2, "ii", no_help },
{ "rgbnoise1", RGBNOISE1, "iiiiii", no_help },
{ "rgbnoise2", RGBNOISE2, "iiiiii", no_help },
@ -67,7 +59,7 @@ mot_clef mots_clef[] =
/*::------------------------------------------------------------------::*/
void usage(int flag)
{
fprintf(stderr, "* Tga Pattern v 0.0.28 [%s] %s\n",
fprintf(stderr, "* Tga Pattern v 0.0.25 [%s] %s\n",
TGA_OUTILS_VERSION, TGA_OUTILS_COPYLEFT);
Image_print_version(flag);
@ -95,6 +87,7 @@ RGBA rgba1, rgba2;
int commande, nbargs, idx;
dump_command_line(argc, argv, 0);
srand(getpid());
if (argc==1) usage(0);
@ -141,14 +134,11 @@ switch(commande)
break;
case RGBNOISE:
fprintf(stderr, "entering RGBNOISE\n");
foo = Image_rgb_noise_0(dst, GIP(0), GIP(1));
break;
case GRAYNOISE:
fprintf(stderr, "entering GRAYNOISE\n");
foo = Image_gray_noise_0(dst, GIP(0), GIP(1));
fprintf(stderr, "gray noise -> %d\n", foo);
break;
case TEXTURE_1:
@ -167,21 +157,6 @@ switch(commande)
foo = Image_pattern_000(dst, GIP(0));
break;
case PATT_001:
foo = Image_pattern_001(dst, GIP(0));
break;
case PATT_002:
foo = Image_pattern_002(dst, GIP(0));
break;
case PATT_100:
foo = Image_pattern_100(dst, GIP(0), GIP(1), GIP(2));
break;
case PATT_101:
foo = Image_pattern_101(dst, GIP(0), GIP(1), GIP(2));
break;
case PATT_102:
foo = Image_pattern_102(dst, GIP(0), GIP(1), GIP(2), GIP(3));
break;

1
Tools/tga_remap.c
View File

@ -47,6 +47,7 @@ int main(int argc, char *argv[])
Image_Desc *src, *dst;
int foo, type;
RGB_map map;
long t_debut, t_fin;
dump_command_line(argc, argv, 0);

12
Tools/tga_tools.c
View File

@ -149,11 +149,6 @@ if (w < 1 || h < 1)
img = Image_alloc(w, h, 3);
Image_clear(img, r, g, b);
foo = Image_TGA_save(fname, img, 0);
if (foo) {
fprintf(stderr, "%s: saving '%s' -> %d\n", __func__, fname, foo);
return foo;
}
Image_DeAllocate(img), free(img);
return 666;
}
@ -202,10 +197,9 @@ if (flag) {
posx = posy = 0;
}
if (must_be_verbose()) {
if (must_be_verbose())
fprintf(stderr, "%s:\n '%s' to '%s' with '%s' flg %d\n", \
__func__, fnin, fnout, txt, flag);
}
if ( (src=Image_TGA_alloc_load(fnin)) == NULL )
{
@ -230,10 +224,6 @@ Image_Desc *src;
long hr[256], hg[256], hb[256];
int foo;
if (flags) {
fprintf(stderr, "in %s, flags must be 0\n", __func__);
}
if ( (src=Image_TGA_alloc_load(filename)) == NULL )
{
fprintf(stderr, "tga_tools, chargement '%s' failed\n", filename);