diff options
| author | Anuj Verma <anujv@iitbhilai.ac.in> | 2020-07-18 08:12:56 +0530 |
|---|---|---|
| committer | anujverma <anujv@iitbhilai.ac.in> | 2020-08-02 16:33:20 +0530 |
| commit | f4918e139c99f2fe4033d02f05cafaf0c569518b (patch) | |
| tree | 5680dc8da15fe6d132147ea2740dc79594b4fe2e | |
| parent | fca2ed969c896e8a3168b3b9d336e9ccefff74a7 (diff) | |
| download | freetype2-f4918e139c99f2fe4033d02f05cafaf0c569518b.tar.gz | |
Revert "[sdfb] Fix GNU Make build."
This reverts commit 0d9179f4e8cdb02986f5d01f178364e3f2b8dc07.
| -rw-r--r-- | [GSoC]ChangeLog | 14 | ||||
| -rw-r--r-- | src/sdf/ftsdf.c | 1 | ||||
| -rw-r--r-- | src/sdf/ftsdf.h | 2 | ||||
| -rw-r--r-- | src/sdfb/rules.mk | 4 |
4 files changed, 4 insertions, 17 deletions
diff --git a/[GSoC]ChangeLog b/[GSoC]ChangeLog index b1ab11644..19f339271 100644 --- a/[GSoC]ChangeLog +++ b/[GSoC]ChangeLog @@ -1,17 +1,3 @@ -2020-07-18 Anuj Verma <anujv@iitbhilai.ac.in> - - [sdfb] Fix GNU Make build. - - * src/sdfb/rules.mk (SDFB_DRV_H): Fix name of - the module specific error file `ftsdfberrs.h'. - - * src/sdf/ftsdf.h (Optimizations): Fix warning. - `warning: comma at end of enumerator list [-Wpedantic]' - - * src/sdf/ftsdf.c (sdf_generate_coarse_grid): Remove - unused variable `cindex', causes warning. - `warning: unused variable 'cindex' [-Wunused-variable]' - 2020-07-17 Anuj Verma <anujv@iitbhilai.ac.in> [sdfb] Added new module to generate SDF from bitmap. diff --git a/src/sdf/ftsdf.c b/src/sdf/ftsdf.c index 5651fa7b3..ae3445cb7 100644 --- a/src/sdf/ftsdf.c +++ b/src/sdf/ftsdf.c @@ -2913,6 +2913,7 @@ { for ( i = 0; i < CG_DIMEN; i++ ) { + FT_Int cindex = j * CG_DIMEN + i; SDF_Contour* cont = contours; SDF_Edge* edge; SDF_Edge* relevant_list; diff --git a/src/sdf/ftsdf.h b/src/sdf/ftsdf.h index d06f59a8e..475393aed 100644 --- a/src/sdf/ftsdf.h +++ b/src/sdf/ftsdf.h @@ -22,7 +22,7 @@ FT_BEGIN_HEADER OPTIMIZATION_NONE = 0, /* default: check all points against all edges */ OPTIMIZATION_BB = 1, /* use bounding box to check nearby grid points */ OPTIMIZATION_SUB = 2, /* subdivide then use bounding box */ - OPTIMIZATION_CG = 3 /* use coarse grid to only check relevant edges */ + OPTIMIZATION_CG = 3, /* use coarse grid to only check relevant edges */ } Optimizations; /* --------- */ diff --git a/src/sdfb/rules.mk b/src/sdfb/rules.mk index be3abe346..b17b008ff 100644 --- a/src/sdfb/rules.mk +++ b/src/sdfb/rules.mk @@ -16,13 +16,13 @@ SDFB_COMPILE := $(CC) $(ANSIFLAGS) \ # sdf bitmap driver sources (i.e., C files) # SDFB_DRV_SRC := $(SDFB_DIR)/ftsdfbrend.c \ - $(SDFB_DIR)/ftsdfb.c + $(SDFB_DIR)/ftsdfb.c # sdf bitmap driver headers # SDFB_DRV_H := $(SDFB_DRV_SRC:%.c=%.h) \ - $(SDFB_DIR)/ftsdfberrs.h + $(SDFB_DIR)/ftsdferrs.h # sdf bitmap driver object(s) |