diff --git a/ChangeLog b/ChangeLog index 1bbacd804..2362e80ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2020-08-19 Anuj Verma + + [sdf] Add build infrastructure. + + * src/sdf/module.mk, src/sfd/rules.mk: New files. + + * src/sdf/ftsdf.h (ft_sdf_raster): New forward declaration. + + * include/freetype/ftmoderr.h (FT_MODERRDEF): Add error definition + for the 'sdf' module. + + * include/freetype/internal/fttrace.h (FT_TRACE_DEF): Add trace + definition for the `sdf' module. + + * modules.cfg (RASTER_MODULES): Add the `sdf' module to the list of + rasterizers. + 2020-08-19 Anuj Verma [sdf] Add interface functions for the 'sdf' rasterizer. diff --git a/include/freetype/ftmoderr.h b/include/freetype/ftmoderr.h index f05fc53aa..fc3665158 100644 --- a/include/freetype/ftmoderr.h +++ b/include/freetype/ftmoderr.h @@ -171,6 +171,7 @@ FT_MODERRDEF( Type42, 0x1400, "Type 42 module" ) FT_MODERRDEF( Winfonts, 0x1500, "Windows FON/FNT module" ) FT_MODERRDEF( GXvalid, 0x1600, "GX validation module" ) + FT_MODERRDEF( Sdf, 0x1700, "Signed distance field raster module" ) #ifdef FT_MODERR_END_LIST diff --git a/include/freetype/internal/fttrace.h b/include/freetype/internal/fttrace.h index 2df204512..39cdf3644 100644 --- a/include/freetype/internal/fttrace.h +++ b/include/freetype/internal/fttrace.h @@ -44,6 +44,7 @@ FT_TRACE_DEF( psprops ) /* PS driver properties (ftpsprop.c) */ FT_TRACE_DEF( raccess ) /* resource fork accessor (ftrfork.c) */ FT_TRACE_DEF( raster ) /* monochrome rasterizer (ftraster.c) */ FT_TRACE_DEF( smooth ) /* anti-aliasing raster (ftgrays.c) */ +FT_TRACE_DEF( sdf ) /* signed distance raster (ftsdf.c) */ FT_TRACE_DEF( synth ) /* bold/slant synthesizer (ftsynth.c) */ /* Cache sub-system */ diff --git a/modules.cfg b/modules.cfg index d6cdbe523..15a631b11 100644 --- a/modules.cfg +++ b/modules.cfg @@ -99,6 +99,9 @@ RASTER_MODULES += raster # Anti-aliasing rasterizer. RASTER_MODULES += smooth +# Signed distance field rasterizer. +RASTER_MODULES += sdf + #### #### auxiliary modules diff --git a/src/sdf/ftsdf.h b/src/sdf/ftsdf.h index eda86d9a4..0275f516a 100644 --- a/src/sdf/ftsdf.h +++ b/src/sdf/ftsdf.h @@ -63,6 +63,10 @@ FT_BEGIN_HEADER } SDF_Raster_Params; + + /* rasterizer to convert outline to SDF */ + FT_EXPORT_VAR( const FT_Raster_Funcs ) ft_sdf_raster; + FT_END_HEADER #endif /* FTSDF_H_ */ diff --git a/src/sdf/module.mk b/src/sdf/module.mk new file mode 100644 index 000000000..978e13f13 --- /dev/null +++ b/src/sdf/module.mk @@ -0,0 +1,16 @@ + + +FTMODULE_H_COMMANDS += SDF_RENDERER +FTMODULE_H_COMMANDS += BSDF_RENDERER + +define SDF_RENDERER +$(OPEN_DRIVER) FT_Renderer_Class, ft_sdf_renderer_class $(CLOSE_DRIVER) +$(ECHO_DRIVER)sdf $(ECHO_DRIVER_DESC)signed distance field renderer$(ECHO_DRIVER_DONE) +endef + +define BSDF_RENDERER +$(OPEN_DRIVER) FT_Renderer_Class, ft_bitmap_sdf_renderer_class $(CLOSE_DRIVER) +$(ECHO_DRIVER)bsdf $(ECHO_DRIVER_DESC)bitmap to signed distance field converter$(ECHO_DRIVER_DONE) +endef + +#EOF diff --git a/src/sdf/rules.mk b/src/sdf/rules.mk new file mode 100644 index 000000000..a410d733c --- /dev/null +++ b/src/sdf/rules.mk @@ -0,0 +1,64 @@ + + +# sdf driver directory +# +SDF_DIR := $(SRC_DIR)/sdf + + +# compilation flags for the driver +# +SDF_COMPILE := $(CC) $(ANSIFLAGS) \ + $I$(subst /,$(COMPILER_SEP),$(SDF_DIR)) \ + $(INCLUDE_FLAGS) \ + $(FT_CFLAGS) + + +# sdf driver sources (i.e., C files) +# +SDF_DRV_SRC := $(SDF_DIR)/ftsdfrend.c \ + $(SDF_DIR)/ftsdf.c \ + $(SDF_DIR)/ftbsdf.c + + +# sdf driver headers +# +SDF_DRV_H := $(SDF_DIR)/ftsdfrend.h \ + $(SDF_DIR)/ftsdf.h \ + $(SDF_DIR)/ftsdferrs.h \ + $(SDF_DIR)/ftsdfcommon.h + + +# sdf driver object(s) +# +# SDF_DRV_OBJ_M is used during `multi' builds. +# SDF_DRV_OBJ_S is used during `single' builds. +# +SDF_DRV_OBJ_M := $(SDF_DRV_SRC:$(SDF_DIR)/%.c=$(OBJ_DIR)/%.$O) +SDF_DRV_OBJ_S := $(OBJ_DIR)/sdf.$O + + +# sdf driver source file for single build +# +SDF_DRV_SRC_S := $(SDF_DIR)/sdf.c + + +# sdf driver - single object +# +$(SDF_DRV_OBJ_S): $(SDF_DRV_SRC_S) $(SDF_DRV_SRC) \ + $(FREETYPE_H) $(SDF_DRV_H) + $(SDF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(SDF_DRV_SRC_S)) + + +# sdf driver - multiple objects +# +$(OBJ_DIR)/%.$O: $(SDF_DIR)/%.c $(FREETYPE_H) $(SDF_DRV_H) + $(SDF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) + + +# update main driver list +# +DRV_OBJS_S += $(SDF_DRV_OBJ_S) +DRV_OBJS_M += $(SDF_DRV_OBJ_M) + + +# EOF