Date: Sun, 17 Apr 2016 13:43:34 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413510 - head/graphics/cuneiform/files Message-ID: <201604171343.u3HDhYKx033906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604171343.u3HDhYKx033906>