Commit f27b4834b7dcf9d667fd5173106be0cddb0ec1c2
2021-06-30T10:54:59
* src/raster/ftraster.c (Render_Single_Pass): Simplify `band_stack'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/ChangeLog b/ChangeLog
index 9a2cabc..a1de346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-30 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ * src/raster/ftraster.c (Render_Single_Pass): Simplify `band_stack'.
+
2021-06-29 Alexei Podtelezhnikov <apodtele@gmail.com>
[raster] Do not skip the second pass without dropout control.
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index 74c2908..fbcf8d2 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -366,16 +366,6 @@
typedef PProfile* PProfileList;
- /* Simple record used to implement a stack of bands, required */
- /* by the sub-banding mechanism */
- typedef struct black_TBand_
- {
- Int y_min; /* band's minimum */
- Int y_max; /* band's maximum */
-
- } black_TBand;
-
-
#define AlignProfileSize \
( ( sizeof ( TProfile ) + sizeof ( Alignment ) - 1 ) / sizeof ( Long ) )
@@ -3027,9 +3017,7 @@
{
Int y_mid;
Int band_top = 0;
-
- black_TBand band_stack[16]; /* band stack used for sub-banding */
- /* enough for signed short bands */
+ Int band_stack[32]; /* enough to bisect 32-bit int bands */
while ( 1 )
@@ -3053,12 +3041,8 @@
y_mid = ( y_min + y_max ) >> 1;
- band_stack[band_top].y_min = y_min;
- band_stack[band_top].y_max = y_mid;
-
- band_top++;
-
- y_min = y_mid + 1;
+ band_stack[band_top++] = y_min;
+ y_min = y_mid + 1;
}
else
{
@@ -3069,8 +3053,8 @@
if ( --band_top < 0 )
break;
- y_min = band_stack[band_top].y_min;
- y_max = band_stack[band_top].y_max;
+ y_max = y_min - 1;
+ y_min = band_stack[band_top];
}
}