[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 11/25: [src]: Fix code style nit.
From: |
G. Branden Robinson |
Subject: |
[groff] 11/25: [src]: Fix code style nit. |
Date: |
Mon, 28 Mar 2022 12:08:20 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit ec38dd678a3a9fd04cad8f87f23b8c297c1bea54
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Mar 29 00:30:05 2022 +1100
[src]: Fix code style nit.
* src/devices/grodvi/dvi.cpp (dvi_printer::set_color,
draw_dvi_printer::fill_next):
* src/devices/grops/ps.cpp (output::put_color):
* src/libs/libgroff/color.cpp (color::print_color): Construct doubles
instead of casting to them.
This is more idiomatic C++ than my C-accented change in commit
87b60fb45, 15 March.
---
ChangeLog | 8 ++++++++
src/devices/grodvi/dvi.cpp | 18 +++++++++---------
src/devices/grops/ps.cpp | 2 +-
src/libs/libgroff/color.cpp | 22 +++++++++++-----------
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6cbff1fe..9678a983 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-03-29 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ * src/devices/grodvi/dvi.cpp (dvi_printer::set_color,
+ draw_dvi_printer::fill_next):
+ * src/devices/grops/ps.cpp (output::put_color):
+ * src/libs/libgroff/color.cpp (color::print_color): Construct
+ doubles instead of casting to them.
+
2022-03-28 G. Branden Robinson <g.branden.robinson@gmail.com>
[doc]: Refactor handling of "gnu.eps" file.
diff --git a/src/devices/grodvi/dvi.cpp b/src/devices/grodvi/dvi.cpp
index c98407b1..7991f8ef 100644
--- a/src/devices/grodvi/dvi.cpp
+++ b/src/devices/grodvi/dvi.cpp
@@ -315,23 +315,23 @@ void dvi_printer::set_color(color *col)
break;
case RGB:
sprintf(buf, "color rgb %.3g %.3g %.3g",
- double(Red) / (double)color::MAX_COLOR_VAL,
- double(Green) / (double)color::MAX_COLOR_VAL,
- double(Blue) / (double)color::MAX_COLOR_VAL);
+ double(Red) / double(color::MAX_COLOR_VAL),
+ double(Green) / double(color::MAX_COLOR_VAL),
+ double(Blue) / double(color::MAX_COLOR_VAL));
break;
case CMY:
col->get_cmyk(&Cyan, &Magenta, &Yellow, &Black);
// fall through
case CMYK:
sprintf(buf, "color cmyk %.3g %.3g %.3g %.3g",
- double(Cyan) / (double)color::MAX_COLOR_VAL,
- double(Magenta) / (double)color::MAX_COLOR_VAL,
- double(Yellow) / (double)color::MAX_COLOR_VAL,
- double(Black) / (double)color::MAX_COLOR_VAL);
+ double(Cyan) / double(color::MAX_COLOR_VAL),
+ double(Magenta) / double(color::MAX_COLOR_VAL),
+ double(Yellow) / double(color::MAX_COLOR_VAL),
+ double(Black) / double(color::MAX_COLOR_VAL));
break;
case GRAY:
sprintf(buf, "color gray %.3g",
- double(Gray) / (double)color::MAX_COLOR_VAL);
+ double(Gray) / double(color::MAX_COLOR_VAL));
break;
}
do_special(buf);
@@ -693,7 +693,7 @@ void draw_dvi_printer::fill_next(const environment *env)
env->fill->get_gray(&g);
}
char buf[256];
- sprintf(buf, "sh %.3g", 1 - double(g) / (double)color::MAX_COLOR_VAL);
+ sprintf(buf, "sh %.3g", 1 - double(g) / double(color::MAX_COLOR_VAL));
do_special(buf);
}
diff --git a/src/devices/grops/ps.cpp b/src/devices/grops/ps.cpp
index d9433154..14224772 100644
--- a/src/devices/grops/ps.cpp
+++ b/src/devices/grops/ps.cpp
@@ -371,7 +371,7 @@ ps_output &ps_output::put_symbol(const char *s)
ps_output &ps_output::put_color(unsigned int c)
{
char buf[128];
- sprintf(buf, "%.3g", double(c) / (double)color::MAX_COLOR_VAL);
+ sprintf(buf, "%.3g", double(c) / double(color::MAX_COLOR_VAL));
int len = strlen(buf);
if (col > 0 && col + len + need_space > max_line_length) {
putc('\n', fp);
diff --git a/src/libs/libgroff/color.cpp b/src/libs/libgroff/color.cpp
index 6e7e79b8..91c68d8f 100644
--- a/src/libs/libgroff/color.cpp
+++ b/src/libs/libgroff/color.cpp
@@ -369,26 +369,26 @@ char *color::print_color()
break;
case RGB:
sprintf(s, "rgb %.2ff %.2ff %.2ff",
- double(Red) / (double)MAX_COLOR_VAL,
- double(Green) / (double)MAX_COLOR_VAL,
- double(Blue) / (double)MAX_COLOR_VAL);
+ double(Red) / double(MAX_COLOR_VAL),
+ double(Green) / double(MAX_COLOR_VAL),
+ double(Blue) / double(MAX_COLOR_VAL));
break;
case CMY:
sprintf(s, "cmy %.2ff %.2ff %.2ff",
- double(Cyan) / (double)MAX_COLOR_VAL,
- double(Magenta) / (double)MAX_COLOR_VAL,
- double(Yellow) / (double)MAX_COLOR_VAL);
+ double(Cyan) / double(MAX_COLOR_VAL),
+ double(Magenta) / double(MAX_COLOR_VAL),
+ double(Yellow) / double(MAX_COLOR_VAL));
break;
case CMYK:
sprintf(s, "cmyk %.2ff %.2ff %.2ff %.2ff",
- double(Cyan) / (double)MAX_COLOR_VAL,
- double(Magenta) / (double)MAX_COLOR_VAL,
- double(Yellow) / (double)MAX_COLOR_VAL,
- double(Black) / (double)MAX_COLOR_VAL);
+ double(Cyan) / double(MAX_COLOR_VAL),
+ double(Magenta) / double(MAX_COLOR_VAL),
+ double(Yellow) / double(MAX_COLOR_VAL),
+ double(Black) / double(MAX_COLOR_VAL));
break;
case GRAY:
sprintf(s, "gray %.2ff",
- double(Gray) / (double)MAX_COLOR_VAL);
+ double(Gray) / double(MAX_COLOR_VAL));
break;
}
return s;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 11/25: [src]: Fix code style nit.,
G. Branden Robinson <=