page_image_io.cc (ocrad-0.24) | : | page_image_io.cc (ocrad-0.25) | ||
---|---|---|---|---|
/* GNU Ocrad - Optical Character Recognition program | /* GNU Ocrad - Optical Character Recognition program | |||
Copyright (C) 2003-2014 Antonio Diaz Diaz. | Copyright (C) 2003-2015 Antonio Diaz Diaz. | |||
This program is free software: you can redistribute it and/or modify | This program is free software: you can redistribute it and/or modify | |||
it under the terms of the GNU General Public License as published by | it under the terms of the GNU General Public License as published by | |||
the Free Software Foundation, either version 2 of the License, or | the Free Software Foundation, either version 2 of the License, or | |||
(at your option) any later version. | (at your option) any later version. | |||
This program is distributed in the hope that it will be useful, | This program is distributed in the hope that it will be useful, | |||
but WITHOUT ANY WARRANTY; without even the implied warranty of | but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
GNU General Public License for more details. | GNU General Public License for more details. | |||
skipping to change at line 45 | skipping to change at line 45 | |||
int ch = std::fgetc( f ); | int ch = std::fgetc( f ); | |||
if( ch == EOF ) | if( ch == EOF ) | |||
throw Page_image::Error( "end-of-file reading pnm file." ); | throw Page_image::Error( "end-of-file reading pnm file." ); | |||
return ch; | return ch; | |||
} | } | |||
uint8_t pnm_getc( FILE * const f ) | uint8_t pnm_getc( FILE * const f ) | |||
{ | { | |||
uint8_t ch; | uint8_t ch = pnm_getrawbyte( f ); | |||
bool comment = false; | if( ch == '#' ) // comment | |||
{ do ch = pnm_getrawbyte( f ); while( ch != '\n' ); } | ||||
do { | ||||
ch = pnm_getrawbyte( f ); | ||||
if( ch == '#' ) comment = true; | ||||
else if( ch == '\n' ) comment = false; | ||||
} | ||||
while( comment ); | ||||
return ch; | return ch; | |||
} | } | |||
int pnm_getint( FILE * const f ) | int pnm_getint( FILE * const f ) | |||
{ | { | |||
uint8_t ch; | uint8_t ch; | |||
int i = 0; | int i = 0; | |||
do ch = pnm_getc( f ); while( std::isspace( ch ) ); | do ch = pnm_getc( f ); while( std::isspace( ch ) ); | |||
if( !std::isdigit( ch ) ) | if( !std::isdigit( ch ) ) | |||
End of changes. 2 change blocks. | ||||
10 lines changed or deleted | 4 lines changed or added |