779afe4b91
computation of glyph_index. (FNT_Size_Set_Pixels): To find a strike, first check pixel_height only, then try to find a better hit by comparing pixel_width also. Without this fix it isn't possible to access all strikes. Also compute metrics.max_advance to be in sync with other bitmap drivers. * src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code. (FT_Set_Pixel_Size): Assign value to `metrics' after validation of arguments. Synchronize computation of height and width for bitmap strikes. The `width' field in the FT_Bitmap_Size structure is now only useful to enumerate different strikes. The `max_advance' field of the FT_Size_Metrics structure should be used to get the (maximum) width of a strike. * src/bdf/bdfdrivr.c (BDF_Face_Init): Don't use AVERAGE_WIDTH for computing `available_sizes->width' but make it always equal to `available_sizes->height'. * src/pcf/pcfread.c (pcf_load_font): Don't use RESOLUTION_X for computing `available_sizes->width' but make it always equal to `available_sizes->height'. * src/truetype/ttdriver.c (Set_Pixel_Sizes): Pass only single argument to function. * src/psnames/psmodule.c (ps_unicode_value): Handle `.' after `uniXXXX' and `uXXXX[X[X]]'. * src/bdf/bdfdrivr.c: s/FT_Err_/BDF_Err/. * src/cache/ftccache.c, src/cache/ftcsbits.c, src/cache/ftlru.c: s/FT_Err_/FTC_Err_/. * src/cff/cffcmap.c: s/FT_Err_/CFF_Err_/. * src/pcf/pcfdrivr.c: s/FT_Err_/PCF_Err_/. * src/psaux/t1cmap.c: Include psauxerr.h. s/FT_Err_/PSaux_Err_/. * src/pshinter/pshnterr.h: New file. * src/pshinter/rules.mk: Updated. * src/pshinter/pshalgo.c, src/pshinter/pshrec.c: Include pshnterr.h. s/FT_Err_/PSH_Err_/. * src/pfr/pfrdrivr.c, src/pfr/pfrobjs.c, src/pfr/pfrsbit.c: s/FT_Err_/PFR_Err_/. * src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c: s/FT_Err_/SFNT_Err_/. * src/truetype/ttgload.c: s/FT_Err_/TT_Err_/. * src/gzip/ftgzip.c: Load FT_MODULE_ERRORS_H and define FT_ERR_PREFIX and FT_ERR_BASE. s/FT_Err_/Gzip_Err_/.
73 lines
1.8 KiB
Makefile
73 lines
1.8 KiB
Makefile
#
|
|
# FreeType 2 PSHinter driver configuration rules
|
|
#
|
|
|
|
|
|
# Copyright 2001, 2003 by
|
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
|
#
|
|
# This file is part of the FreeType project, and may only be used, modified,
|
|
# and distributed under the terms of the FreeType project license,
|
|
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
|
|
# indicate that you have read the license and understand and accept it
|
|
# fully.
|
|
|
|
|
|
# PSHINTER driver directory
|
|
#
|
|
PSHINTER_DIR := $(SRC_DIR)/pshinter
|
|
|
|
|
|
# compilation flags for the driver
|
|
#
|
|
PSHINTER_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSHINTER_DIR))
|
|
|
|
|
|
# PSHINTER driver sources (i.e., C files)
|
|
#
|
|
PSHINTER_DRV_SRC := $(PSHINTER_DIR)/pshrec.c \
|
|
$(PSHINTER_DIR)/pshglob.c \
|
|
$(PSHINTER_DIR)/pshmod.c \
|
|
$(PSHINTER_DIR)/pshalgo.c
|
|
|
|
|
|
# PSHINTER driver headers
|
|
#
|
|
PSHINTER_DRV_H := $(PSHINTER_DRV_SRC:%c=%h) \
|
|
$(PSHINTER_DIR)/pshnterr.h
|
|
|
|
|
|
# PSHINTER driver object(s)
|
|
#
|
|
# PSHINTER_DRV_OBJ_M is used during `multi' builds.
|
|
# PSHINTER_DRV_OBJ_S is used during `single' builds.
|
|
#
|
|
PSHINTER_DRV_OBJ_M := $(PSHINTER_DRV_SRC:$(PSHINTER_DIR)/%.c=$(OBJ_DIR)/%.$O)
|
|
PSHINTER_DRV_OBJ_S := $(OBJ_DIR)/pshinter.$O
|
|
|
|
# PSHINTER driver source file for single build
|
|
#
|
|
PSHINTER_DRV_SRC_S := $(PSHINTER_DIR)/pshinter.c
|
|
|
|
|
|
# PSHINTER driver - single object
|
|
#
|
|
$(PSHINTER_DRV_OBJ_S): $(PSHINTER_DRV_SRC_S) $(PSHINTER_DRV_SRC) \
|
|
$(FREETYPE_H) $(PSHINTER_DRV_H)
|
|
$(PSHINTER_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PSHINTER_DRV_SRC_S))
|
|
|
|
|
|
# PSHINTER driver - multiple objects
|
|
#
|
|
$(OBJ_DIR)/%.$O: $(PSHINTER_DIR)/%.c $(FREETYPE_H) $(PSHINTER_DRV_H)
|
|
$(PSHINTER_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
|
|
|
|
|
|
# update main driver object lists
|
|
#
|
|
DRV_OBJS_S += $(PSHINTER_DRV_OBJ_S)
|
|
DRV_OBJS_M += $(PSHINTER_DRV_OBJ_M)
|
|
|
|
|
|
# EOF
|