segment.h (ocrad-0.24) | : | segment.h (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 35 | skipping to change at line 35 | |||
void add_point( const int col ); | void add_point( const int col ); | |||
void add_csegment( const Csegment & seg ); | void add_csegment( const Csegment & seg ); | |||
bool valid() const { return ( left <= right ); } | bool valid() const { return ( left <= right ); } | |||
int size() const { return ( left <= right ) ? right - left + 1 : 0; } | int size() const { return ( left <= right ) ? right - left + 1 : 0; } | |||
bool includes( const Csegment & seg ) const | bool includes( const Csegment & seg ) const | |||
{ return ( seg.valid() && left <= seg.left && seg.right <= right ); } | { return ( seg.valid() && left <= seg.left && seg.right <= right ); } | |||
bool includes( const int col ) const | bool includes( const int col ) const | |||
{ return ( left <= col && col <= right ); } | { return ( left <= col && col <= right ); } | |||
bool overlaps( const Csegment & seg ) const | ||||
{ return ( valid() && seg.valid() && left <= seg.right && right >= seg.left | ||||
); } | ||||
int distance( const Csegment & seg ) const; | int distance( const Csegment & seg ) const; | |||
int distance( const int col ) const; | int distance( const int col ) const; | |||
}; | }; | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 4 lines changed or added |