From 86cb7eaa4aeed7851a4b99a5c4735b90e2ca24e3 Mon Sep 17 00:00:00 2001 From: tTh Date: Sat, 18 Nov 2023 19:58:21 +0100 Subject: [PATCH] wip wip wip wip --- Paramakes.mk | 2 +- README.md | 2 +- Tests/functions.sh | 2 +- Tests/t_t16x24.c | 2 +- install.sh | 1 + tthimage.h | 18 +++++++----------- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Paramakes.mk b/Paramakes.mk index 4ca57a7..a7f6f12 100644 --- a/Paramakes.mk +++ b/Paramakes.mk @@ -19,7 +19,7 @@ HTML_DIR=$(DESTDIR)/html # use -Wmissing-prototypes ? LIBIMG_OPT=-DFORCE_ABORT=0 -DDEBUG_LEVEL=0 -DIMGCOMMENT=0 -CC_OPTS=-Wall -W -g -ansi -O3 -fPIC -no-pie +CC_OPTS=-Wall -W -g -ansi -O0 -fPIC -no-pie CC_HACKS=-DNEED_ALLOCA_H CFLAGS= $(CC_OPTS) \ diff --git a/README.md b/README.md index e5bbbee..8733fdd 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Le second, [`install.sh`](./install.sh) va mettre les choses au bon endroit. Il est vivement conseillé de bien les lire avant de les utiliser. Les options globales de compilation sont dans -[Paramakes.mk](Paramakes.mk). Là aussi, soyez attentifs +[Paramakes.mk](Paramakes.mk). Là aussi, soyez attentifs. ## Utilisation diff --git a/Tests/functions.sh b/Tests/functions.sh index 94e26b6..84fc9e2 100644 --- a/Tests/functions.sh +++ b/Tests/functions.sh @@ -4,7 +4,7 @@ test_des_xpers () { command=$1 -echo ; echo " Test du xper $command" +echo ; echo "======= Test du xper $command" # generation d'une image sur laquelle travailler $COMDIR/tga_mires mircol0 $SRC "hard xper '$command'" diff --git a/Tests/t_t16x24.c b/Tests/t_t16x24.c index 421689b..e601336 100644 --- a/Tests/t_t16x24.c +++ b/Tests/t_t16x24.c @@ -51,7 +51,7 @@ if (foo) { Image_print_error("load thin font", foo); } foo = Image_t16x24_chars_map("16x24gruik", "all16X24chars.tga", 2); if (foo) { Image_print_error("load gruik font", foo); } -fprintf(stderr, "--------------------------\n"); +fprintf(stderr, "--------------------------------------\n"); /* foo = essai_f1("pov.tga", "/tmp/aaaa_plop.tga", "0123456789"); diff --git a/install.sh b/install.sh index 6accb08..737633d 100755 --- a/install.sh +++ b/install.sh @@ -10,6 +10,7 @@ install -m 0644 tthimage.h $DESTDIR/include/tthimage.h cp -v Datas/8x8thin Datas/16x24thin $DESTDIR/share/libimage/ cp -v Datas/8x8std Datas/16x24gruik $DESTDIR/share/libimage/ +cp -v Datas/*.map $DESTDIR/share/libimage/ liste="genplot2 tga_cadre tga_effects tga_filtres tga_remap tga_tools \ tga_combine tga_television tga_dither tga_applymap tga_makehf15 \ diff --git a/tthimage.h b/tthimage.h index 6bc1cdb..ab605d6 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.51 pl 62" + #define IMAGE_VERSION_STRING "0.4.51 pl 80" /*::------------------------------------------------------------------::*/ /* @@ -609,19 +609,15 @@ int Image_quelques_calculs(Image_Desc *image); int Image_histo_RGB(Image_Desc *im, long *hr, long *hg, long *hb); -/* XXX may be we need a struct for RGB luts ? */ - -typedef struct { - unsigned int magic; - uint8_t R[256]; - uint8_t G[256]; - uint8_t B[256]; - int flags; - } Image_LUTs; int Image_LUT_RGB(Image_Desc *, Image_Desc *, int *, int *, int *); int Image_LUT_mono(Image_Desc *src, Image_Desc *dst, int *lut); +/* falsecolors.c */ + +int Image_gen_fc_lut(float maxval, int nbslots, RGB_map *plut); + + /*::------------------------------------------------------------------::*/ /* module distances.c */ @@ -1310,7 +1306,7 @@ int Image_vectfont_text_0(Image_Desc *im, char *txt, int x, int y); int Image_warp_essai_0(Image_Desc *src, Image_Desc *dst, double angle, int xc, int yc); -int Image_warp_essai_1(Image_Desc *src, Image_Desc *dst, double angle); +int Image_warp_essai_1(Image_Desc *src, Image_Desc *dst, double ang, double off); /*::------------------------------------------------------------------::*/ int Image_center_rotate(Image_Desc *src, Image_Desc *dst, double angle);