Lib/Makefile

@@ -67,7 +67,6 @@ filtres.o:	filtres.c	$(DEPS)
 
 gadgrect.o:	gadgrect.c	$(DEPS)
 glitch.o:	glitch.c	$(DEPS)
-gradient.o:	gradient.c	$(DEPS)
 
 halfsize.o:	halfsize.c	$(DEPS)
 
@@ -126,6 +125,7 @@ text1.o:	text1.c		$(DEPS)
 text16x24.o:	text16x24.c	$(DEPS)
 tga.o:		tga.c		$(DEPS)
 tools.o:	tools.c		$(DEPS)
+trigo.o:	trigo.c		$(DEPS)
 turtle.o:	turtle.c	$(DEPS)
 
 vignetize.o:	vignetize.c	$(DEPS)
@@ -154,7 +154,7 @@ OBJECTS =	7seg.o							\
 		doublesz.o drawalpha.o drawing.o drawpatt.o		\
 		effects.o effects2.o effects3.o extractbits.o		\
 		filtadapt.o filtres.o					\
-		gadgrect.o glitch.o gradient.o				\
+		gadgrect.o glitch.o					\
 		halfsize.o						\
 		image.o	imprime.o					\
 		luts15bits.o						\
@@ -174,7 +174,7 @@ OBJECTS =	7seg.o							\
 		scale.o	sobel4.o stereo.o				\
 		tamppool.o tele_2.o television.o			\
 		text0.o text1.o text16x24.o				\
-		tga.o tools.o turtle.o					\
+		tga.o tools.o trigo.o turtle.o				\
 		vignetize.o						\
 		warp0.o warp1.o warp2.o warp3.o				\
 		zoom.o
@@ -186,7 +186,7 @@ OBJECTS =	7seg.o							\
 #-----------------------------------------------------------------
 
 foo:		foo.c $(DEPS) ../libtthimage.a
-	gcc $(CFLAGS) $< ../libtthimage.a -lm -o $@
+	gcc $(CFLAGS) $< ../libtthimage.a -o $@
 
 t_png:	t_png.c $(DEPS)  ../libtthimage.a
 	gcc $(CFLAGS) $< ../libtthimage.a -lpng -lz -o $@

Lib/contrast.c

@@ -6,48 +6,6 @@
 #include  <math.h>
 #include  "../tthimage.h"
 
-
-/*::------------------------------------------------------------------::*/
-/*
- *	new: Fri Sep 15 20:18:35 UTC 2023
- *	inspired by the sam func in FloatImg
- */
-int Image_egalise_cos01(Image_Desc *source, Image_Desc *but, int k)
-{
-unsigned char	lut[256], uc;
-int		idx, x, y, pix, foo;
-float		fidx;
-
-fprintf(stderr, ">>> %s ( %p  %p  %d )\n", __func__,
-		source, but, k);
-
-if ( (foo=Image_compare_desc(source, but)) ) {
-	fprintf(stderr, "%s: images not compatible, %d\n", __func__, foo);
-	return foo;
-	}
-
-for (idx=0; idx<256; idx++) {
-	fidx = (float)idx / 255.0;
-	uc = (unsigned char)(255.0*(0.5 - 0.5 * cos(3.141592654*fidx)));
-	lut[idx] = uc;
-	/* printf("%7d    %7d\n", idx, uc); */
-	}
-
-for (y=0; y<source->height; y++) {
-	for (x=0; x<source->width; x++) {
-
-		pix = source->Rpix[y][x];
-		but->Rpix[y][x] = lut[pix];
-		pix = source->Gpix[y][x];
-		but->Gpix[y][x] = lut[pix];
-		pix = source->Bpix[y][x];
-		but->Bpix[y][x] = lut[pix];
-
-		}
-	}
-
-return FULL_NUCKED;
-}
 /*::------------------------------------------------------------------::*/
 /*
  *	cette fonction peut etre utilisee avec la meme image
@@ -62,10 +20,6 @@ float	fr, fg, fb;
 fprintf(stderr, "%s : %p -> %p\n", __func__, source, but);
 #endif
 
-if (k)	{
-	fprintf(stderr, "In %s, k must be 0, was %d\n", __func__, k);
-	}
-
 if ( (foo=Image_compare_desc(source, but)) ) {
     fprintf(stderr, "%s : images are differents %d\n", __func__, foo);
     return foo;
@@ -101,10 +55,6 @@ float	fr, fg, fb;
 fprintf(stderr, "%s : %p -> %p\n", __func__, source, but);
 #endif
 
-if (k)	{
-	fprintf(stderr, "In %s, k must be 0, was %d\n", __func__, k);
-	}
-
 if ( (foo=Image_compare_desc(source, but)) ) {
     fprintf(stderr, "%s : images are differents %d\n", __func__, foo);
     return foo;

Lib/foo.c

@@ -2,7 +2,6 @@
 #include  <stdlib.h>
 #include  <unistd.h>
 #include   <stdint.h>
-#include  <math.h>
 
 #include  "../tthimage.h"
 
@@ -15,18 +14,6 @@ else
 	Image_t16x24_essai("16x24gruik", "0123456789abcdef", "16x24.tga");
 return 0;
 }
-
-/*		==============================				*/
-
-void essai_gradients(void)
-{
-int		foo;
-
-foo = Image_plot_H_gradient("foo.tga", 640, 200);
-fprintf(stderr, "plot h gradient -> %d\n", foo);
-foo = Image_plot_V_gradient("foo.tga", 900, 200);
-fprintf(stderr, "plot v gradient -> %d\n", foo);
-}
 /*		==============================				*/
 int essai_draw_paint_rect(char *outga)
 {
@@ -76,9 +63,6 @@ int main(int argc, char *argv[])
 {
 int		foo;
 
-essai_gradients();
-
-#if 0
 Image_print_version(2);
 Image_print_sizeof_structs("foo");
 
@@ -88,8 +72,5 @@ fprintf(stderr, "essai show t16x24 --> %d\n", foo);
 foo = essai_draw_paint_rect("foo.tga");
 fprintf(stderr, "essai draw rect --> %d\n", foo);
 
-Image_egalise_cos01(NULL, NULL, 0);
-#endif
-
 return 0;
 }

Lib/gradient.c

@@ -1,60 +0,0 @@
-/*
-			gradient.c
-			----------
-
-	new: 	Sun Sep 17 20:47:57 UTC 2023
-
-*/
-
-#include  <stdio.h>
-#include  <string.h>
-#include  <stdlib.h>
-#include  <math.h>
-
-#include  "../tthimage.h"
-
-/*::------------------------------------------------------------------::*/
-int Image_plot_H_gradient(char *fname, int w, int h)
-{
-Image_Desc		*img;
-int			x, y, pix, foo;
-float			fval;
-
-if ( (img = Image_alloc(w, h, IMAGE_RGB)) == NULL )	{
-#if DEBUG_LEVEL
-	fprintf(stderr, "%s: alloc of img failed, file=%s\n", __func__, fname);
-#endif
-	return IMAGE_NO_MEM;
-	}
-
-for (x=0; x<w; x++) {
-	fval = (float)x / (float)(w-1);
-	pix = (int)(fval * 255.0);
-#if DEBUG_LEVEL > 1
-	printf("%5d    %6.3f    %5d\n", x, fval, pix);
-#endif
-	for (y=0; y<h; y++) {
-		(img->Rpix[y])[x] = pix;
-		(img->Gpix[y])[x] = pix;
-		(img->Bpix[y])[x] = pix;
-		}
-	}
-
-foo = Image_TGA_save(fname, img, 0);
-if (foo) {
-	fprintf(stderr, "%s: err write to '%s'\n", __func__, fname);
-	return FULL_NUCKED;
-	}
-
-Image_DeAllocate(img);	free(img);
-
-return FUNC_IS_BETA;
-}
-
-/*::------------------------------------------------------------------::*/
-int Image_plot_V_gradient(char *fname, int w, int h)
-{
-
-return FUNC_IS_ALPHA;
-}
-/*::------------------------------------------------------------------::*/

Tools/.gitignore

@@ -2,5 +2,3 @@
 *.tga
 *.scratch
 
-tga_extract
-

Tools/Makefile

@@ -10,7 +10,7 @@ DEPS = ../tthimage.h Makefile tga_outils.h ../libtthimage.a
 
 all:	genplot2						\
 	tga_cadre tga_effects tga_filtres tga_remap tga_tools	\
-	tga_combine tga_export tga_alpha tga_extract		\
+	tga_combine tga_export tga_alpha			\
 	tga_television tga_dither tga_applymap tga_makehf15	\
 	tga_mires tga_incrust tga_pattern tga_equalize
 
@@ -73,10 +73,6 @@ tga_tools:	tga_tools.c $(DEPS) fonctions.o
 tga_incrust:	tga_incrust.c $(DEPS) fonctions.o
 	gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
 
-tga_extract:	tga_extract.c $(DEPS) fonctions.o
-	gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
-
-
 # tga_info:	tga_info.c $(DEPS) fonctions.o
 #	gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
 

Tools/fonctions.c

@@ -446,9 +446,7 @@ int	set_new_seed(int k)
 char		*ptr;
 long		seed;
 
-#if DEBUG_MESSAGE
 if (k)	fprintf(stderr, "%s: k %d\n", __func__, k); 
-#endif
 
 if (NULL==(ptr=getenv("FIXED_SEED"))) {
 	/* no fixed seed in context, doing semi-random */

Tools/tga_equalize.c

@@ -14,7 +14,6 @@
 /*::------------------------------------------------------------------::*/
 #define		EQ_STD		4
 #define		EQ_GRAY		8
-#define		EQ_COS01	9
 #define		EQ_2X2		12
 #define		EQ_LUMIN	14
 #define		EQ_SQUARE	16
@@ -27,7 +26,6 @@ mot_clef mots_clef[] =
 { "std",	EQ_STD,		"", 	"standard method"	},
 { "rgb",	EQ_STD,		"", 	"same as 'std'"		},
 { "gray",	EQ_GRAY,	"",	"gray based"		},
-{ "cos01",	EQ_COS01,	"",	"cosinus 0->1"		},
 { "2x2",	EQ_2X2,		"",	"2x2 matrix"		},
 { "lumin",	EQ_LUMIN,	"i",	"param: ident is 256"	},
 /* { "gamma",	EQ_GAMMA,	"d",	"not implemented"	},*/
@@ -40,7 +38,7 @@ mot_clef mots_clef[] =
 /*::------------------------------------------------------------------::*/
 void usage()
 {
-fprintf(stderr, "* tga_equalize v 0.0.23 [%s]  (dwtfywl) tonton Th\n",
+fprintf(stderr, "* tga_equalize v 0.0.21 [%s]  (dwtfywl) tonton Th\n",
 					TGA_OUTILS_VERSION);
 fprintf(stderr, "  compiled %s at %s\n", __DATE__, __TIME__);
 fprintf(stderr, "usage:\n\ttga_equalize avant.tga mode apres.tga [params]\n");
@@ -108,10 +106,6 @@ switch (commande)
 		foo = Image_pix_sqroot(src, dst, 0);
 		break;
 
-	case EQ_COS01:
-		foo = Image_egalise_cos01(src, dst, 0);
-		break;
-
 	case EQ_GAMMA:
 		fprintf(stderr, "no gamma func in %d\n", getpid());
 		foo = FULL_NUCKED;

Tools/tga_extract.c

@@ -1,103 +0,0 @@
-/*
-		TGA EXTRACTOR
-		-------------
-		http://www.chez.com/oulala/libimage/
-*/
-
-#include  <stdio.h>
-#include  <stdlib.h>
-
-#include  "tga_outils.h"
-
-/*::------------------------------------------------------------------::*/
-void usage(void)
-{
-fprintf(stderr, "* TGA extractor  v 0.0.12 [%s] %s \n",
-				TGA_OUTILS_VERSION, TGA_OUTILS_COPYLEFT);
-fprintf(stderr, "usage:\n");
-fprintf(stderr, "      $ tga_extract source.tga resultat.tga X Y W H\n\n");
-Image_print_version(0);
-fprintf(stderr, "\n");
-exit(1);
-}
-/*::------------------------------------------------------------------::*/
-
-#define		X	0
-#define		Y	1
-#define		W	2
-#define		H	3
-
-int main(int argc, char *argv[])
-{
-Image_Desc	*image, *resultat;
-int		foo, coords[4];
-Image_Rect	rect;
-
-dump_command_line(argc, argv, 0);
-
-if ( argc != 7 ) {
-	fprintf(stderr, "argc=%d\n", argc);
-	usage();
-	}
-
-/* decode and check parameters */
-for (foo=0; foo<4; foo++) {
-	if ( sscanf(argv[foo+3], "%d", &coords[foo]) != 1 ) {
-		fprintf(stderr, " '%s'  oikk?!\n", argv[foo+3]);
-		usage();
-		}
-	}
-
-if ( (coords[X]<0) || (coords[Y]<0) || (coords[W]<0) || (coords[H]<0) )
-	{
-	fprintf(stderr, "%s: no negative parameter, please.\n", argv[0]);
-	exit(1);
-	}
-if (coords[X]>16000 || coords[Y]>16000 || coords[W]>16000 || coords[H]>16000)
-	{
-	fprintf(stderr, "%s: no overburned parameter, please.\n", argv[0]);
-	exit(1);
-	}
-
-/* load the source image ... */
-if ( (image=Image_TGA_alloc_load(argv[1])) == NULL ) {
-	fprintf(stderr, "%s: no mem for input image '%s'\n", argv[0], argv[1]);
-	exit(1);
-	}
-
-if (must_be_verbose()) {
-	/* ... so we know source dimensions */
-	fprintf(stderr, "tga_extract: src '%s': %d x %d\n",
-			argv[1], image->width, image->height);
-	}
-
-if ( (resultat=Image_alloc(coords[W], coords[H], 3)) == NULL ) {
-	fprintf(stderr, "%s: no mem for ouput image\n", argv[0]);
-	exit(1);
-	}
-
-rect.x = coords[X];	rect.y = coords[Y];
-rect.w = coords[W];	rect.h = coords[H];
-
-foo = Image_get_rect(image, &rect, resultat, 0, 0); if (foo)
-	{
-	fprintf(stderr, "tga_extract: get_rect: err %d %s\n",
-						foo, Image_err2str(foo));
-	exit(2);
-	}
-if (must_be_verbose()) {
-	fprintf(stderr, "tga_extract: dst '%s': %dx%d @%d,%d\n",
-			argv[2], resultat->width, resultat->height,
-			rect.x, rect.y);
-	}
-
-foo = Image_TGA_save(argv[2], resultat, 0);
-if (foo) {
-	fprintf(stderr, "tga_extract: %s save err %d %s\n",
-					argv[2], foo, Image_err2str(foo));
-	exit(2);
-	}
-
-return 0;
-}
-/*::------------------------------------------------------------------::*/

Tools/tga_tools.c

@@ -25,8 +25,6 @@
 #define		HEADER		33
 #define		TIMESTAMP	34
 #define		PRHISTO		35
-#define		H_GRAD		36
-#define		V_GRAD		37
 #define		TAG7SEG0	40
 #define		BIZARRE		41
 #define		ENVIRON		50
@@ -51,7 +49,6 @@ mot_clef commandes[] =
 { "environ",	ENVIRON,	"",	""				},
 { "bizarre",	BIZARRE,	"",	"portnawak..."			},
 { "mk_rgb",	MK_RGB,		"siiiii", "fname w h r g b"		},
-{ "mk_hgrad",	H_GRAD,		"sii",	"fname w h"			},
 { NULL,		0,		NULL,	NULL		}
 };
 
@@ -112,24 +109,6 @@ fprintf(stderr, "%s got %d\n", __func__, foo);
 return foo;
 }
 /*::------------------------------------------------------------------::*/
-/* new: Mon Sep 18 06:28:51 UTC 2023
-	this is just a dummy wraper					*/
-int make_a_H_gradient(char *fname, int w, int h)
-{
-int		foo;
-
-
-#if DEBUG_LEVEL
-fprintf(stderr, ">>> %s ( %s %d %d )\n", __func__, fname, w, h);
-#endif
-
-foo = Image_plot_H_gradient(fname, w, h);
-#if DEBUG_LEVEL
-fprintf(stderr, "    got a %d\n", foo);
-#endif
-
-return foo;
-}
 /*::------------------------------------------------------------------::*/
 int make_a_rgb_tga(char *fname, int w, int h, int r, int g, int b)
 {
@@ -325,13 +304,13 @@ dump_command_line(argc, argv, 0);
 
 /* new 4 feb 2014 */
 foo = set_new_seed(42);
-#if DEBUG_LEVEL > 1
+#if DEBUG_LEVEL
-fprintf(stderr, "!!! set new seed -> %d\n", foo);
+fprintf(stderr, "set new seed -> %d\n", foo);
 #endif
 
 if (1 == argc)
 	{
-	fprintf(stderr, "* tga_tools v 0.1.33 (%s) *\n", __DATE__);
+	fprintf(stderr, "* tga_tools v 0.1.32 (%s) *\n", __DATE__);
 	fprintf(stderr, "usage:\n\t%s action f.tga [params]\n", argv[0]);
 	liste_mots_clefs(commandes, 42);
 	exit(0);
@@ -401,11 +380,6 @@ switch(mode)
 		foo = make_a_rgb_tga(cptr, GIP(1), GIP(2),
 				GIP(3), GIP(4), GIP(5));
 		break;
-	case H_GRAD:
-		cptr = GSP(0);
-		fprintf(stderr, "MK_HGRAD -> %s\n", cptr);
-		foo = make_a_H_gradient(cptr, GIP(1), GIP(2));
-		break;
 	case MK_NOISE:
 		cptr = GSP(0);
 		fprintf(stderr, "MK_NOISE -> %s\n", cptr);

tthimage.h

@@ -1,10 +1,10 @@
 /*
           	  tthimage.h
 	  	  ----------
-	http://la.buvette.org/devel/libimage/
+	http:///la.buvette.org/devel/libimage/
 */
 #ifndef IMAGE_VERSION_STRING
-	#define IMAGE_VERSION_STRING "0.4.51 pl 50"
+	#define IMAGE_VERSION_STRING "0.4.51 pl 43"
 
 /*::------------------------------------------------------------------::*/
 /*
@@ -932,13 +932,6 @@ int	Image_texture_1(Image_Desc *dst, int bas, int haut);
 int	Image_texture_2(Image_Desc *dst, int bas, int haut, int modulo);
 int	Image_texture_3(Image_Desc *dst, int b, int h, char *ctrl, int qux);
 
-/*::------------------------------------------------------------------::*/
-/*
- *		module gradient.c
- */
-int Image_plot_H_gradient(char *fname, int w, int h);
-int Image_plot_V_gradient(char *fname, int w, int h);
-
 /*::------------------------------------------------------------------::*/
 /*
 		module patterns.c
@@ -1199,8 +1192,6 @@ int	Image_insert_with_alpha(Image_Desc *img, Image_Desc *ins, int foo);
 int Image_pix_square(Image_Desc *source, Image_Desc *but, int k);
 int Image_pix_sqroot(Image_Desc *source, Image_Desc *but, int k);
 
-int Image_egalise_cos01(Image_Desc *source, Image_Desc *but, int k);
-
 /*::------------------------------------------------------------------::*/
 /*
 	module levels.c			new: Jan 2001