tTh
/
FloatImg
2
2
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity

add "reverse flag" to fimg_contour_2x2

This commit is contained in:
tth 2020-10-10 12:34:29 +02:00
parent 414bff491b
commit 8206a1ac0a
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
floatimg.h
View File

@ -98,7 +98,7 @@ int fimg_lissage_2x2(FloatImg *img);
int fimg_filter_3x3(FloatImg *s, FloatImg *d, FimgFilter3x3 *filtr); int fimg_filter_3x3(FloatImg *s, FloatImg *d, FimgFilter3x3 *filtr);
int fimg_contour_2x2(FloatImg *psrc, FloatImg *pdst, int notused); int fimg_contour_2x2(FloatImg *psrc, FloatImg *pdst, int reverse);
/* 'sfx0' module */ /* 'sfx0' module */
int fimg_killcolors_a(FloatImg *fimg, float fval); int fimg_killcolors_a(FloatImg *fimg, float fval);

18
funcs/contour2x2.c
View File

@ -14,10 +14,11 @@ int verbosity;
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* nouveau 4 octobre 2020, juste avant sonoptic de la pluie craignos */ /* nouveau 4 octobre 2020, juste avant sonoptic de la pluie craignos */
int fimg_contour_2x2(FloatImg *psrc, FloatImg *pdst, int notused) int fimg_contour_2x2(FloatImg *psrc, FloatImg *pdst, int reverse)
{ {
float avg[4]; float avg[4];
int foo, x, y, q; int foo, x, y, q;
float v1, v2;
int tbl[] = /* deep magic inside */ int tbl[] = /* deep magic inside */
{ {
@ -28,9 +29,16 @@ int tbl[] = /* deep magic inside */
}; };
#if DEBUG_LEVEL #if DEBUG_LEVEL
fprintf(stderr, ">>> %s ( %p %p %d )\n", __func__, psrc, pdst, notused); fprintf(stderr, ">>> %s ( %p %p %d )\n", __func__, psrc, pdst, reverse);
#endif #endif
if (reverse) {
v1 = 0.0; v2 = 1.0;
}
else {
v1 = 1.0; v2 = 0.0;
}
foo = fimg_meanvalues(psrc, avg); foo = fimg_meanvalues(psrc, avg);
if (verbosity) { if (verbosity) {
fprintf(stderr, "mean values : %f %f %f\n", avg[0], avg[1], avg[2]); fprintf(stderr, "mean values : %f %f %f\n", avg[0], avg[1], avg[2]);
@ -48,19 +56,19 @@ for (y=0; y<psrc->height-1; y++) {
( RP(x+1, y) << 2 ) | ( RP(x+1, y) << 2 ) |
( RP(x, y+1) << 1 ) | ( RP(x, y+1) << 1 ) |
( RP(x+1, y+1) ) ); ( RP(x+1, y+1) ) );
pdst->R[(y*psrc->width)+x] = tbl[q] ? 1.0 : 0.0 ; pdst->R[(y*psrc->width)+x] = tbl[q] ? v1 : v2 ;
q = ( ( GP(x, y) << 3 ) | q = ( ( GP(x, y) << 3 ) |
( GP(x+1, y) << 2 ) | ( GP(x+1, y) << 2 ) |
( GP(x, y+1) << 1 ) | ( GP(x, y+1) << 1 ) |
( GP(x+1, y+1) ) ); ( GP(x+1, y+1) ) );
pdst->G[(y*psrc->width)+x] = tbl[q] ? 1.0 : 0.0 ; pdst->G[(y*psrc->width)+x] = tbl[q] ? v1 : v2 ;
q = ( ( BP(x, y) << 3 ) | q = ( ( BP(x, y) << 3 ) |
( BP(x+1, y) << 2 ) | ( BP(x+1, y) << 2 ) |
( BP(x, y+1) << 1 ) | ( BP(x, y+1) << 1 ) |
( BP(x+1, y+1) ) ); ( BP(x+1, y+1) ) );
pdst->B[(y*psrc->width)+x] = tbl[q] ? 1.0 : 0.0 ; pdst->B[(y*psrc->width)+x] = tbl[q] ? v1 : v2 ;
} }

2
funcs/t.c
View File

@ -78,7 +78,7 @@ else {
fimg_clone(&src, &dst, 1); fimg_clone(&src, &dst, 1);
foo = fimg_contour_2x2(&src, &dst, 0); foo = fimg_contour_2x2(&src, &dst, 1);
if (foo) { if (foo) {
fprintf(stderr, "%s: err %d in contour_2x2\n", __func__, foo); fprintf(stderr, "%s: err %d in contour_2x2\n", __func__, foo);
return foo; return foo;