diff options
| author | Simon Wells <swel024@gmail.com> | 2017-11-04 23:56:42 +0000 |
|---|---|---|
| committer | Simon Wells <swel024@gmail.com> | 2017-11-04 23:56:42 +0000 |
| commit | a204dbf637510ec05294670562de8cdfe4ab69e7 (patch) | |
| tree | 562a0c478b2ea0283aac6dfa4bb55158a9a7c2ed | |
| parent | added braces as specified in the coding standard (diff) | |
| download | inkscape-a204dbf637510ec05294670562de8cdfe4ab69e7.tar.gz inkscape-a204dbf637510ec05294670562de8cdfe4ab69e7.zip | |
Change abs to std::abs to fix warnings
| -rw-r--r-- | src/extension/internal/emf-inout.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-parser.cpp | 8 | ||||
| -rw-r--r-- | src/helper/geom-pathstroke.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index 92deb2e19..e47ce48bf 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -1056,7 +1056,7 @@ Emf::pix_to_abs_size(PEMF_CALLBACK_DATA d, double px) void Emf::snap_to_faraway_pair(double *x, double *y) { - if((abs(abs(*x) - faraway)/faraway <= 1e-4) && (abs(abs(*y) - faraway)/faraway <= 1e-4)){ + if((std::abs(std::abs(*x) - faraway)/faraway <= 1e-4) && (std::abs(std::abs(*y) - faraway)/faraway <= 1e-4)){ *x = (*x > 0 ? faraway : -faraway); *y = (*y > 0 ? faraway : -faraway); } diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index 604b7f807..15bc2d746 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -2189,13 +2189,13 @@ void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { int i; for (i = 0; i < nComps; ++i) { - if (abs(patch->color[0][0].c[i] - patch->color[0][1].c[i]) + if (std::abs(patch->color[0][0].c[i] - patch->color[0][1].c[i]) > patchColorDelta || - abs(patch->color[0][1].c[i] - patch->color[1][1].c[i]) + std::abs(patch->color[0][1].c[i] - patch->color[1][1].c[i]) > patchColorDelta || - abs(patch->color[1][1].c[i] - patch->color[1][0].c[i]) + std::abs(patch->color[1][1].c[i] - patch->color[1][0].c[i]) > patchColorDelta || - abs(patch->color[1][0].c[i] - patch->color[0][0].c[i]) + std::abs(patch->color[1][0].c[i] - patch->color[0][0].c[i]) > patchColorDelta) { break; } diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp index 50627fd0b..c3e4f8213 100644 --- a/src/helper/geom-pathstroke.cpp +++ b/src/helper/geom-pathstroke.cpp @@ -341,8 +341,8 @@ Geom::Point adjust_circles( Geom::Circle &circle1, Geom::Circle &circle2, Geom:: Geom::Point p0 = points[0].point(); Geom::Point p1 = points[1].point(); // std::cout << " points: " << p0 << "; " << p1 << std::endl; - if( abs( Geom::distance( p0, circle2.center() ) - circle2.radius() ) < - abs( Geom::distance( p1, circle2.center() ) - circle2.radius() ) ) { + if( std::abs( Geom::distance( p0, circle2.center() ) - circle2.radius() ) < + std::abs( Geom::distance( p1, circle2.center() ) - circle2.radius() ) ) { return p0; } else { return p1; |