Changeset 2bb6d04 in mainline for uspace/lib/draw/font

Timestamp:

2019-06-25T14:58:16Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

aeba767

Parents:

cd9531d3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-13 12:14:16)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-25 14:58:16)

Message:

Curb the proliferation of libdraw headers

libdraw provides a lot of ambiguously named headers, which makes it
confusing. This change merges the subdirectories into single headers,
and moves all headers into draw subdirectory, so that it's obvious
at a glance what library the header belongs to.

Compare:

#include <path.h>
#include <source.h>
#include <font/bitmap_backend.h>
#include <font/pcf.h>

vs.

#include <draw/path.h>
#include <draw/source.h>
#include <draw/font.h>

Location:

uspace/lib/draw/font

Files:

• bitmap_backend.c (modified) (1 diff)
• bitmap_backend.h (deleted)
• embedded.c (modified) (1 diff)
• embedded.h (deleted)
• pcf.c (modified) (1 diff)
• pcf.h (deleted)

uspace/lib/draw/font/bitmap_backend.c

@@ -38 +38 @@
 #include <stdlib.h>
 
-#include "../font.h"
-#include "../drawctx.h"
-#include "bitmap_backend.h"
+#include <draw/font.h>
+#include <draw/drawctx.h>
 
 typedef struct {

uspace/lib/draw/font/embedded.c

@@ -39 +39 @@
 #include <stdlib.h>
 
-#include "../gfx/font-8x16.h"
-#include "embedded.h"
-#include "../drawctx.h"
-#include "bitmap_backend.h"
+#include <draw/gfx.h>
+#include <draw/font.h>
+#include <draw/drawctx.h>
 
 static errno_t fde_resolve_glyph(void *unused, const wchar_t chr,

uspace/lib/draw/font/pcf.c

@@ -44 +44 @@
 #include <str.h>
 
-#include "pcf.h"
-#include "../drawctx.h"
-#include "bitmap_backend.h"
+#include <draw/font.h>
+#include <draw/drawctx.h>
 
 #define PCF_TABLE_ACCELERATORS 0x02