From owner-svn-ports-head@FreeBSD.ORG  Fri Nov  1 13:48:35 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A8B1654B;
 Fri,  1 Nov 2013 13:48:35 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8754C2D8D;
 Fri,  1 Nov 2013 13:48:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1DmZc8001774;
 Fri, 1 Nov 2013 13:48:35 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1DmYpe001771;
 Fri, 1 Nov 2013 13:48:35 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201311011348.rA1DmYpe001771@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Fri, 1 Nov 2013 13:48:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332372 - head/graphics/ocropus/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 13:48:35 -0000

Author: marino
Date: Fri Nov  1 13:48:34 2013
New Revision: 332372
URL: http://svnweb.freebsd.org/changeset/ports/332372

Log:
  graphics/ocropus: Fix C++ issues for modern compilers
  
  Approved by:	portmgr (bapt, implicit)

Added:
  head/graphics/ocropus/files/patch-ocr-layout_ocr-reading-order.cc   (contents, props changed)
  head/graphics/ocropus/files/patch-ocr-line_glclass.cc   (contents, props changed)
  head/graphics/ocropus/files/patch-ocr-utils_enumerator.h   (contents, props changed)

Added: head/graphics/ocropus/files/patch-ocr-layout_ocr-reading-order.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ocropus/files/patch-ocr-layout_ocr-reading-order.cc	Fri Nov  1 13:48:34 2013	(r332372)
@@ -0,0 +1,12 @@
+--- ocr-layout/ocr-reading-order.cc.orig	2009-05-31 20:18:41.000000000 +0000
++++ ocr-layout/ocr-reading-order.cc
+@@ -210,7 +210,8 @@ namespace ocropus {
+ 
+         // Make dummy text-lines from horizontal rulings to use them as
+         // separating elements for reading order.
+-        for(int i=0,l=hor_rulings.length(); i<l; i++){
++        int hrl;
++        for(int i=0,hrl=hor_rulings.length(); i<hrl; i++){
+             line l;
+             rectangle r = hor_rulings[i];
+             l.c = r.ycenter();

Added: head/graphics/ocropus/files/patch-ocr-line_glclass.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ocropus/files/patch-ocr-line_glclass.cc	Fri Nov  1 13:48:34 2013	(r332372)
@@ -0,0 +1,11 @@
+--- ocr-line/glclass.cc.orig	2009-05-31 20:18:41.000000000 +0000
++++ ocr-line/glclass.cc
+@@ -95,7 +95,7 @@ namespace glinerec {
+     double nearest_neighbor_error(IDataset &data,int ntrials=1000) {
+         int total = 0;
+         ntrials = min(data.nsamples(),ntrials);
+-        for(int i=0;i<data.nsamples();i++) {
++        for(int ic=0;ic<data.nsamples();ic++) {
+             // FIXME use sampling without replacement
+             int i = lrand48()%data.nsamples();
+             floatarray u;

Added: head/graphics/ocropus/files/patch-ocr-utils_enumerator.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ocropus/files/patch-ocr-utils_enumerator.h	Fri Nov  1 13:48:34 2013	(r332372)
@@ -0,0 +1,24 @@
+--- ocr-utils/enumerator.h.orig	2009-05-31 20:18:41.000000000 +0000
++++ ocr-utils/enumerator.h
+@@ -32,6 +32,10 @@
+ #include <memory.h>
+ #include "ocropus.h"
+ 
++inline int Hash_hash(int x) {
++    return x;
++}
++
+ template <class T>
+ inline void memswap(T &a,T &b) {
+     char buf[sizeof (T)];
+@@ -102,10 +106,6 @@ struct EnumHash {
+     }
+ };
+ 
+-inline int Hash_hash(int x) {
+-    return x;
+-}
+-
+ struct Enumerator {
+     int n;
+     EnumHash<int,int> translation;