diff options
| author | dim <dim@FreeBSD.org> | 2016-04-17 21:43:34 +0800 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-04-17 21:43:34 +0800 |
| commit | 5d4b1a08d02efe3f6b9131e07c0d6a9b3f1cdc08 (patch) | |
| tree | 002335cc09bcc27f27a7b4943243f0ebcb35e5d3 | |
| parent | b5599bbe73a3679141c8bd914ed58cc1e50b5665 (diff) | |
| download | freebsd-ports-gnome-5d4b1a08d02efe3f6b9131e07c0d6a9b3f1cdc08.tar.gz freebsd-ports-gnome-5d4b1a08d02efe3f6b9131e07c0d6a9b3f1cdc08.tar.zst freebsd-ports-gnome-5d4b1a08d02efe3f6b9131e07c0d6a9b3f1cdc08.zip | |
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
| -rw-r--r-- | graphics/cuneiform/files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/graphics/cuneiform/files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp b/graphics/cuneiform/files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp new file mode 100644 index 000000000000..d232161b071e --- /dev/null +++ b/graphics/cuneiform/files/patch-cuneiform__src_Kern_rimage_sources_main_cricontrol.cpp @@ -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) ) |