freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] anuj-distance-field 0d9179f: [sdfb] Fix GNU Make build.


From: Anuj Verma
Subject: [freetype2] anuj-distance-field 0d9179f: [sdfb] Fix GNU Make build.
Date: Fri, 17 Jul 2020 22:49:21 -0400 (EDT)

branch: anuj-distance-field
commit 0d9179f4e8cdb02986f5d01f178364e3f2b8dc07
Author: Anuj Verma <anujv@iitbhilai.ac.in>
Commit: 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]'
---
 [GSoC]ChangeLog   | 14 ++++++++++++++
 src/sdf/ftsdf.c   |  1 -
 src/sdf/ftsdf.h   |  2 +-
 src/sdfb/rules.mk |  4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/[GSoC]ChangeLog b/[GSoC]ChangeLog
index 19f3392..b1ab116 100644
--- a/[GSoC]ChangeLog
+++ b/[GSoC]ChangeLog
@@ -1,3 +1,17 @@
+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 ae3445c..5651fa7 100644
--- a/src/sdf/ftsdf.c
+++ b/src/sdf/ftsdf.c
@@ -2913,7 +2913,6 @@
     {
       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 475393a..d06f59a 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 b17b008..be3abe3 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)/ftsdferrs.h
+              $(SDFB_DIR)/ftsdfberrs.h
 
 
 # sdf bitmap driver object(s)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]