sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better line/col numbering in csvload

This commit is contained in:
John Cupitt 2020-02-24 14:14:27 +00:00
parent 175408733f
commit b1e1d4b4f6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libvips/foreign/csvload.c
View File

@ -311,10 +311,8 @@ vips_foreign_load_csv_read_double( VipsForeignLoadCsv *csv, double *out )
/* If it's a separator, we have to step over it.
*/
if( csv->sepmap[ch] ) {
if( csv->sepmap[ch] )
(void) VIPS_SBUF_GETC( csv->sbuf );
csv->colno += 1;
}
return( ch );
}
@ -348,9 +346,10 @@ vips_foreign_load_csv_header( VipsForeignLoad *load )
/* Parse the first line to get the number of columns.
*/
csv->colno = 1;
csv->lineno = csv->skip;
csv->lineno = csv->skip + 1;
csv->colno = 0;
do {
csv->colno += 1;
ch = vips_foreign_load_csv_read_double( csv, &value );
} while( ch != '\n' &&
ch != EOF );
@ -410,13 +409,14 @@ vips_foreign_load_csv_load( VipsForeignLoad *load )
VIPS_FORMAT_DOUBLE,
VIPS_CODING_NONE, VIPS_INTERPRETATION_B_W, 1.0, 1.0 );
csv->lineno = csv->skip;
csv->lineno = csv->skip + 1;
for( y = 0; y < load->real->Ysize; y++ ) {
csv->colno = 1;
csv->colno = 0;
for( x = 0; x < load->real->Xsize; x++ ) {
double value;
csv->colno += 1;
ch = vips_foreign_load_csv_read_double( csv, &value );
if( ch == EOF ) {
vips_error( class->nickname,