Compare commits

..

No commits in common. "ed864ea45a12686a66a4afbc81e1d44b4d3db9a7" and "9517c8a10f1df1f1d054d020ae2bb7c897b308f2" have entirely different histories.

5 changed files with 7 additions and 37 deletions

View File

@ -14,7 +14,7 @@
int fimg_test_pattern(FloatImg *fimg, int type, double dval) int fimg_test_pattern(FloatImg *fimg, int type, double dval)
{ {
int nio; int nio;
int x, y, k; int x, y;
float fr, fg, fb, val; float fr, fg, fb, val;
#if DEBUG_LEVEL #if DEBUG_LEVEL
@ -46,14 +46,6 @@ for (x=0; x<fimg->width; x++) {
fimg_plot_rgb(fimg, x, y, fr, fg, fb); fimg_plot_rgb(fimg, x, y, fr, fg, fb);
} }
k = fimg->height/4;
for (x=0; x<fimg->width; x++) {
val = ((double)x / (double)fimg->width) * dval;
for (y=0; y<20; y++) {
fimg_plot_rgb(fimg, x, k+y, val, val, val);
fimg_plot_rgb(fimg, x, k+y+20, 1-val, 1-val, 1-val);
}
}
return 0; return 0;

View File

@ -307,20 +307,6 @@ printf("%-10s %d\n\n", fname, foo);
return 0; return 0;
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
int essai_mire(char *outname, int notused)
{
FloatImg fimg;
int re;
fimg_create(&fimg, 1280, 960, FIMG_TYPE_RGB);
re = fimg_test_pattern(&fimg, 9, 1.0);
fimg_save_as_pnm(&fimg, "mire.pnm", 0);
return -1;
}
/* --------------------------------------------------------------------- */
int essai_rampes(void) int essai_rampes(void)
{ {
FloatImg fimg; FloatImg fimg;
@ -365,7 +351,7 @@ fprintf(stderr, "save as png -> %d\n", foo);
return 0; return 0;
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
enum nCmd { Equalize=1, Rotate, Sfx0, F3x3, MIRE }; enum nCmd { Equalize=1, Rotate, Sfx0, F3x3 };
typedef struct { typedef struct {
char *name; char *name;
int Cmd; int Cmd;
@ -376,7 +362,6 @@ Command commands[] = {
{ "rotate", Rotate }, { "rotate", Rotate },
{ "sfx0", Sfx0 }, { "sfx0", Sfx0 },
{ "f3x3", F3x3 }, { "f3x3", F3x3 },
{ "mire", MIRE },
{ NULL, 0 } { NULL, 0 }
} ; } ;
@ -398,7 +383,7 @@ void help(int k)
{ {
Command *pcmd; Command *pcmd;
fprintf(stderr, "usage:\n\t./t command filename\n"); fprintf(stderr, "usage:\n\t./t command in-filename\n");
fprintf(stderr, "commands:\n"); fprintf(stderr, "commands:\n");
pcmd = commands; pcmd = commands;
@ -455,9 +440,6 @@ switch(opt) {
case F3x3: case F3x3:
foo = essai_filtrage_3x3(filename); break; foo = essai_filtrage_3x3(filename); break;
case MIRE:
foo = essai_mire(filename, 0);
break;
default: default:
fprintf(stderr, "%s : bad command\n", command); fprintf(stderr, "%s : bad command\n", command);

View File

@ -19,15 +19,14 @@ echo "=== " $0 " ==="
# ----------------------------------------------------- # -----------------------------------------------------
function essai_drand48 function essai_drand48
{ {
./mkfimg -vv -t drand48 $TMPF 800 600 ./mkfimg -v -t drand48 $TMPF 800 600
./fimgstats -vv $TMPF ./fimgstats -vv $TMPF
} }
# ----------------------------------------------------- # -----------------------------------------------------
function essai_cmixa function essai_cmixa
{ {
./mkfimg -vv -t tpat0 $TMPF 800 600 ./mkfimg -v -t tpat0 $TMPF 800 600
./fimgfx -vv cmixa $TMPF bar.fimg ./fimgfx -v cmixa $TMPF bar.fimg
} }
# ----------------------------------------------------- # -----------------------------------------------------

View File

@ -210,8 +210,6 @@ if (3 > argc-optind) {
exit(1); exit(1);
} }
if (verbosity>1) fprintf(stderr, "*** fimgfx *** %s %s\n", __DATE__, __TIME__);
operator = argv[optind]; operator = argv[optind];
action = lookup_fxidx(operator); action = lookup_fxidx(operator);
if (action < 0) { if (action < 0) {

View File

@ -111,7 +111,6 @@ if (type < 0) {
fname = argv[optind]; fname = argv[optind];
width = atoi(argv[optind+1]); height = atoi(argv[optind+2]); width = atoi(argv[optind+1]); height = atoi(argv[optind+2]);
if (verbosity>1) fprintf(stderr, "*** mkfimg *** %s %s\n", __DATE__, __TIME__);
if (verbosity) fprintf(stderr, "making '%s' %d x %d, type %d\n", if (verbosity) fprintf(stderr, "making '%s' %d x %d, type %d\n",
fname, width, height, type); fname, width, height, type);