rasterizer cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c
index ecaf59f..ad5c5c4 100644 (file)
--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.c
@@ -246,7 +246,7 @@
     TPos    last_ey;
 
     QT_FT_Vector   bez_stack[32 * 3 + 1];
-    int         lev_stack[32];
+    int            lev_stack[32];
 
     QT_FT_Outline  outline;
     QT_FT_BBox     clip_box;
@@ -270,7 +270,6 @@
     PCell*     ycells;
     int        ycount;
 
-    int        skip_spans;
   } TWorker, *PWorker;
 
 
@@ -902,16 +901,13 @@
 
       if ( ras.num_gray_spans >= QT_FT_MAX_GRAY_SPANS )
       {
-        if ( ras.render_span && ras.num_gray_spans > ras.skip_spans )
+        if ( ras.render_span )
         {
-          int skip = ras.skip_spans > 0 ? ras.skip_spans : 0;
-          ras.render_span( ras.num_gray_spans - skip,
-                           ras.gray_spans + skip,
+          ras.render_span( ras.num_gray_spans,
+                           ras.gray_spans,
                            ras.render_span_data );
         }
 
-        ras.skip_spans -= ras.num_gray_spans;
-
         /* ras.render_span( span->y, ras.gray_spans, count ); */
 
 #ifdef DEBUG_GRAYS
@@ -1119,7 +1115,6 @@
     int volatile     n, num_bands;
     TPos volatile    min, max, max_y;
     QT_FT_BBox*      clip;
-    int              skip;
     int              yindex;
 
     ras.num_gray_spans = 0;
@@ -1326,16 +1321,13 @@
       }
     }
 
-    if ( ras.render_span && ras.num_gray_spans > ras.skip_spans )
+    if ( ras.render_span )
     {
-        skip = ras.skip_spans > 0 ? ras.skip_spans : 0;
-        ras.render_span( ras.num_gray_spans - skip,
-                         ras.gray_spans + skip,
+        ras.render_span( ras.num_gray_spans,
+                         ras.gray_spans,
                          ras.render_span_data );
     }
 
-    ras.skip_spans -= ras.num_gray_spans;
-
     if ( ras.band_shoot > 8 && ras.band_size > 16 )
       ras.band_size = ras.band_size / 2;
 
@@ -1361,16 +1353,13 @@
 
   int gray_raster_render( const QT_FT_Raster_Params*  params )
   {
-    const QT_FT_Outline*  outline    = (const QT_FT_Outline*)params->source;
+    const QT_FT_Outline*  outline    = params->source;
     PWorker            worker;
 
 
     if ( !raster.buffer || !raster.buffer_size )
       return ErrRaster_Invalid_Argument;
 
-    if ( raster.worker )
-      raster.worker->skip_spans = params->skip_spans;
-
     /* return immediately if the outline is empty */
     if ( !outline || outline->n_points == 0 || outline->n_contours <= 0 )
       return 0;
@@ -1402,7 +1391,7 @@
     ras.outline   = *outline;
     ras.band_size = raster.band_size;
 
-    ras.render_span      = (QT_FT_SpanFunc)params->gray_spans;
+    ras.render_span      = params->gray_spans;
     ras.render_span_data = params->user;
 
     return gray_convert_glyph( worker );

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index ed46941..b12af73 100644 (file)
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3024,7 +3024,6 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
     rasterParams.user = userData;
     rasterParams.clip_box = clip_box;
     rasterParams.gray_spans = callback;
-    rasterParams.skip_spans = 0;
     gray_raster_render(&rasterParams);
 }
 

diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 5268426..0b28d4f 100644 (file)
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -261,7 +261,6 @@ public:
 
     void rasterizeLine_dashed(QLineF line, qreal width,
                               int *dashIndex, qreal *dashOffset, bool *inDash);
-    void rasterize(QT_FT_Outline *outline, ProcessSpans callback, QSpanData *spanData);
     void rasterize(QT_FT_Outline *outline, ProcessSpans callback, void *userData);
     void updateMatrixData(QSpanData *spanData, const QBrush &brush, const QTransform &brushMatrix);
 

diff --git a/src/gui/painting/qrasterdefs_p.h b/src/gui/painting/qrasterdefs_p.h
index 34f0b56..0da4162 100644 (file)
--- a/src/gui/painting/qrasterdefs_p.h
+++ b/src/gui/painting/qrasterdefs_p.h
@@ -402,12 +402,10 @@ QT_FT_BEGIN_HEADER
   /*                                                                       */
   typedef struct  QT_FT_Raster_Params_
   {
-    void*                   source;
+    QT_FT_Outline*                   source;
     QT_FT_SpanFunc             gray_spans;
-    QT_FT_SpanFunc             black_spans;
     void*                   user;
     QT_FT_BBox                 clip_box;
-    int                     skip_spans;
 
   } QT_FT_Raster_Params;