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 */
ca14f79f0be5ce228f55d934cda27e04'>refs</a><a class='active' href='/guix/log/gnu/packages/solidity.scm'>log</a><a href='/guix/tree/gnu/packages/solidity.scm?id=f22c20e7ca14f79f0be5ce228f55d934cda27e04'>tree</a><a href='/guix/commit/gnu/packages/solidity.scm?id=f22c20e7ca14f79f0be5ce228f55d934cda27e04'>commit</a><a href='/guix/diff/gnu/packages/solidity.scm?id=f22c20e7ca14f79f0be5ce228f55d934cda27e04'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/solidity.scm'>
<input type='hidden' name='id' value='f22c20e7ca14f79f0be5ce228f55d934cda27e04'/><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=f22c20e7ca14f79f0be5ce228f55d934cda27e04'>root</a>/<a href='/guix/log/gnu?id=f22c20e7ca14f79f0be5ce228f55d934cda27e04'>gnu</a>/<a href='/guix/log/gnu/packages?id=f22c20e7ca14f79f0be5ce228f55d934cda27e04'>packages</a>/<a href='/guix/log/gnu/packages/solidity.scm?id=f22c20e7ca14f79f0be5ce228f55d934cda27e04'>solidity.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/solidity.scm?id=f22c20e7ca14f79f0be5ce228f55d934cda27e04&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>