Extracted from upstream commit 0264e7da2be67182deb031228eb07e6ed4943c81.

diff --git a/src/lib_ccx/ocr.c b/src/lib_ccx/ocr.c
index 31cc1c5c..73bd4818 100644
--- a/src/lib_ccx/ocr.c
+++ b/src/lib_ccx/ocr.c
@@ -331,6 +331,11 @@ char *ocr_bitmap(void *arg, png_color *palette, png_byte *alpha, unsigned char *
 	}
 
 	BOX *crop_points = ignore_alpha_at_edge(copy->alpha, copy->data, w, h, color_pix, &color_pix_out);
+
+	l_int32 x, y, _w, _h;
+
+	boxGetGeometry(crop_points, &x, &y, &_w, &_h);
+
 	// Converting image to grayscale for OCR to avoid issues with transparency
 	cpix_gs = pixConvertRGBToGray(cpix, 0.0, 0.0, 0.0);
 
@@ -426,8 +431,8 @@ char *ocr_bitmap(void *arg, png_color *palette, png_byte *alpha, unsigned char *
 				{
 					for (int j = x1; j <= x2; j++)
 					{
-						if (copy->data[(crop_points->y + i) * w + (crop_points->x + j)] != firstpixel)
-							histogram[copy->data[(crop_points->y + i) * w + (crop_points->x + j)]]++;
+						if (copy->data[(y + i) * w + (x + j)] != firstpixel)
+							histogram[copy->data[(y + i) * w + (x + j)]]++;
 					}
 				}
 				/* sorted in increasing order of intensity */
a88ac20b879e00d442f85abe'>refs</a><a class='active' href='/guix/log/gnu/packages/cook.scm'>log</a><a href='/guix/tree/gnu/packages/cook.scm?id=951610567f623512a88ac20b879e00d442f85abe'>tree</a><a href='/guix/commit/gnu/packages/cook.scm?id=951610567f623512a88ac20b879e00d442f85abe'>commit</a><a href='/guix/diff/gnu/packages/cook.scm?id=951610567f623512a88ac20b879e00d442f85abe'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/cook.scm'>
<input type='hidden' name='id' value='951610567f623512a88ac20b879e00d442f85abe'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=951610567f623512a88ac20b879e00d442f85abe'>root</a>/<a href='/guix/log/gnu?id=951610567f623512a88ac20b879e00d442f85abe'>gnu</a>/<a href='/guix/log/gnu/packages?id=951610567f623512a88ac20b879e00d442f85abe'>packages</a>/<a href='/guix/log/gnu/packages/cook.scm?id=951610567f623512a88ac20b879e00d442f85abe'>cook.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/cook.scm?id=951610567f623512a88ac20b879e00d442f85abe&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-04-14 22:48:52 +0200'>2020-04-14</span></td><td><a href='/guix/commit/gnu/packages/cook.scm?id=2e3d5fdf055906a7de356d8f161cebaa3a40e691'>gnu: cook: Fix test failure.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cook.scm (cook)[arguments]: Override LC_ALL for one test.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-03-16 16:48:31 +0100'>2020-03-16</span></td><td><a href='/guix/commit/gnu/packages/cook.scm?id=1fddf8ef1702f96340d7bede8ecbd90b64c2019f'>gnu: cook: Fix.</a><span class='msg-avail'>...<span class='msg-tooltip'>This follows up on commit 5adc59e6fe8abb701df8fc97d56a6e60258318a4.

* gnu/packages/cook.scm (cook)[home-page]: Better.

Reported-by: Marius Bakke &lt;mbakke@fastmail.com&gt;
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-03-16 16:32:43 +0100'>2020-03-16</span></td><td><a href='/guix/commit/gnu/packages/cook.scm?id=5adc59e6fe8abb701df8fc97d56a6e60258318a4'>gnu: cook: Use archived home page.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cook.scm (cook)[home-page]: Use a Web Archived copy.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>