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><a class='active' href='/guix/log/README'>log</a><a href='/guix/tree/README?id=198840bcb597fa7c9b15a7e760c22cd5ece0cc4f'>tree</a><a href='/guix/commit/README?id=198840bcb597fa7c9b15a7e760c22cd5ece0cc4f'>commit</a><a href='/guix/diff/README?id=198840bcb597fa7c9b15a7e760c22cd5ece0cc4f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/README'>
<input type='hidden' name='id' value='198840bcb597fa7c9b15a7e760c22cd5ece0cc4f'/><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=198840bcb597fa7c9b15a7e760c22cd5ece0cc4f'>root</a>/<a href='/guix/log/README?id=198840bcb597fa7c9b15a7e760c22cd5ece0cc4f'>README</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/README?id=198840bcb597fa7c9b15a7e760c22cd5ece0cc4f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-05-20 01:58:04 +0200'>2021-05-20</span></td><td><a href='/guix/commit/README?id=c0087d33705f53cc3619a1a43a33602aaecc3a8b'>The #guix channel is hosted by Libera Chat.</a><span class='msg-avail'>...<span class='msg-tooltip'>* README (Contact): Update network name.
* ROADMAP: Likewise.
* doc/contributing.texi (Contributing): Likewise.
* doc/guix.texi (After System Installation): Likewise.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-10-23 12:57:20 -0400'>2020-10-23</span></td><td><a href='/guix/commit/README?id=b5aaa3a4fb985d21e21e2a67f48b52f13ebd4728'>doc: Update README.</a><span class='msg-avail'>...<span class='msg-tooltip'>* README (Installation): Do not mention installing Guix from Git anymore.
(Building from Git): Add section.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-10-22 22:47:54 -0400'>2020-10-22</span></td><td><a href='/guix/commit/README?id=503d2bfde08f9bf97bbf430516d2f19faedd4319'>README: Refer to the manual for building from Git.</a><span class='msg-avail'>...<span class='msg-tooltip'>* README (Installing Guix from Guix): Remove section.
(Installation): For installing from Git, refer to the "Building from Git"
section of the manual and suggest using './pre-inst-env guix pull' rather than
'make install' for installing Guix.
</span></span></td><td>Maxim Cournoyer</td></tr>