From 2450f7f002de93bad15d37d43311ea43a45e2796 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Sun, 10 Aug 2014 21:40:10 +0200 Subject: [PATCH] Move _iter_lines() method from SubImage to Image. --- pixelocr/image.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pixelocr/image.py b/pixelocr/image.py index 3cac64c..d9a5316 100644 --- a/pixelocr/image.py +++ b/pixelocr/image.py @@ -151,6 +151,23 @@ class Image(object): bottom_margin = _get_margin_height(reversed(self.bitmap)) return self[top_margin:self.height - bottom_margin, :] + def _iter_lines(self, min_space, T=False): + line_start = None + prev_line_end = 0 + + for i, row in enumerate(self.bitmap): + if _is_nonblank(row): + if line_start is None: + line_start = i + height = line_start - prev_line_end + if height >= min_space: + yield self[prev_line_end:line_start] + else: + if line_start is not None: + yield self[line_start:i,:] + line_start = None + prev_line_end = i + class SubImage(Image): def __init__(self, parent, y1, y2, x1, x2): @@ -171,20 +188,3 @@ class SubImage(Image): @property def T(self): return type(self)(self.parent.T, self.x1, self.x2, self.y1, self.y2) - - def _iter_lines(self, min_space, T=False): - line_start = None - prev_line_end = 0 - - for i, row in enumerate(self.bitmap): - if _is_nonblank(row): - if line_start is None: - line_start = i - height = line_start - prev_line_end - if height >= min_space: - yield self[prev_line_end:line_start] - else: - if line_start is not None: - yield self[line_start:i,:] - line_start = None - prev_line_end = i