[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] anuj-distance-field e9812a8 2/3: Revert "[sdfb] Added new mo
|
From: |
Anuj Verma |
|
Subject: |
[freetype2] anuj-distance-field e9812a8 2/3: Revert "[sdfb] Added new module to generate SDF from bitmap." |
|
Date: |
Sat, 18 Jul 2020 03:15:27 -0400 (EDT) |
branch: anuj-distance-field
commit e9812a892f02b4f489068e4d266a45c4bf182dc2
Author: Anuj Verma <anujv@iitbhilai.ac.in>
Commit: Anuj Verma <anujv@iitbhilai.ac.in>
Revert "[sdfb] Added new module to generate SDF from bitmap."
This reverts commit 2136eddbccfa59b7478d87fe0947b35ca6a157f8.
---
CMakeLists.txt | 1 -
[GSoC]ChangeLog | 27 -----------------
include/freetype/config/ftmodule.h | 1 -
include/freetype/ftmoderr.h | 1 -
modules.cfg | 12 --------
src/sdf/rules.mk | 2 --
src/sdfb/ftsdfb.c | 2 --
src/sdfb/ftsdfb.h | 2 --
src/sdfb/ftsdfberrs.h | 18 ------------
src/sdfb/ftsdfbrend.c | 43 ---------------------------
src/sdfb/ftsdfbrend.h | 43 ---------------------------
src/sdfb/module.mk | 10 -------
src/sdfb/rules.mk | 60 --------------------------------------
src/sdfb/sdfb.c | 9 ------
14 files changed, 231 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f544faa..ef34e66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -350,7 +350,6 @@ set(BASE_SRCS
src/psnames/psnames.c
src/raster/raster.c
src/sdf/sdf.c
- src/sdfb/sdfb.c
src/sfnt/sfnt.c
src/smooth/smooth.c
src/truetype/truetype.c
diff --git a/[GSoC]ChangeLog b/[GSoC]ChangeLog
index 19f3392..7a2f7c2 100644
--- a/[GSoC]ChangeLog
+++ b/[GSoC]ChangeLog
@@ -1,32 +1,5 @@
2020-07-17 Anuj Verma <anujv@iitbhilai.ac.in>
- [sdfb] Added new module to generate SDF from bitmap.
-
- * src/sdfb/sdfb.c, src/sdfb/ftsdfbrend.c,
- src/sdfb/ftsdfb.c, src/sdfb/ftsdfbrend.h,
- src/sdfb/ftsdfb.h, src/sdfb/ftsdfberrs.h:
- Added files required by the `sdfb' renderer module.
-
- * src/sdfb/rules.mk, src/sdfb/module.mk: Added
- files required to build the `sdfb' module using
- the default build system.
-
- * CMakeLists.txt (BASE_SRCS): Add `src/sdfb/sdfb.c'
- to the variable.
-
- * include/freetype/config/ftmodule.h: Added `sdfb'
- module declaration so that the module can be compiled
- when not compiling with GNU make.
-
- * modules.cfg (RASTER_MODULES): Include `sdfb' module
- to the default rasterizer module list.
-
- * include/freetype/ftmoderr.h: sdfb module error define
-
- * src/sdf/rules.mk: Add EOF.
-
-2020-07-17 Anuj Verma <anujv@iitbhilai.ac.in>
-
[sdf] Added memory tracker.
* src/sdf/ftsdf.c (SDF_MemoryUser): Added struct
diff --git a/include/freetype/config/ftmodule.h
b/include/freetype/config/ftmodule.h
index 839a115..81b6655 100644
--- a/include/freetype/config/ftmodule.h
+++ b/include/freetype/config/ftmodule.h
@@ -27,6 +27,5 @@ FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
FT_USE_MODULE( FT_Renderer_Class, ft_sdf_renderer_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_sdfb_renderer_class )
/* EOF */
diff --git a/include/freetype/ftmoderr.h b/include/freetype/ftmoderr.h
index dbbf6ac..b2c7d60 100644
--- a/include/freetype/ftmoderr.h
+++ b/include/freetype/ftmoderr.h
@@ -172,7 +172,6 @@
FT_MODERRDEF( Winfonts, 0x1500, "Windows FON/FNT module" )
FT_MODERRDEF( GXvalid, 0x1600, "GX validation module" )
FT_MODERRDEF( Sdf, 0x1700, "signed distance field raster module" )
- FT_MODERRDEF( Sdfb, 0x1700, "signed distance field converter module" )
#ifdef FT_MODERR_END_LIST
diff --git a/modules.cfg b/modules.cfg
index 5673e87..d64c5ff 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -103,18 +103,6 @@ RASTER_MODULES += smooth
RASTER_MODULES += sdf
####
-#### post processing modules -- for doing post processing on bitmaps
-####
-
-# Currently there is no seperate list for post processing modules
-# so we simply use the `RASTER_MODULES' list.
-
-# Signed distance field generator. This one uses bitmaps
-# to generate SDF unlike the `sdf' module which require
-# outlines.
-RASTER_MODULES += sdfb
-
-####
#### auxiliary modules
####
diff --git a/src/sdf/rules.mk b/src/sdf/rules.mk
index 214725e..efc8ac5 100644
--- a/src/sdf/rules.mk
+++ b/src/sdf/rules.mk
@@ -56,5 +56,3 @@ $(OBJ_DIR)/%.$O: $(SDF_DIR)/%.c $(FREETYPE_H) $(SDF_DRV_H)
#
DRV_OBJS_S += $(SDF_DRV_OBJ_S)
DRV_OBJS_M += $(SDF_DRV_OBJ_M)
-
-# EOF
diff --git a/src/sdfb/ftsdfb.c b/src/sdfb/ftsdfb.c
deleted file mode 100644
index 7caf1e6..0000000
--- a/src/sdfb/ftsdfb.c
+++ /dev/null
@@ -1,2 +0,0 @@
-
-/* END */
diff --git a/src/sdfb/ftsdfb.h b/src/sdfb/ftsdfb.h
deleted file mode 100644
index 7caf1e6..0000000
--- a/src/sdfb/ftsdfb.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-/* END */
diff --git a/src/sdfb/ftsdfberrs.h b/src/sdfb/ftsdfberrs.h
deleted file mode 100644
index 1a78e45..0000000
--- a/src/sdfb/ftsdfberrs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#ifndef FTSDFBERRS_H_
-#define FTSDFBERRS_H_
-
-#include <freetype/ftmoderr.h>
-
-#undef FTERRORS_H_
-
-#undef FT_ERR_PREFIX
-#define FT_ERR_PREFIX Sdfb_Err_
-#define FT_ERR_BASE FT_Mod_Err_Sdfb
-
-#include <freetype/fterrors.h>
-
-#endif /* FTSDFBERRS_H_ */
-
-
-/* END */
diff --git a/src/sdfb/ftsdfbrend.c b/src/sdfb/ftsdfbrend.c
deleted file mode 100644
index c005111..0000000
--- a/src/sdfb/ftsdfbrend.c
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#include "ftsdfbrend.h"
-
-#include "ftsdfberrs.h"
-
- /**************************************************************************
- *
- * The macro FT_COMPONENT is used in trace mode. It is an implicit
- * parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log
- * messages during execution.
- */
- #undef FT_COMPONENT
- #define FT_COMPONENT sdfb
-
-
-
- FT_DEFINE_RENDERER(
- ft_sdfb_renderer_class,
-
- FT_MODULE_RENDERER,
- sizeof( SDFB_Renderer_Module ),
-
- "sdfb",
- 0x10000L,
- 0x20000L,
-
- NULL,
-
- (FT_Module_Constructor) NULL,
- (FT_Module_Destructor) NULL,
- (FT_Module_Requester) NULL,
-
- FT_GLYPH_FORMAT_BITMAP,
-
- (FT_Renderer_RenderFunc) NULL, /* render_glyph */
- (FT_Renderer_TransformFunc) NULL, /* transform_glyph */
- (FT_Renderer_GetCBoxFunc) NULL, /* get_glyph_cbox */
- (FT_Renderer_SetModeFunc) NULL, /* set_mode */
-
- (FT_Raster_Funcs*) NULL /* raster_class */
- )
-
-/* END */
diff --git a/src/sdfb/ftsdfbrend.h b/src/sdfb/ftsdfbrend.h
deleted file mode 100644
index 5805c51..0000000
--- a/src/sdfb/ftsdfbrend.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#ifndef FTSDFBREND_H_
-#define FTSDFBREND_H_
-
-
-#include <freetype/ftrender.h>
-#include <freetype/ftmodapi.h>
-#include <freetype/internal/ftobjs.h>
-
-
-FT_BEGIN_HEADER
-
- /**************************************************************************
- *
- * @struct:
- * SDFB_Renderer_Module
- *
- * @description:
- * [TODO]
- *
- * @fields:
- * [TODO]
- *
- */
- typedef struct SDFB_Renderer_Module_
- {
- FT_RendererRec root;
- FT_UInt spread;
- FT_Bool flip_sign;
- FT_Bool flip_y;
-
- } SDFB_Renderer_Module, *SDFB_Renderer;
-
-
- FT_DECLARE_RENDERER( ft_sdfb_renderer_class )
-
-
-FT_END_HEADER
-
-#endif /* FTSDFBREND_H_ */
-
-
-/* END */
diff --git a/src/sdfb/module.mk b/src/sdfb/module.mk
deleted file mode 100644
index 0bb308c..0000000
--- a/src/sdfb/module.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-FTMODULE_H_COMMANDS += SDFB_RENDERER
-
-define SDFB_RENDERER
-$(OPEN_DRIVER) FT_Renderer_Class, ft_sdfb_renderer_class $(CLOSE_DRIVER)
-$(ECHO_DRIVER)sdfb $(ECHO_DRIVER_DESC)signed distance field
converter$(ECHO_DRIVER_DONE)
-endef
-
-#EOF
diff --git a/src/sdfb/rules.mk b/src/sdfb/rules.mk
deleted file mode 100644
index b17b008..0000000
--- a/src/sdfb/rules.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-# sdf bitmap driver directory
-#
-SDFB_DIR := $(SRC_DIR)/sdfb
-
-
-# compilation flags for the driver
-#
-SDFB_COMPILE := $(CC) $(ANSIFLAGS) \
- $I$(subst /,$(COMPILER_SEP),$(SDFB_DIR)) \
- $(INCLUDE_FLAGS) \
- $(FT_CFLAGS)
-
-
-# sdf bitmap driver sources (i.e., C files)
-#
-SDFB_DRV_SRC := $(SDFB_DIR)/ftsdfbrend.c \
- $(SDFB_DIR)/ftsdfb.c
-
-
-# sdf bitmap driver headers
-#
-SDFB_DRV_H := $(SDFB_DRV_SRC:%.c=%.h) \
- $(SDFB_DIR)/ftsdferrs.h
-
-
-# sdf bitmap driver object(s)
-#
-# SDFB_DRV_OBJ_M is used during `multi' builds.
-# SDFB_DRV_OBJ_S is used during `single' builds.
-#
-SDFB_DRV_OBJ_M := $(SDFB_DRV_SRC:$(SDFB_DIR)/%.c=$(OBJ_DIR)/%.$O)
-SDFB_DRV_OBJ_S := $(OBJ_DIR)/sdfb.$O
-
-
-# sdf driver source file for single build
-#
-SDFB_DRV_SRC_S := $(SDFB_DIR)/sdfb.c
-
-
-# sdf bitmap driver - single object
-#
-$(SDFB_DRV_OBJ_S): $(SDFB_DRV_SRC_S) $(SDFB_DRV_SRC) \
- $(FREETYPE_H) $(SDFB_DRV_H)
- $(SDFB_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(SDFB_DRV_SRC_S))
-
-
-# sdf bitmap driver - multiple objects
-#
-$(OBJ_DIR)/%.$O: $(SDFB_DIR)/%.c $(FREETYPE_H) $(SDFB_DRV_H)
- $(SDFB_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-
-
-# update main driver list
-#
-DRV_OBJS_S += $(SDFB_DRV_OBJ_S)
-DRV_OBJS_M += $(SDFB_DRV_OBJ_M)
-
-# EOF
diff --git a/src/sdfb/sdfb.c b/src/sdfb/sdfb.c
deleted file mode 100644
index 67a6833..0000000
--- a/src/sdfb/sdfb.c
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-#define FT_MAKE_OPTION_SINGLE_OBJECT
-
-#include "ftsdfbrend.c"
-#include "ftsdfb.c"
-
-
-/* END */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] anuj-distance-field e9812a8 2/3: Revert "[sdfb] Added new module to generate SDF from bitmap.",
Anuj Verma <=