summaryrefslogtreecommitdiff
path: root/backend/stv680.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-02-02 17:14:32 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-02-02 17:14:32 +0100
commit5dadc28ea784db1ba1f56c2ea8618d2db67af1c8 (patch)
tree808b2499b54563b3290f34d70d159b1024310873 /backend/stv680.c
parent5bb4cf12855ec0151de15d6c5a2354ff08766957 (diff)
parent3dade5db2a37543f19f0967901d8d80a52a1e459 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/stv680.c')
-rw-r--r--backend/stv680.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/backend/stv680.c b/backend/stv680.c
index 8d2fda3..473def0 100644
--- a/backend/stv680.c
+++ b/backend/stv680.c
@@ -1189,8 +1189,8 @@ stv680_fill_image (Stv680_Vidcam * dev)
}
#define MSG_MAXLEN 45
-#define CHAR_HEIGHT 11
-#define CHAR_WIDTH 6
+#define TEXT_CHAR_HEIGHT 11
+#define TEXT_CHAR_WIDTH 6
#define CHAR_START 4
static SANE_Status
@@ -1216,14 +1216,14 @@ stv680_add_text (SANE_Byte * image, int width, int height, char *txt)
len = strftime (line, MSG_MAXLEN, fmttxt, tm);
- for (y = 0; y < CHAR_HEIGHT; y++)
+ for (y = 0; y < TEXT_CHAR_HEIGHT; y++)
{
- ptr = image + 3 * width * (height - CHAR_HEIGHT - 2 + y) + 12;
+ ptr = image + 3 * width * (height - TEXT_CHAR_HEIGHT - 2 + y) + 12;
for (x = 0; x < len; x++)
{
- f = fontdata[line[x] * CHAR_HEIGHT + y];
- for (i = CHAR_WIDTH - 1; i >= 0; i--)
+ f = fontdata[line[x] * TEXT_CHAR_HEIGHT + y];
+ for (i = TEXT_CHAR_WIDTH - 1; i >= 0; i--)
{
if (f & (CHAR_START << i))
{