This commit is contained in:
tth 2021-04-23 11:15:56 +02:00
parent 0478bae6a3
commit ce73143d96
4 changed files with 13 additions and 9 deletions

View File

@ -3,7 +3,7 @@
# Please, use the 'Gloabl.makefile' system ! # Please, use the 'Gloabl.makefile' system !
COPT = -Wall -fpic -g -no-pie -DDEBUG_LEVEL=1 COPT = -Wall -fpic -g -no-pie -DDEBUG_LEVEL=0
DEPS = ../floatimg.h Makefile DEPS = ../floatimg.h Makefile
OBJS = fimg-png.o fimg-tiff.o misc-plots.o filtrage.o utils.o \ OBJS = fimg-png.o fimg-tiff.o misc-plots.o filtrage.o utils.o \

View File

@ -22,7 +22,7 @@ float global_fvalue;
enum nCmd { Equalize=1, Rotate, Sfx0, F3x3, MIRE, Wfits, Wpng, Wtiff, enum nCmd { Equalize=1, Rotate, Sfx0, F3x3, MIRE, Wfits, Wpng, Wtiff,
Histo, Hsv, Classif, Ctr2x2, Qsortrgb, Histo, Hsv, Classif, Ctr2x2, Qsortrgb,
Displace, ReadPNG, Plasmas, Hilight, OpenEXR, Displace, ReadPNG, Plasmas, Hilight, OpenEXR,
Geometrie }; Geometrie, FileType };
typedef struct { typedef struct {
char *name; char *name;
int Cmd; int Cmd;
@ -48,6 +48,7 @@ Command commands[] = {
{ "hilight", Hilight }, { "hilight", Hilight },
{ "openexr", OpenEXR }, { "openexr", OpenEXR },
{ "geometrie", Geometrie, }, { "geometrie", Geometrie, },
{ "filetype", FileType },
{ NULL, 0 } { NULL, 0 }
} ; } ;
@ -207,6 +208,9 @@ switch(opt) {
case Geometrie: case Geometrie:
foo = essai_geometrie(filename, 0); foo = essai_geometrie(filename, 0);
break; break;
case FileType:
foo = essai_detect_type();
break;
default: default:
fprintf(stderr, "'%s' is a bad command\n", command); fprintf(stderr, "'%s' is a bad command\n", command);
exit(1); exit(1);

View File

@ -616,22 +616,22 @@ int foo;
char *fname; char *fname;
foo = format_from_extension(fname="foo.fimg"); foo = format_from_extension(fname="foo.fimg");
printf("%-10s %d\n\n", fname, foo); printf("%-10s %3d\n", fname, foo);
foo = format_from_extension(fname="foo.pnm"); foo = format_from_extension(fname="foo.pnm");
printf("%-10s %d\n\n", fname, foo); printf("%-10s %3d\n", fname, foo);
foo = format_from_extension(fname="foo.png"); foo = format_from_extension(fname="foo.png");
printf("%-10s %d\n\n", fname, foo); printf("%-10s %3d\n", fname, foo);
foo = format_from_extension(fname="foo.tiff"); foo = format_from_extension(fname="foo.tiff");
printf("%-10s %d\n\n", fname, foo); printf("%-10s %3d\n", fname, foo);
foo = format_from_extension(fname="foo.fits"); foo = format_from_extension(fname="foo.fits");
printf("%-10s %d\n\n", fname, foo); printf("%-10s %3d\n", fname, foo);
foo = format_from_extension(fname="foo.xyzzy"); foo = format_from_extension(fname="foo.xyzzy");
printf("%-10s %d\n\n", fname, foo); printf("%-10s %3d\n", fname, foo);
return 0; return 0;
} }

View File

@ -20,7 +20,7 @@ int fimg_essai_hsv(char *infile);
int essai_classif(char *infile, char *outfile, float fvalue); int essai_classif(char *infile, char *outfile, float fvalue);
int essai_contour_2x2(char *filename, char *outfile); int essai_contour_2x2(char *filename, char *outfile);
int essai_geometrie(char *infile, int notused); int essai_geometrie(char *infile, int notused);
int essai_detect_type(void);
int fimg_essai_histo(FloatImg *src, char *outpic, int k); /* histogram.c */ int fimg_essai_histo(FloatImg *src, char *outpic, int k); /* histogram.c */
int essai_histogramme(char *fname, int k); int essai_histogramme(char *fname, int k);