<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/78ac2be0010034975862c228ebf389850f58f1e1">https://github.com/macports/macports-ports/commit/78ac2be0010034975862c228ebf389850f58f1e1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 78ac2be0010 ocrad: update to 0.29
</span>78ac2be0010 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78ac2be0010034975862c228ebf389850f58f1e1
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Sun Jan 21 08:23:14 2024 +0300
<span style='display:block; white-space:pre;color:#404040;'> ocrad: update to 0.29
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00010.html
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add revision and remove platforms line
</span><span style='display:block; white-space:pre;color:#404040;'> * add myself as maintainer
</span><span style='display:block; white-space:pre;color:#404040;'> * remove obsolete patches
</span><span style='display:block; white-space:pre;color:#404040;'> * update configure flags
</span>---
graphics/ocrad/Portfile | 18 +++---
graphics/ocrad/files/patch-character_r11.cc.diff | 38 ------------
graphics/ocrad/files/patch-feats_test0.cc.diff | 73 ------------------------
graphics/ocrad/files/patch-profile.cc.diff | 28 ---------
graphics/ocrad/files/patch-track.cc.diff | 26 ---------
5 files changed, 9 insertions(+), 174 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ocrad/Portfile b/graphics/ocrad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8bf5a9dcb5d..e07fd24e397 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ocrad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ocrad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,10 +3,10 @@
</span> PortSystem 1.0
name ocrad
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@aeiouaeiouaeiouaeiouaeiouaeiou outlook.com:aeioudev} openmaintainer
</span> license GPL-3
description ocrad is an optical character recognition program
long_description GNU Ocrad is an OCR (Optical Character Recognition) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ long_description GNU Ocrad is an OCR (Optical Character Recognition) \
</span> homepage https://www.gnu.org/software/ocrad/ocrad.html
master_sites gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7c6b431c7210ab35914eb3ba37f95e236163b19f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 95567
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7f57c0f32c81076f636f0c12591fd33da72cdf5d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 11200cc6b0b7ba16884a72dccb58ef694f7aa26cd2b2041e555580f064d2d9e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 96519
</span>
depends_extract bin:lzip:lzip
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ depends_lib port:libpng
</span> configure.args CC="${configure.cc}" \
CXX="${configure.cxx}" \
CPPFLAGS="${configure.cppflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ocrad/files/patch-character_r11.cc.diff b/graphics/ocrad/files/patch-character_r11.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c1ca123f3df..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ocrad/files/patch-character_r11.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- character_r11.cc 2013-06-21 01:35:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ character_r11.cc 2013-12-14 12:20:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rectangle.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -229,7 +230,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Features f( b );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int top_delta = h.top() - b.top(), bottom_delta = b.bottom() - h.bottom();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( std::abs( top_delta - bottom_delta ) <= std::max( 2, h.height() / 4 ) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( abs( top_delta - bottom_delta ) <= std::max( 2, h.height() / 4 ) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ocrad::similar( top_delta, bottom_delta, 40, 2 ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { // hole is vertically centred
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int code = f.test_4ADQao( charset, charbox );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -283,15 +284,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Profile bp( b, Profile::bottom );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Check for 'm' or 'w' with merged serifs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( 10 * std::abs( h2.vcenter() - h1.vcenter() ) <= b.height() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( 10 * abs( h2.vcenter() - h1.vcenter() ) <= b.height() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- h1.is_vcentred_in( b ) && h2.is_vcentred_in( b ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( ( b.bottom() - h1.bottom() <= h1.top() - b.top() ) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( b.bottom() - h2.bottom() <= h2.top() - b.top() ) && bp.isflats() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { add_guess( 'm', 0 ); return; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( 5 * std::abs( h1.bottom() - b.vcenter() ) <= b.height() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 5 * std::abs( h2.bottom() - b.vcenter() ) <= b.height() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( 5 * abs( h1.bottom() - b.vcenter() ) <= b.height() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 5 * abs( h2.bottom() - b.vcenter() ) <= b.height() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tp.isflats() && bp.minima() == 2 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { add_guess( 'w', 0 ); return; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ocrad/files/patch-feats_test0.cc.diff b/graphics/ocrad/files/patch-feats_test0.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f040e5825dc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ocrad/files/patch-feats_test0.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,73 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- feats_test0.cc 2013-06-20 01:19:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ feats_test0.cc 2013-12-14 12:19:40.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rectangle.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,14 +182,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int botmin = b.bottom() - vnoise;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( vbars() == 1 && vbar(0).width() >= 2 && 2 * vbar(0).width() < b.width() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( std::abs( vbar(0).hcenter() - b.hcenter() ) <= noise &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::abs( (vbar(0).left() - b.left()) - (b.right() - vbar(0).right()) ) <= 2 * noise )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( abs( vbar(0).hcenter() - b.hcenter() ) <= noise &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ abs( (vbar(0).left() - b.left()) - (b.right() - vbar(0).right()) ) <= 2 * noise )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( hbars() == 1 && 4 * hbar(0).height() <= b.height() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( hbar(0).top() <= topmax || hbar(0).bottom() < b.vpos( 15 ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 'T';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( std::abs( hbar(0).vcenter() - b.vcenter() ) <= 1 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( abs( hbar(0).vcenter() - b.vcenter() ) <= 1 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ocrad::similar( b.height(), b.width(), 50 ) ) return '+';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( hbars() == 2 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -223,7 +224,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( hbars() == 2 && hbar(1).bottom() >= botmin &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b.height() > b.width() && hbar(1).width() > hbar(0).width() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::abs( vbar(0).hcenter() - hbar(0).hcenter() ) <= 1 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ abs( vbar(0).hcenter() - hbar(0).hcenter() ) <= 1 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rp.iminimum() > rp.pos( 70 ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 'L';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( hbars() == 1 && Ocrad::similar( hbar(0).width(), b.width(), 10 ) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -316,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( i > lp.pos( 10 ) && i < lp.pos( 40 ) ) return '1'; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( hbars() == 1 && std::abs( hbar(0).vcenter() - b.vcenter() ) <= 1 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( hbars() == 1 && abs( hbar(0).vcenter() - b.vcenter() ) <= 1 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ocrad::similar( b.height(), b.width(), 50 ) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tp.isupit() && bp.isupit() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return '+';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -525,7 +526,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int hdiff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( b.bottom_hook( &hdiff ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( std::abs( hdiff ) <= b.height() / 8 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( abs( hdiff ) <= b.height() / 8 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( segments_in_row( b.vpos( 30 ) ) >= 3 ) return 'v';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( bp.isconvex() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -601,7 +602,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( ( vbars() <= 2 || ( vbars() == 3 && b.height() >= b.width() ) ) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tp.minima( b.height() / 2 ) <= 2 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tp.minima( ( 2 * b.height() ) / 5 ) <= 2 && !lp.istpit() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 4 * std::abs( rp[rp.pos(20)] - rp[rp.pos(80)] ) <= b.width() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 4 * abs( rp[rp.pos(20)] - rp[rp.pos(80)] ) <= b.width() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int row = b.top() + tp[tp.pos(50)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( row > b.vcenter() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -855,7 +856,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( b.get_bit( b.top() + i, b.left() + i ) ) ++d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( b.get_bit( b.top() + i, b.right() - i ) ) --d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( 2 * std::abs( d ) >= n - 1 ) return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( 2 * abs( d ) >= n - 1 ) return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( ( !porosity && inner_area * 100 >= inner_size * 75 ) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( b.width() >= 7 && b.height() >= 7 &&
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ocrad/files/patch-profile.cc.diff b/graphics/ocrad/files/patch-profile.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 71d3292e47c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ocrad/files/patch-profile.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- profile.cc 2013-06-20 12:39:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ profile.cc 2013-12-14 12:18:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rectangle.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -251,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { if( data[i] <= noise ) continue; else return isconvex_; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int d = data[i] - data[i-1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( d == 0 ) continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( d > dmax ) { if( std::abs( d ) <= noise ) ++dmax; else dmax = d; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( d > dmax ) { if( abs( d ) <= noise ) ++dmax; else dmax = d; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if( d < dmax - noise ) return isconvex_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( 2 * ( min_end - min_begin + 1 ) < samples() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -616,7 +617,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for( int i = 0; i < samples(); ++i )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int y = ( dx * yl ) + ( ( i - xl ) * dy );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int d = std::abs( ( dx * data[i] ) - y );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int d = abs( ( dx * data[i] ) - y );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( d >= dmax && ( ( dx * data[i] ) < y || ( i >= xl && i <= xr ) ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( d > dmax || ( d == dmax && --faults < 0 ) ) return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ocrad/files/patch-track.cc.diff b/graphics/ocrad/files/patch-track.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0cd81db7a15..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ocrad/files/patch-track.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- track.cc 2013-03-24 18:51:08.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ track.cc 2013-12-14 12:15:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rectangle.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,12 +44,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( 9 * r1.height() <= 10 * mean_height &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9 * r2.height() <= 10 * mean_height &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10 * std::abs( r1.bottom() - r2.bottom() ) <= mean_height )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10 * abs( r1.bottom() - r2.bottom() ) <= mean_height )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { val = 0; return ( r1.height() <= r2.height() ) ? 0 : 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( val > 1 && 10 * std::abs( r1.vcenter() - r2.vcenter() ) <= mean_height )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( val > 1 && 10 * abs( r1.vcenter() - r2.vcenter() ) <= mean_height )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { val = 1; return ( r1.bottom() <= r2.bottom() ) ? 0 : 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( val > 2 && 10 * std::abs( r1.vcenter() - r2.vcenter() ) <= mean_height )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( val > 2 && 10 * abs( r1.vcenter() - r2.vcenter() ) <= mean_height )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { val = 2; return ( r1.bottom() <= r2.bottom() ) ? 0 : 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span></pre><pre style='margin:0'>
</pre>