Skip to content

Commit 200313f

Browse files
author
Robert Sachunsky
committed
fix Workspace.save_image_file args
1 parent 8841abc commit 200313f

File tree

6 files changed

+18
-32
lines changed

6 files changed

+18
-32
lines changed

‎ocrd_cis/ocropy/binarize.py‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,8 @@ def process_page(self, page, page_image, page_xywh, zoom, page_id, file_id):
213213
file_id += '.IMG-BIN'
214214
features += ',binarized'
215215
file_path = self.workspace.save_image_file(
216-
bin_image,
217-
file_id,
218-
page_id=page_id,
219-
file_grp=self.output_file_grp)
216+
bin_image, file_id, self.output_file_grp,
217+
page_id=page_id)
220218
# update PAGE (reference the image file):
221219
page.add_AlternativeImage(AlternativeImageType(
222220
filename=file_path,
@@ -263,10 +261,8 @@ def process_region(self, region, region_image, region_xywh, zoom, page_id, file_
263261
file_id += '.IMG-BIN'
264262
features += ',binarized'
265263
file_path = self.workspace.save_image_file(
266-
bin_image,
267-
file_id,
268-
page_id=page_id,
269-
file_grp=self.output_file_grp)
264+
bin_image, file_id, self.output_file_grp,
265+
page_id=page_id)
270266
# update PAGE (reference the image file):
271267
region.add_AlternativeImage(AlternativeImageType(
272268
filename=file_path,
@@ -306,10 +302,8 @@ def process_line(self, line, line_image, line_xywh, zoom, page_id, region_id, fi
306302
file_id += '.IMG-BIN'
307303
features += ',binarized'
308304
file_path = self.workspace.save_image_file(
309-
bin_image,
310-
file_id,
311-
page_id=page_id,
312-
file_grp=self.output_file_grp)
305+
bin_image, file_id, self.output_file_grp,
306+
page_id=page_id)
313307
# update PAGE (reference the image file):
314308
line.add_AlternativeImage(AlternativeImageType(
315309
filename=file_path,

‎ocrd_cis/ocropy/clip.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,8 @@ def process_segment(self, segment, segment_mask, segment_polygon, neighbours,
257257
segment_image = crop_image(segment_image,box=segment_bbox)
258258
# update METS (add the image file):
259259
file_path = self.workspace.save_image_file(
260-
segment_image,
261-
file_id=file_id + '.IMG-CLIP',
262-
page_id=page_id,
263-
file_grp=self.output_file_grp)
260+
segment_image, file_id + '.IMG-CLIP', self.output_file_grp,
261+
page_id=page_id)
264262
# update PAGE (reference the image file):
265263
segment.add_AlternativeImage(AlternativeImageType(
266264
filename=file_path,

‎ocrd_cis/ocropy/denoise.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,8 @@ def process_segment(self, segment, segment_image, segment_xywh, zoom, page_id, f
127127
maxsize=self.parameter['noise_maxsize']/zoom*300/72) # in pt
128128
# update METS (add the image file):
129129
file_path = self.workspace.save_image_file(
130-
bin_image,
131-
file_id + '.IMG-DESPECK',
132-
page_id=page_id,
133-
file_grp=self.output_file_grp)
130+
bin_image, file_id + '.IMG-DESPECK', self.output_file_grp,
131+
page_id=page_id)
134132
# update PAGE (reference the image file):
135133
segment.add_AlternativeImage(AlternativeImageType(
136134
filename=file_path,

‎ocrd_cis/ocropy/deskew.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,8 @@ def _process_segment(self, segment, segment_image, segment_coords, segment_id, p
142142
segment_coords['features'] += ',deskewed'
143143
# update METS (add the image file):
144144
file_path = self.workspace.save_image_file(
145-
segment_image,
146-
file_id + '.IMG-DESKEW',
147-
page_id=page_id,
148-
file_grp=self.output_file_grp)
145+
segment_image, file_id + '.IMG-DESKEW', self.output_file_grp,
146+
page_id=page_id)
149147
# update PAGE (reference the image file):
150148
segment.add_AlternativeImage(AlternativeImageType(
151149
filename=file_path,

‎ocrd_cis/ocropy/dewarp.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ def process(self):
168168
file_path = self.workspace.save_image_file(
169169
dew_image,
170170
file_id + '_' + region.id + '_' + line.id + '.IMG-DEWARP',
171-
page_id=input_file.pageId,
172-
file_grp=self.output_file_grp)
171+
self.output_file_grp,
172+
page_id=input_file.pageId)
173173
# update PAGE (reference the image file):
174174
alternative_image = line.get_AlternativeImage()
175175
line.add_AlternativeImage(AlternativeImageType(

‎ocrd_cis/ocropy/segment.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -726,9 +726,8 @@ def _process_element(self, element, ignore, image, coords, element_id, file_id,
726726
element_array[sepmask] = np.amax(element_array) # clip to white/bg
727727
image_clipped = array2pil(element_array)
728728
file_path = self.workspace.save_image_file(
729-
image_clipped, file_id + '.IMG-CLIP',
730-
page_id=page_id,
731-
file_grp=self.output_file_grp)
729+
image_clipped, file_id + '.IMG-CLIP', self.output_file_grp,
730+
page_id=page_id)
732731
element.add_AlternativeImage(AlternativeImageType(
733732
filename=file_path, comments=coords['features'] + ',clipped'))
734733
else:
@@ -768,9 +767,8 @@ def _process_element(self, element, ignore, image, coords, element_id, file_id,
768767
element_array[sep_bin] = np.amax(element_array) # clip to white/bg
769768
image_clipped = array2pil(element_array)
770769
file_path = self.workspace.save_image_file(
771-
image_clipped, file_id + '.IMG-CLIP',
772-
page_id=page_id,
773-
file_grp=self.output_file_grp)
770+
image_clipped, file_id + '.IMG-CLIP', self.output_file_grp,
771+
page_id=page_id)
774772
# update PAGE (reference the image file):
775773
element.add_AlternativeImage(AlternativeImageType(
776774
filename=file_path, comments=coords['features'] + ',clipped'))

0 commit comments

Comments
 (0)