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 */
a href='/guix/log/gnu'>log</a><a href='/guix/tree/gnu?id=0874c5f9062d044356d539c52bc40df435f281cf'>tree</a><a href='/guix/commit/gnu?id=0874c5f9062d044356d539c52bc40df435f281cf'>commit</a><a class='active' href='/guix/diff/gnu?id=0874c5f9062d044356d539c52bc40df435f281cf'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu'>
<input type='hidden' name='id' value='0874c5f9062d044356d539c52bc40df435f281cf'/><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/diff/?id=0874c5f9062d044356d539c52bc40df435f281cf'>root</a>/<a href='/guix/diff/gnu?id=0874c5f9062d044356d539c52bc40df435f281cf'>gnu</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='0874c5f9062d044356d539c52bc40df435f281cf'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/guix/diff/?id=0874c5f9062d044356d539c52bc40df435f281cf'>Diffstat</a> (limited to 'gnu')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/guix/diff/gnu/packages/cran.scm?id=0874c5f9062d044356d539c52bc40df435f281cf'>gnu/packages/cran.scm</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='4%'><tr><td class='add' style='width: 50.0%;'/><td class='rem' style='width: 50.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 2 insertions, 2 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm<br/>index f315e5ab21..5b7a404ce5 100644<br/>--- a/<a href='/guix/tree/gnu/packages/cran.scm?id=b5c0cb4a469a81bdb3b5523ed2dcca3351ef9aef'>gnu/packages/cran.scm</a><br/>+++ b/<a href='/guix/tree/gnu/packages/cran.scm?id=0874c5f9062d044356d539c52bc40df435f281cf'>gnu/packages/cran.scm</a></div>