[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master ee79990: Cosmetic improvements.
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2-demos] master ee79990: Cosmetic improvements. |
Date: |
Thu, 19 Nov 2015 05:03:13 +0000 |
branch: master
commit ee79990ec6af751a2feb2d59e710d323aa0a7237
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
Cosmetic improvements.
* src/ftdiff.c (write_global_info): Do not display zero gamma.
* src/ftgrid.c (event_gamma_change): Ditto.
* src/ftview.c (write_header): Ditto.
---
ChangeLog | 8 ++++++++
src/ftdiff.c | 9 +++++----
src/ftgrid.c | 6 ++++--
src/ftview.c | 7 ++++---
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dde4f33..5aaf69d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-19 Alexei Podtelezhnikov <address@hidden>
+
+ Cosmetic improvements.
+
+ * src/ftdiff.c (write_global_info): Do not display zero gamma.
+ * src/ftgrid.c (event_gamma_change): Ditto.
+ * src/ftview.c (write_header): Ditto.
+
2015-11-12 Alexei Podtelezhnikov <address@hidden>
* graph/gblender.c (gblender_reset_key): Fix typo.
diff --git a/src/ftdiff.c b/src/ftdiff.c
index a2bb795..d92005a 100644
--- a/src/ftdiff.c
+++ b/src/ftdiff.c
@@ -1368,7 +1368,7 @@
write_global_info( RenderState state )
{
ADisplay adisplay = (ADisplay)state->display.disp;
- double gamma = adisplay->gamma;
+ char gamma[] = "sRGB";
char buf[256];
FontFace face = &state->faces[state->face_index];
@@ -1383,12 +1383,13 @@
grWriteCellString( adisplay->bitmap, 0, 5,
buf, adisplay->fore_color );
- sprintf( buf, "%.1fpt (%dppem) at %ddpi, gamma: %.1f%s",
+ if ( adisplay->gamma != 0.0 )
+ sprintf( gamma, "%.1f", adisplay->gamma );
+ sprintf( buf, "%.1fpt (%dppem) at %ddpi, gamma: %s",
state->char_size,
(int)(state->char_size * state->resolution / 72 + 0.5),
state->resolution,
- gamma,
- gamma == 0.0 ? " (sRGB)" : "" );
+ gamma );
grWriteCellString( adisplay->bitmap, 0, 5 + HEADER_HEIGHT,
buf, adisplay->fore_color );
diff --git a/src/ftgrid.c b/src/ftgrid.c
index d361b51..86339b9 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -965,8 +965,10 @@
grSetGlyphGamma( status.gamma );
- sprintf( status.header_buffer, "gamma changed to %.1f%s",
- status.gamma, status.gamma == 0.0 ? " (sRGB mode)" : "" );
+ if ( status.gamma == 0.0 )
+ sprintf( status.header_buffer, "gamma changed to sRGB mode" );
+ else
+ sprintf( status.header_buffer, "gamma changed to %.1f", status.gamma );
status.header = (const char *)status.header_buffer;
}
diff --git a/src/ftview.c b/src/ftview.c
index 96a15c5..46ad14c 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1787,9 +1787,10 @@
buf, display->fore_color );
/* gamma */
- sprintf( buf, "gamma: %.1f%s",
- status.gamma, status.gamma == 0.0 ? " (sRGB mode)"
- : "" );
+ if ( status.gamma == 0.0 )
+ sprintf( buf, "gamma: sRGB mode" );
+ else
+ sprintf( buf, "gamma: %.1f", status.gamma );
grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
buf, display->fore_color );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master ee79990: Cosmetic improvements.,
Alexei Podtelezhnikov <=