From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 7 23:21:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E8F45E3; Tue, 7 Jan 2014 23:21:36 +0000 (UTC) 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 201D019FD; Tue, 7 Jan 2014 23:21:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07NLZmH051871; Tue, 7 Jan 2014 23:21:35 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07NLZKU051868; Tue, 7 Jan 2014 23:21:35 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401072321.s07NLZKU051868@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 7 Jan 2014 23:21:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339048 - branches/2014Q1/cad/meshlab/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jan 2014 23:21:36 -0000 Author: mat Date: Tue Jan 7 23:21:35 2014 New Revision: 339048 URL: http://svnweb.freebsd.org/changeset/ports/339048 Log: MFH: r339043 Fix build with gcc47 PR: ports/184565 Submitted by: Christoph Moench-Tegeder Approved by: maintainer Approved by: portmgr (implicit) Added: branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h - copied unchanged from r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h - copied unchanged from r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h Deleted: branches/2014Q1/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h (from r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h Tue Jan 7 23:21:35 2014 (r339048, copy of r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h) @@ -0,0 +1,15 @@ +--- ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h.orig 2013-11-16 22:04:41.000000000 +0100 ++++ ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h 2013-11-16 22:04:56.000000000 +0100 +@@ -39,10 +39,11 @@ + //ScalarType BinWidth(ScalarType v); + + //! Reset histogram data. ++ /* dead code + void Clear() { + this->::Clear(); + CV.clear(); +- } ++ } */ + /* + Note that the histogram holds valid bins plus two semi-infinite bins. + Copied: branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h (from r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h Tue Jan 7 23:21:35 2014 (r339048, copy of r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h) @@ -0,0 +1,18 @@ +--- ../../vcglib/wrap/gl/trimesh.h.orig 2013-11-16 21:32:47.000000000 +0100 ++++ ../../vcglib/wrap/gl/trimesh.h 2013-11-16 21:33:23.000000000 +0100 +@@ -895,6 +895,7 @@ + #define VCTRACE (void)0 + //#define VCTRACE TRACE + ++/* dead code + template + void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) + { +@@ -1006,6 +1007,7 @@ + m.vert.math::Swap(newvert); + m.vn=m.vert.size(); + } ++*/ + + /* + Secondo tipo di crease angle. ha bisogno del per wedge normal