[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master b48a54c: Define and use GAMMA.
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2-demos] master b48a54c: Define and use GAMMA. |
Date: |
Fri, 13 Nov 2015 04:04:15 +0000 |
branch: master
commit b48a54c1499debc39e73c1b024064ecb6d24d29e
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
Define and use GAMMA.
* src/ftcommon.h (GAMMA): Define new macro.
* src/ftdiff.c (adisplay_init): Use it.
* src/ftgrid.c (grid_status_init): Use it.
* src/ftstring.c (status): Use it.
* src/ftview.c (status): Use it.
---
ChangeLog | 10 ++++++++++
src/ftcommon.h | 3 +++
src/ftdiff.c | 2 +-
src/ftgrid.c | 2 +-
src/ftstring.c | 2 +-
src/ftview.c | 2 +-
6 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3d47ffa..aa5da37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-11-12 Alexei Podtelezhnikov <address@hidden>
+
+ Define and use GAMMA.
+
+ * src/ftcommon.h (GAMMA): Define new macro.
+ * src/ftdiff.c (adisplay_init): Use it.
+ * src/ftgrid.c (grid_status_init): Use it.
+ * src/ftstring.c (status): Use it.
+ * src/ftview.c (status): Use it.
+
2015-11-11 Alexei Podtelezhnikov <address@hidden>
[ftdiff,ftgrid] Default to gamma = 1.8.
diff --git a/src/ftcommon.h b/src/ftcommon.h
index 9765991..48bce9a 100644
--- a/src/ftcommon.h
+++ b/src/ftcommon.h
@@ -65,6 +65,9 @@
/* baseline distance between header lines */
#define HEADER_HEIGHT 12
+ /* default gamma setting */
+#define GAMMA 1.8
+
#include "graph.h"
#include "grobjs.h"
#include "grfont.h"
diff --git a/src/ftdiff.c b/src/ftdiff.c
index 7840ea9..a2bb795 100644
--- a/src/ftdiff.c
+++ b/src/ftdiff.c
@@ -916,7 +916,7 @@
display->height = height;
display->surface = surface;
display->bitmap = &surface->bitmap;
- display->gamma = 1.8;
+ display->gamma = GAMMA;
grSetGlyphGamma( display->gamma );
diff --git a/src/ftgrid.c b/src/ftgrid.c
index d29fef3..d361b51 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -170,7 +170,7 @@
st->do_segment = 0;
st->Num = 0;
- st->gamma = 1.8;
+ st->gamma = GAMMA;
st->header = "";
st->mm = NULL;
diff --git a/src/ftstring.c b/src/ftstring.c
index 9770ef4..fef1585 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -54,7 +54,7 @@
char header_buffer[256];
} status = { DIM_X, DIM_Y,
- RENDER_MODE_STRING, FT_ENCODING_UNICODE, 72, 48, 1.8, 0 };
+ RENDER_MODE_STRING, FT_ENCODING_UNICODE, 72, 48, GAMMA, 0 };
static FTDemo_Display* display;
static FTDemo_Handle* handle;
diff --git a/src/ftview.c b/src/ftview.c
index 8bb195a..96a15c5 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -115,7 +115,7 @@
} status = { 1,
DIM_X, DIM_Y, RENDER_MODE_ALL, FT_ENCODING_NONE,
- 72, 48, -1, 1.8, 0.04, 0.04, 0.02, 0.22,
+ 72, 48, -1, GAMMA, 0.04, 0.04, 0.02, 0.22,
0, 0, 0, /* default values are set at runtime */
0, 0, 0, 0, 0,
0, { 0x10, 0x40, 0x70, 0x40, 0x10 }, 2 };
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master b48a54c: Define and use GAMMA.,
Alexei Podtelezhnikov <=