diff --git a/Lib/Makefile b/Lib/Makefile index 5b08691..852ed49 100644 --- a/Lib/Makefile +++ b/Lib/Makefile @@ -38,6 +38,7 @@ combine3.o: combine3.c $(DEPS) combine4.o: combine4.c $(DEPS) combine5.o: combine5.c $(DEPS) combine6.o: combine6.c $(DEPS) +contrast.o: contrast.c $(DEPS) detect.o: detect.c $(DEPS) distances.o: distances.c $(DEPS) @@ -130,6 +131,7 @@ OBJECTS = 7seg.o \ calculs.o classif.o \ col4bits.o colors.o colors2.o col_reduc.o col_xyz.o \ combine.o combine2.o combine3.o combine4.o combine5.o \ + contrast.o \ detect.o distances.o \ dither.o dither2.o dither3.o dither4.o \ doublesz.o drawalpha.o drawing.o drawpatt.o \ diff --git a/Lib/contrast.c b/Lib/contrast.c index cef3f2b..41dff67 100644 --- a/Lib/contrast.c +++ b/Lib/contrast.c @@ -4,7 +4,7 @@ #include #include -#include "tthimage.h" +#include "../tthimage.h" /*::------------------------------------------------------------------::*/ /* diff --git a/Tools/tga_equalize.c b/Tools/tga_equalize.c new file mode 100644 index 0000000..0dbe77b --- /dev/null +++ b/Tools/tga_equalize.c @@ -0,0 +1,124 @@ +/* + ---------------------------------------------- + utilitaire pour egalizer (uh?) une image + ---------------------------------------------- + http://la.buvette.org/devel/libimage/ + ---------------------------------------------- +*/ + +#include +#include + +#include "tga_outils.h" + +/*::------------------------------------------------------------------::*/ +#define EQ_STD 4 +#define EQ_GRAY 8 +#define EQ_2X2 12 +#define EQ_LUMIN 14 +#define EQ_SQUARE 16 +#define EQ_SQROOT 17 +#define EQ_GAMMA 20 +mot_clef mots_clef[] = +{ +{ "std", EQ_STD, "", "standard method" }, +{ "rgb", EQ_STD, "", "same as 'std'" }, +{ "gray", EQ_GRAY, "", "gray based" }, +{ "2x2", EQ_2X2, "", "2x2 matrix" }, +{ "lumin", EQ_LUMIN, "i", "param : ident is 256" }, +{ "gamma", EQ_GAMMA, "d", "not implemented" }, +{ "square", EQ_SQUARE, "", "pix**2" }, +{ "sqroot", EQ_SQROOT, "", "sqr(pix)" }, +{ NULL, 0, NULL, NULL } +}; + +/*::------------------------------------------------------------------::*/ +void usage() +{ +fprintf(stderr, "* tga_equalize v 0.0.20 [%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"); +liste_mots_clefs(mots_clef, 42); +exit(5); +} +/*::------------------------------------------------------------------::*/ +int main (int argc, char *argv[]) +{ +Image_Desc *src, *dst; +int foo; +int commande, nbargs, idx; + +dump_command_line(argc, argv, 0); +if (argc < 4) usage(); + +idx = cherche_mot_clef(argv[2], mots_clef, &commande, &nbargs); +if (idx < 0) + { + fprintf(stderr, "tga_equalize: mot-clef %s inconnu...\n", argv[2]); + exit(5); + } +#if DEBUG_LEVEL +fprintf(stderr, "idx %d commande %d nbargs %d argc %d\n", + idx, commande, nbargs, argc); +#endif + +foo = parse_parametres(argc, argv, mots_clef[idx].ptypes, 4); + +if ( (src=Image_TGA_alloc_load(argv[1])) == NULL ) + { + fprintf(stderr, "tga_equalize: err load %s\n", argv[1]); + exit(5); + } + +if ( (dst=Image_clone(src, 0)) == NULL ) + { + fprintf(stderr, "no mem for image cloning\n"); + exit(5); + } + +switch (commande) + { + case EQ_STD: + foo = Image_egalise_RGB(src, dst, 0); + break; + + case EQ_GRAY: + foo = Image_egalise_mono_0(src, dst, 0); + break; + + case EQ_2X2: + foo = Image_2x2_contrast(src, dst); + break; + + case EQ_LUMIN: + foo = Image_luminance(src, dst, GIP(0)); + break; + + case EQ_SQUARE: + foo = Image_pix_square(src, dst, 0); + break; + + case EQ_SQROOT: + foo = Image_pix_sqroot(src, dst, 0); + break; + + case EQ_GAMMA: + fprintf(stderr, "no gamma func in %d\n", getpid()); + foo = FULL_NUCKED; + break; + + default: + foo=-1; + break; + } + +#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; +} +/*::------------------------------------------------------------------::*/ diff --git a/tthimage.h b/tthimage.h index 05d3a2b..a8fa966 100644 --- a/tthimage.h +++ b/tthimage.h @@ -4,7 +4,7 @@ http:///la.buvette.org/devel/libimage/ */ #ifndef IMAGE_VERSION_STRING - #define IMAGE_VERSION_STRING "0.4.48" + #define IMAGE_VERSION_STRING "0.4.49" /*::------------------------------------------------------------------::*/ /*