diff options
| author | Adrián Medraño Calvo <adrian@medranocalvo.com> | 2017-07-20 10:55:23 (GMT) |
|---|---|---|
| committer | Adrián Medraño Calvo <adrian@medranocalvo.com> | 2017-07-21 11:40:47 (GMT) |
| commit | ce7e3c4d7e0368d592f64d3792eeb63837732351 (patch) | |
| tree | d8e04c92f8d9bc67ec5bee16066936e13faf862a | |
| parent | 0383f13a9c207f08a063ef44afd151fc40156553 (diff) | |
| download | blt-ce7e3c4d7e0368d592f64d3792eeb63837732351.zip blt-ce7e3c4d7e0368d592f64d3792eeb63837732351.tar.gz blt-ce7e3c4d7e0368d592f64d3792eeb63837732351.tar.bz2 | |
Remove superfluous literal suffixes
| -rw-r--r-- | generic/tkbltGrAxis.C | 2 | ||||
| -rw-r--r-- | generic/tkbltGrElemBar.C | 2 | ||||
| -rw-r--r-- | generic/tkbltGrMarkerText.C | 8 | ||||
| -rw-r--r-- | generic/tkbltGraphBar.C | 4 | ||||
| -rw-r--r-- | generic/tkbltGraphSup.C | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/generic/tkbltGrAxis.C b/generic/tkbltGrAxis.C index fbfa817..d6b36a8 100644 --- a/generic/tkbltGrAxis.C +++ b/generic/tkbltGrAxis.C @@ -446,7 +446,7 @@ void Axis::mapStacked(int count, int margin) graphPtr_->getTextExtents(ops->tickFont, "0", 1, &w, &h); screenMin_ += (slice * count) + 2 + h / 2; screenRange_ = slice - 2 * 2 - h; - screenScale_ = 1.0f / screenRange_; + screenScale_ = 1.0 / screenRange_; AxisInfo info; offsets(margin, 0, &info); diff --git a/generic/tkbltGrElemBar.C b/generic/tkbltGrElemBar.C index ad3099e..e6264fb 100644 --- a/generic/tkbltGrElemBar.C +++ b/generic/tkbltGrElemBar.C @@ -272,7 +272,7 @@ void BarElement::map() return; int nPoints = NUMBEROFPOINTS(ops); - double barWidth = (ops->barWidth > 0.0f) ? ops->barWidth : gops->barWidth; + double barWidth = (ops->barWidth > 0.0) ? ops->barWidth : gops->barWidth; AxisOptions* axisyops = (AxisOptions*)ops->yAxis->ops(); double baseline = (axisyops->logScale) ? 0.0 : gops->baseline; double barOffset = barWidth * 0.5; diff --git a/generic/tkbltGrMarkerText.C b/generic/tkbltGrMarkerText.C index f6307fb..5afa6ca 100644 --- a/generic/tkbltGrMarkerText.C +++ b/generic/tkbltGrMarkerText.C @@ -120,8 +120,8 @@ int TextMarker::configure() TextMarkerOptions* ops = (TextMarkerOptions*)ops_; ops->style.angle = (float)fmod(ops->style.angle, 360.0); - if (ops->style.angle < 0.0f) - ops->style.angle += 360.0f; + if (ops->style.angle < 0.0) + ops->style.angle += 360.0; GC newGC = NULL; XGCValues gcValues; @@ -211,7 +211,7 @@ int TextMarker::pointIn(Point2d *samplePtr) if (!ops->string) return 0; - if (ops->style.angle != 0.0f) { + if (ops->style.angle != 0.0) { Point2d points[5]; // Figure out the bounding polygon (isolateral) for the text and see @@ -233,7 +233,7 @@ int TextMarker::regionIn(Region2d *extsPtr, int enclosed) { TextMarkerOptions* ops = (TextMarkerOptions*)ops_; - if (ops->style.angle != 0.0f) { + if (ops->style.angle != 0.0) { Point2d points[5]; for (int ii=0; ii<4; ii++) { points[ii].x = outline_[ii].x + anchorPt_.x; diff --git a/generic/tkbltGraphBar.C b/generic/tkbltGraphBar.C index dc8664c..6223270 100644 --- a/generic/tkbltGraphBar.C +++ b/generic/tkbltGraphBar.C @@ -239,8 +239,8 @@ int BarGraph::configure() { BarGraphOptions* ops = (BarGraphOptions*)ops_; // Don't allow negative bar widths. Reset to an arbitrary value (0.1) - if (ops->barWidth <= 0.0f) - ops->barWidth = 0.9f; + if (ops->barWidth <= 0.0) + ops->barWidth = 0.9; return Graph::configure(); } diff --git a/generic/tkbltGraphSup.C b/generic/tkbltGraphSup.C index 476a19e..a461e1f 100644 --- a/generic/tkbltGraphSup.C +++ b/generic/tkbltGraphSup.C @@ -243,7 +243,7 @@ void Graph::layoutGraph() // Step 5 // If necessary, correct for the requested plot area aspect ratio. if ((ops->reqPlotWidth == 0) && (ops->reqPlotHeight == 0) && - (ops->aspect > 0.0f)) { + (ops->aspect > 0.0)) { float ratio; // Shrink one dimension of the plotarea to fit the requested |