Compare commits

..

No commits in common. "cb94093c3079a2ba3c92c0c4e4b01f934ef2e7c0" and "60409a050cfa74534c1d02857ba9f10dd79042a0" have entirely different histories.

8 changed files with 28 additions and 89 deletions

4
.gitignore vendored
View File

@ -1,7 +1,9 @@
*.o
libtthimage.a
libimage.a
foo
Lib/foo
Lib/testtga

View File

@ -161,16 +161,16 @@ OBJECTS = 7seg.o \
warp0.o warp1.o warp2.o warp3.o \
zoom.o
../libtthimage.a: $(OBJECTS)
../libimage.a: $(OBJECTS)
$(AR) vrs $@ $?
$(RANLIB) $@
#-----------------------------------------------------------------
foo: foo.c $(DEPS) ../libtthimage.a
foo: foo.c $(DEPS) ../libimage.a
gcc $(CFLAGS) $< ../libimage.a -o $@
t_t16x24: t_t16x24.c $(DEPS) ../libtthimage.a
t_t16x24: t_t16x24.c $(DEPS) ../libimage.a
gcc $(CFLAGS) $< ../libimage.a-o $@
#-----------------------------------------------------------------
@ -178,7 +178,7 @@ t_t16x24: t_t16x24.c $(DEPS) ../libtthimage.a
essais.o: essais.c $(DEPS) essais.h
gcc $(CFLAGS) $< -c
testtga: testtga.c $(DEPS) ../libtthimage.a essais.o
gcc $(CFLAGS) $< essais.o ../libtthimage.a -lm -o $@
testtga: testtga.c $(DEPS) ../libimage.a essais.o
gcc $(CFLAGS) $< essais.o ../libimage.a -lm -o $@
#-----------------------------------------------------------------

View File

@ -68,9 +68,8 @@ for (foo=0; foo<NB_SLOTS; foo++)
*ps = seuil; /* give a nice value to our caller */
#if DEBUG_LEVEL
fprintf(stderr, "%s : seuil is %d\n", __func__, seuil);
#endif
fprintf(stderr, "$$$$ seuil is %d\n", seuil);
for (y=0; y<s->height; y++)
{
@ -86,9 +85,7 @@ for (y=0; y<s->height; y++)
}
}
#if DEBUG_LEVEL
fprintf(stderr, "end of %s\n", __func__);
#endif
return FULL_NUCKED;
}

View File

@ -6,7 +6,7 @@
include ../Paramakes.mk
DEPS = ../tthimage.h Makefile tga_outils.h ../libtthimage.a
DEPS = ../tthimage.h Makefile tga_outils.h
all: genplot2 \
tga_cadre tga_effects tga_filtres tga_remap tga_tools \
@ -24,54 +24,54 @@ fonctions.o: fonctions.c $(DEPS)
#-----------------------------------------------------------------
genplot2: genplot2.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
#-----------------------------------------------------------------
tga_applymap: tga_applymap.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_cadre: tga_cadre.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_combine: tga_combine.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_dither: tga_dither.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_effects: tga_effects.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_equalize: tga_equalize.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_filtres: tga_filtres.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_makehf15: tga_makehf15.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_mires: tga_mires.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_remap: tga_remap.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_television: tga_television.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_tools: tga_tools.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
tga_incrust: tga_incrust.c $(DEPS) fonctions.o
gcc $(CFLAGS) $< ../libtthimage.a fonctions.o -lm -o $@
gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@
# tga_info: tga_info.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) $< ../libimage.a fonctions.o -lm -o $@
#-----------------------------------------------------------------

View File

@ -1,36 +0,0 @@
# Tools
Pour utiliser toutes ces fonction, il y a une collection d'utilitaires
spécialisés.
## genplot2
## tga_applymap
## tga_cadre
## tga_combine
## tga_dither
## tga_effects
## tga_equalize
## tga_filtres
## tga_incrust
## tga_makehf15
## tga_mires
## tga_pattern
## tga_remap
## tga_television
## tga_tools

View File

@ -48,7 +48,6 @@ mot_clef commandes[] =
{ "tag7", TAG7SEG0, "si", "fname.tga nnn" },
{ "environ", ENVIRON, "", "" },
{ "mk_rgb", MK_RGB, "siiiii", "fname w h r g b" },
{ NULL, 0, NULL, NULL }
};
/*::------------------------------------------------------------------::*/
@ -296,7 +295,7 @@ fprintf(stderr, "set new seed -> %d\n", foo);
if (1 == argc)
{
fprintf(stderr, "* tga_tools v 0.1.32 (%s) *\n", __DATE__);
fprintf(stderr, "* tga_tools v 0.1.31 (%s) *\n", __DATE__);
fprintf(stderr, "usage:\n\t%s action f.tga [params]\n", argv[0]);
liste_mots_clefs(commandes, 42);
exit(0);

View File

@ -1,23 +0,0 @@
#!/bin/bash
echo "warning: $0 is an ugly installer"
DESTDIR="/usr/local/"
install -d $DESTDIR/lib/
install -m 0644 libtthimage.a $DESTDIR/lib/libtthimage.a
install -m 0644 tthimage.h $DESTDIR/include/tthimage.h
liste="genplot2 tga_cadre tga_effects tga_filtres tga_remap tga_tools \
tga_combine tga_television tga_dither tga_applymap tga_makehf15 \
tga_mires tga_incrust tga_pattern tga_equalize"
for binaire in $liste
do
# file Tools/$binaire
install --strip -v Tools/$binaire $DESTDIR/bin/
echo
done

View File

@ -4,7 +4,7 @@
http:///la.buvette.org/devel/libimage/
*/
#ifndef IMAGE_VERSION_STRING
#define IMAGE_VERSION_STRING "0.4.50"
#define IMAGE_VERSION_STRING "0.4.49"
/*::------------------------------------------------------------------::*/
/*