more tweaks, still not working

argh, can't see the problem
This commit is contained in:
John Cupitt 2011-06-08 22:13:30 +01:00
parent 788a43b8b1
commit ecf344ec0f
2 changed files with 24 additions and 6 deletions

16
TODO
View File

@ -1,3 +1,19 @@
- read_header() from im_read_dmask() annoys valgrind
==14466== Use of uninitialised value of size 8
==14466== at 0xA0BE850: __strspn_sse42 (emmintrin.h:685)
==14466== by 0x4F815AB: vips_break_token (util.c:373)
==14466== by 0x4F87F68: read_header (rw_mask.c:412)
==14466== by 0x4F88198: im_read_dmask (rw_mask.c:488)
==14466== by 0x4F01C1F: dmask_init (dispatch_types.c:263)
==14466== by 0x4F03AA2: build_args (package.c:956)
==14466== by 0x4F03EBC: dispatch_function (package.c:1068)
==14466== by 0x4F0403C: im_run_command (package.c:1133)
==14466== by 0x403997: main (vips.c:1074)
- revisit orc conv
use an 8.8 accumulator ... build the scale into the 8.8 coeffs ... no div at

View File

@ -435,10 +435,12 @@ boxes_new( IMAGE *in, IMAGE *out, DOUBLEMASK *mask, int n_layers, int cluster )
/* ASCII-art layer drawing.
*/
printf( "lines:\n" );
printf( " n b r f\n" );
for( y = 0; y < boxes->n_vlines; y++ ) {
int b = boxes->band[y];
printf( "%3d %3d - %2d x ", y, b, boxes->factor[y] );
printf( "%3d %3d %3d %2d ",
y, b, boxes->row[y], boxes->factor[y] );
for( x = 0; x < 50; x++ ) {
int rx = x * (mask->xsize + 1) / 50;
@ -798,13 +800,13 @@ aconv_vgenerate( REGION *or, void *vseq, void *a, void *b )
sum = 0;
for( z = 0; z < n_vlines; z++ )
sum += boxes->factor[z] * p[seq->start[z]];
p += boxes->n_hlines;
sum = (sum + boxes->rounding) / boxes->area;
CLIP_UCHAR( sum );
*q = sum;
q += 1;
}
}
*q = sum;
q += 1;
p += boxes->n_hlines;
}
}
break;