shithub: freetype+ttf2subf

Download patch

ref: ea7e20fba62717319e088e9e0d776c3b4473eda8
parent: dc39f76cb7aecbefa3a601dd19e498eb903042fd
author: Alexei Podtelezhnikov <[email protected]>
date: Tue May 7 03:00:38 EDT 2019

* src/raster/ftraster.c: Clean-ups.

git/fs: mount .git/fs: mount/attach disallowed
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-05  Alexei Podtelezhnikov  <[email protected]>
+
+	* src/raster/ftraster.c: Clean-ups.
+
 2019-05-05  Werner Lemberg  <[email protected]>
 
 	* src/truetype/ttgxvar.c: More use of `FT_fdot14ToFixed'.
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -399,7 +399,7 @@
 
 
 #define RAS_ARGS       /* void */
-#define RAS_ARG        /* void */
+#define RAS_ARG        void
 
 #define RAS_VARS       /* void */
 #define RAS_VAR        /* void */
@@ -546,8 +546,7 @@
 
 #ifdef FT_STATIC_RASTER
 
-  static black_TWorker  cur_ras;
-#define ras  cur_ras
+  static black_TWorker  ras;
 
 #else /* !FT_STATIC_RASTER */
 
@@ -661,7 +660,6 @@
       return FAILURE;
     }
 
-    ras.cProfile->flags  = 0;
     ras.cProfile->start  = 0;
     ras.cProfile->height = 0;
     ras.cProfile->offset = ras.top;
@@ -3269,7 +3267,9 @@
     const FT_Outline*  outline    = (const FT_Outline*)params->source;
     const FT_Bitmap*   target_map = params->target;
 
+#ifndef FT_STATIC_RASTER
     black_TWorker  worker[1];
+#endif
 
     Long  buffer[FT_MAX_BLACK_POOL];
 
@@ -3311,8 +3311,8 @@
     ras.outline = *outline;
     ras.target  = *target_map;
 
-    worker->buff     = buffer;
-    worker->sizeBuff = (&buffer)[1]; /* Points to right after buffer. */
+    ras.buff     = buffer;
+    ras.sizeBuff = (&buffer)[1]; /* Points to right after buffer. */
 
     return Render_Glyph( RAS_VAR );
   }