X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=cd963e785feb0b83ba8ea1a4e4e3f36b5e6c77d6;hb=a58399ea2ce9421f72cc5771cd215b121bd8f9dd;hp=6c8812a1a4bc2c3506d097de63eae0416ad9841a;hpb=a3a6f7e27b704d74d8263638057403d9a89196f8;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 6c8812a1a4..cd963e785f 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4728,6 +4728,10 @@ ctables_prepare_table (struct ctables_table *t)
                     drop_inner = true;
                     n_drop = 0;
                   }
+                else if (at == CTAT_LAYERROW)
+                  n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
+                else if (at == CTAT_LAYERCOL)
+                  n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
                 else
                   {
                     n_drop = 0;
@@ -4736,8 +4740,8 @@ ctables_prepare_table (struct ctables_table *t)
                         : at == CTAT_COL ? a == PIVOT_AXIS_ROW
                         : false)
                       n_drop++;
-                    if (((at == CTAT_ROW || at == CTAT_LAYERROW) && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN && a == PIVOT_AXIS_ROW)
-                        || ((at == CTAT_COL || at == CTAT_LAYERCOL) && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW && a == PIVOT_AXIS_COLUMN))
+                    if ((at == CTAT_ROW && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                        || (at == CTAT_COL && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW))
                       n_drop++;
                   }