From owner-svn-ports-head@freebsd.org Sun Apr 17 13:43:35 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5520B11874; Sun, 17 Apr 2016 13:43:35 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59B331164; Sun, 17 Apr 2016 13:43:35 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3HDhYnZ033907; Sun, 17 Apr 2016 13:43:34 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3HDhYKx033906; Sun, 17 Apr 2016 13:43:34 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201604171343.u3HDhYKx033906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 17 Apr 2016 13:43:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413510 - head/graphics/cuneiform/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.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2016 13:43:35 -0000 Author: dim (src committer) Date: Sun Apr 17 13:43:34 2016 New Revision: 413510 URL: https://svnweb.freebsd.org/changeset/ports/413510 Log: During the exp-run in bug 208158, it was found that graphics/cuneiform gives errors with libc++ 3.8.0: cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp:597:32: error: call to 'abs' is ambiguous wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber()); ^~~ This is because abs() is being called an unsigned argument. Fix this by casting the argument to the appropriate signed type. Approved by: samm@os2.kiev.ua (maintainer) MFH: 2016Q2 Added: head/graphics/cuneiform/files/ head/graphics/cuneiform/files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp (contents, props changed) Added: head/graphics/cuneiform/files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/cuneiform/files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp Sun Apr 17 13:43:34 2016 (r413510) @@ -0,0 +1,13 @@ +--- cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp.orig 2011-04-19 12:49:57 UTC ++++ cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp +@@ -594,8 +594,8 @@ Bool32 CRIControl::CreateDestinatonDIB(u + return FALSE; + } + +- wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber()); +- wNewWidth = (mbMarginsFlag ? abs(mrMargins.rmLeftMarg - mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth()); ++ wNewHeight = (mbMarginsFlag ? abs((int32_t)(mrMargins.rmBottomMarg - mrMargins.rmTopMarg)) : mpSourceDIB->GetLinesNumber()); ++ wNewWidth = (mbMarginsFlag ? abs((int32_t)(mrMargins.rmLeftMarg - mrMargins.rmRightMarg)) : mpSourceDIB->GetLineWidth()); + mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution); + + if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) )