diff options
author | joye <joye> | 2013-08-28 22:08:29 (GMT) |
---|---|---|
committer | joye <joye> | 2013-08-28 22:08:29 (GMT) |
commit | 0f033a1fb70f13ec84d6354d48523d0b9acf4f7c (patch) | |
tree | 5f0df1f2ec6e8a34a58c0ea98189715c76a32f1a /src | |
parent | db2b573bca0fd83c7a48294244f3ec35f2942255 (diff) | |
download | blt-0f033a1fb70f13ec84d6354d48523d0b9acf4f7c.zip blt-0f033a1fb70f13ec84d6354d48523d0b9acf4f7c.tar.gz blt-0f033a1fb70f13ec84d6354d48523d0b9acf4f7c.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r-- | src/bltGrAxis.C | 22 | ||||
-rw-r--r-- | src/bltGrElemBar.C | 4 | ||||
-rw-r--r-- | src/bltGrElemLine.C | 16 | ||||
-rw-r--r-- | src/bltGrElemLineSpline.C | 12 | ||||
-rw-r--r-- | src/bltGrMarker.C | 6 | ||||
-rw-r--r-- | src/bltGrMisc.C | 12 | ||||
-rw-r--r-- | src/bltGrPSOutput.C | 2 | ||||
-rw-r--r-- | src/bltGrText.C | 10 | ||||
-rw-r--r-- | src/bltVecCmd.C | 2 | ||||
-rw-r--r-- | src/bltVecMath.C | 4 |
10 files changed, 45 insertions, 45 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C index 9238e67..56f5769 100644 --- a/src/bltGrAxis.C +++ b/src/bltGrAxis.C @@ -369,7 +369,7 @@ SetAxisRange(AxisRange *rangePtr, double min, double max) rangePtr->min = min; rangePtr->max = max; rangePtr->range = max - min; - if (FABS(rangePtr->range) < DBL_EPSILON) { + if (fabs(rangePtr->range) < DBL_EPSILON) { rangePtr->range = 1.0; } rangePtr->scale = 1.0 / rangePtr->range; @@ -399,7 +399,7 @@ INLINE static int InRange(double x, AxisRange *rangePtr) { if (rangePtr->range < DBL_EPSILON) { - return (FABS(rangePtr->max - x) >= DBL_EPSILON); + return (fabs(rangePtr->max - x) >= DBL_EPSILON); } else { double norm; @@ -1205,7 +1205,7 @@ double Blt_HMap(Axis *axisPtr, double x) { if ((axisPtr->logScale) && (x != 0.0)) { - x = log10(FABS(x)); + x = log10(fabs(x)); } /* Map graph coordinate to normalized coordinates [0..1] */ x = (x - axisPtr->axisRange.min) * axisPtr->axisRange.scale; @@ -1233,7 +1233,7 @@ double Blt_VMap(Axis *axisPtr, double y) { if ((axisPtr->logScale) && (y != 0.0)) { - y = log10(FABS(y)); + y = log10(fabs(y)); } /* Map graph coordinate to normalized coordinates [0..1] */ y = (y - axisPtr->axisRange.min) * axisPtr->axisRange.scale; @@ -1366,7 +1366,7 @@ FixAxisRange(Axis *axisPtr) if (min == 0.0) { min = 0.0, max = 1.0; } else { - max = min + (FABS(min) * 0.1); + max = min + (fabs(min) * 0.1); } } SetAxisRange(&axisPtr->valueRange, min, max); @@ -1391,10 +1391,10 @@ FixAxisRange(Axis *axisPtr) * up a new min or max from the user-defined limit. */ if (!DEFINED(axisPtr->reqMin)) { - axisPtr->min = axisPtr->max - (FABS(axisPtr->max) * 0.1); + axisPtr->min = axisPtr->max - (fabs(axisPtr->max) * 0.1); } if (!DEFINED(axisPtr->reqMax)) { - axisPtr->max = axisPtr->min + (FABS(axisPtr->max) * 0.1); + axisPtr->max = axisPtr->min + (fabs(axisPtr->max) * 0.1); } } /* @@ -1600,8 +1600,8 @@ LogScaleAxis(Axis *axisPtr, double min, double max) majorStep = minorStep = 0.0; tickMin = tickMax = Blt_NaN(); if (min < max) { - min = (min != 0.0) ? log10(FABS(min)) : 0.0; - max = (max != 0.0) ? log10(FABS(max)) : 1.0; + min = (min != 0.0) ? log10(fabs(min)) : 0.0; + max = (max != 0.0) ? log10(fabs(max)) : 1.0; tickMin = floor(min); tickMax = ceil(max); @@ -2202,7 +2202,7 @@ AxisOffsets( tickLabel = graphPtr->bottom + graphPtr->plotBW + 2; } mark = graphPtr->bottom + offset; - fangle = FMOD(axisPtr->tickAngle, 90.0); + fangle = fmod(axisPtr->tickAngle, 90.0); if (fangle == 0.0) { axisPtr->tickAnchor = TK_ANCHOR_N; } else { @@ -3733,7 +3733,7 @@ ConfigureAxis(Axis *axisPtr) axisPtr->scrollMax = Blt_NaN(); } } - angle = FMOD(axisPtr->tickAngle, 360.0); + angle = fmod(axisPtr->tickAngle, 360.0); if (angle < 0.0f) { angle += 360.0f; } diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index 4e472fd..83974ac 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -1587,8 +1587,8 @@ MapBarProc(Graph *graphPtr, Element *basePtr) CLAMP(c2.y, top, bottom); CLAMP(c1.x, left, right); CLAMP(c2.x, left, right); - dx = FABS(c1.x - c2.x); - dy = FABS(c1.y - c2.y); + dx = fabs(c1.x - c2.x); + dy = fabs(c1.y - c2.y); if ((dx == 0) || (dy == 0)) { continue; } diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index 4028e5b..dbac1e5 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -2946,7 +2946,7 @@ DistanceToXProc( dx = p->x - q->x; dy = p->y - q->y; t->x = (double)x; - if (FABS(dx) < DBL_EPSILON) { + if (fabs(dx) < DBL_EPSILON) { double d1, d2; /* * Same X-coordinate indicates a vertical line. Pick the closest end @@ -2954,12 +2954,12 @@ DistanceToXProc( */ d1 = p->y - y; d2 = q->y - y; - if (FABS(d1) < FABS(d2)) { + if (fabs(d1) < fabs(d2)) { t->y = p->y, d = d1; } else { t->y = q->y, d = d2; } - } else if (FABS(dy) < DBL_EPSILON) { + } else if (fabs(dy) < DBL_EPSILON) { /* Horizontal line. */ t->y = p->y, d = p->y - y; } else { @@ -2970,7 +2970,7 @@ DistanceToXProc( t->y = (x * m) + b; d = y - t->y; } - return FABS(d); + return fabs(d); } static double @@ -2994,19 +2994,19 @@ DistanceToYProc( dx = p->x - q->x; dy = p->y - q->y; t->y = y; - if (FABS(dy) < DBL_EPSILON) { + if (fabs(dy) < DBL_EPSILON) { double d1, d2; /* Save Y-coordinate indicates an horizontal line. Pick the closest end * point. */ d1 = p->x - x; d2 = q->x - x; - if (FABS(d1) < FABS(d2)) { + if (fabs(d1) < fabs(d2)) { t->x = p->x, d = d1; } else { t->x = q->x, d = d2; } - } else if (FABS(dx) < DBL_EPSILON) { + } else if (fabs(dx) < DBL_EPSILON) { /* Vertical line. */ t->x = p->x, d = p->x - x; } else { @@ -3017,7 +3017,7 @@ DistanceToYProc( t->x = (y - b) / m; d = x - t->x; } - return FABS(d); + return fabs(d); } /* diff --git a/src/bltGrElemLineSpline.C b/src/bltGrElemLineSpline.C index 77fdb3c..54f0ac9 100644 --- a/src/bltGrElemLineSpline.C +++ b/src/bltGrElemLineSpline.C @@ -119,16 +119,16 @@ QuadChoose( prod2 = slope * m2; /* Find the absolute values of the slopes slope, m1, and m2. */ - mref = FABS(slope); - mref1 = FABS(m1); - mref2 = FABS(m2); + mref = fabs(slope); + mref1 = fabs(m1); + mref2 = fabs(m2); /* * If the relative deviation of m1 or m2 from slope is less than * epsilon, then choose case 2 or case 3. */ relerr = epsilon * mref; - if ((FABS(slope - m1) > relerr) && (FABS(slope - m2) > relerr) && + if ((fabs(slope - m1) > relerr) && (fabs(slope - m2) > relerr) && (prod1 >= 0.0) && (prod2 >= 0.0)) { double prod; @@ -254,7 +254,7 @@ QuadCases(Point2d *p, Point2d *q, double m1, double m2, double param[], E2 = mbar3 * (E1 - V1) + V2; } else { /* Case 3. */ k1 = (p->y - q->y + q->x * mbar2 - p->x * mbar1) / (mbar2 - mbar1); - if (FABS(m1) > FABS(m2)) { + if (fabs(m1) > fabs(m2)) { Z1 = (k1 + p->x) / 2.0; } else { Z1 = (k1 + q->x) / 2.0; @@ -450,7 +450,7 @@ QuadSlopes(Point2d *points, double *m, int nPoints) */ if ((m1 == 0.0) || (m2 == 0.0) || ((m1 * m2) <= 0.0)) { m[i] = 0.0; - } else if (FABS(m1) > FABS(m2)) { + } else if (fabs(m1) > fabs(m2)) { /* * Calculate the slope by extending the line with slope m1. */ diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index 7c8e212..02a94ef 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -1881,7 +1881,7 @@ ConfigureBitmapProc(Marker *markerPtr) if (bmPtr->srcBitmap == None) { return TCL_OK; } - bmPtr->angle = FMOD(bmPtr->reqAngle, 360.0); + bmPtr->angle = fmod(bmPtr->reqAngle, 360.0); if (bmPtr->angle < 0.0) { bmPtr->angle += 360.0; } @@ -2233,7 +2233,7 @@ DrawBitmapProc(Marker *markerPtr, Drawable drawable) if ((bitmap == None) || (bmPtr->destWidth < 1) || (bmPtr->destHeight < 1)) { return; } - rangle = FMOD(bmPtr->angle, 90.0); + rangle = fmod(bmPtr->angle, 90.0); if ((bmPtr->fillColor == NULL) || (rangle != 0.0)) { /* @@ -2739,7 +2739,7 @@ ConfigureTextProc(Marker *markerPtr) XGCValues gcValues; unsigned long gcMask; - tmPtr->style.angle = (float)FMOD(tmPtr->style.angle, 360.0); + tmPtr->style.angle = (float)fmod(tmPtr->style.angle, 360.0); if (tmPtr->style.angle < 0.0f) { tmPtr->style.angle += 360.0f; } diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index b63df8c..2b51606 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -546,10 +546,10 @@ Blt_PolyRectClip( dx = q->x - p->x; /* X-direction */ dy = q->y - p->y; /* Y-direction */ - if (FABS(dx) < EPSILON) { + if (fabs(dx) < EPSILON) { dx = (p->x > regionPtr->left) ? -EPSILON : EPSILON ; } - if (FABS(dy) < EPSILON) { + if (fabs(dy) < EPSILON) { dy = (p->y > regionPtr->top) ? -EPSILON : EPSILON ; } @@ -657,9 +657,9 @@ Blt_GetProjection( dy = p->y - q->y; /* Test for horizontal and vertical lines */ - if (FABS(dx) < DBL_EPSILON) { + if (fabs(dx) < DBL_EPSILON) { t.x = p->x, t.y = (double)y; - } else if (FABS(dy) < DBL_EPSILON) { + } else if (fabs(dy) < DBL_EPSILON) { t.x = (double)x, t.y = p->y; } else { double m1, m2; /* Slope of both lines */ @@ -777,7 +777,7 @@ Blt_HSVToXColor(HSV *hsvPtr, XColor *colorPtr) SetColor(colorPtr, hsvPtr->val, hsvPtr->val, hsvPtr->val); return; } - hue = FMOD(hsvPtr->hue, 360.0) / 60.0; + hue = fmod(hsvPtr->hue, 360.0) / 60.0; quadrant = (int)floor(hue); frac = hsvPtr->hue - quadrant; p = hsvPtr->val * (1 - (hsvPtr->sat)); @@ -1632,7 +1632,7 @@ Blt_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin, const char *borderName) sat0 = hsv.sat; count = 0; for (sat = 0.1 + (diff - 0.1); sat <= 1.0; sat += 0.2) { - if (FABS(sat0 - sat) >= 0.1) { + if (fabs(sat0 - sat) >= 0.1) { hsv.sat = sat; Blt_HSVToXColor(&hsv, &color); borderPtr->shadows[count] = Tk_GetColorByValue(tkwin, &color); diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C index 030ffde..f764b8f 100644 --- a/src/bltGrPSOutput.C +++ b/src/bltGrPSOutput.C @@ -1499,7 +1499,7 @@ Blt_Ps_DrawText( float angle; double rw, rh; - angle = FMOD(tsPtr->angle, (double)360.0); + angle = fmod(tsPtr->angle, (double)360.0); Blt_GetBoundingBox(textPtr->width, textPtr->height, angle, &rw, &rh, (Point2d *)NULL); /* diff --git a/src/bltGrText.C b/src/bltGrText.C index b91e2e5..9dcca5d 100644 --- a/src/bltGrText.C +++ b/src/bltGrText.C @@ -226,8 +226,8 @@ Blt_GetBoundingBox( double x, y; Point2d corner[4]; - angle = FMOD(angle, 360.0); - if (FMOD(angle, (double)90.0) == 0.0) { + angle = fmod(angle, 360.0); + if (fmod(angle, (double)90.0) == 0.0) { int ll, ur, ul, lr; double rotWidth, rotHeight; int quadrant; @@ -1146,7 +1146,7 @@ Blt_Ts_DrawLayout( if ((stylePtr->gc == NULL) || (stylePtr->flags & UPDATE_GC)) { Blt_Ts_ResetStyle(tkwin, stylePtr); } - angle = (float)FMOD(stylePtr->angle, 360.0); + angle = (float)fmod(stylePtr->angle, 360.0); if (angle < 0.0) { angle += 360.0; } @@ -1184,7 +1184,7 @@ Blt_Ts_UnderlineLayout( if ((stylePtr->gc == NULL) || (stylePtr->flags & UPDATE_GC)) { Blt_Ts_ResetStyle(tkwin, stylePtr); } - angle = (float)FMOD(stylePtr->angle, 360.0); + angle = (float)fmod(stylePtr->angle, 360.0); if (angle < 0.0) { angle += 360.0; } @@ -1260,7 +1260,7 @@ Blt_DrawText2( } layoutPtr = Blt_Ts_CreateLayout(string, -1, stylePtr); Blt_Ts_DrawLayout(tkwin, drawable, layoutPtr, stylePtr, x, y); - angle = FMOD(stylePtr->angle, 360.0); + angle = fmod(stylePtr->angle, 360.0); if (angle < 0.0) { angle += 360.0; } diff --git a/src/bltVecCmd.C b/src/bltVecCmd.C index ac2a8f2..e995f1d 100644 --- a/src/bltVecCmd.C +++ b/src/bltVecCmd.C @@ -1177,7 +1177,7 @@ InRange(double value, double min, double max) range = max - min; if (range < DBL_EPSILON) { - return (FABS(max - value) < DBL_EPSILON); + return (fabs(max - value) < DBL_EPSILON); } else { double norm; diff --git a/src/bltVecMath.C b/src/bltVecMath.C index 8481770..2638667 100644 --- a/src/bltVecMath.C +++ b/src/bltVecMath.C @@ -337,7 +337,7 @@ Skew(Blt_Vector *vectorPtr) for(vp = vPtr->valueArr + vPtr->first, vend = vPtr->valueArr + vPtr->last; vp <= vend; vp++) { diff = *vp - mean; - diff = FABS(diff); + diff = fabs(diff); diffsq = diff * diff; var += diffsq; skew += diffsq * diff; @@ -378,7 +378,7 @@ AvgDeviation(Blt_Vector *vectorPtr) for(vp = vPtr->valueArr + vPtr->first, vend = vPtr->valueArr + vPtr->last; vp <= vend; vp++) { diff = *vp - mean; - avg += FABS(diff); + avg += fabs(diff); count++; } if (count < 2) { |