projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename gsheetmodel to psppiresheetmodel
[pspp-builds.git]
/
src
/
output
/
table.c
diff --git
a/src/output/table.c
b/src/output/table.c
index 36e9ca28ea55d116f1e03449dc105097fbefb045..92f79541d6fbddad4e02b3a6a69961c5bf7da43a 100644
(file)
--- a/
src/output/table.c
+++ b/
src/output/table.c
@@
-29,14
+29,13
@@
#include <data/data-out.h>
#include <data/format.h>
#include <data/value.h>
#include <data/data-out.h>
#include <data/format.h>
#include <data/value.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
-#include <libpspp/magic.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include "minmax.h"
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-474,7
+473,6
@@
tab_natural_height (struct tab_table *t, struct outp_driver *d, int r)
unsigned char opt = t->ct[c + r * t->cf];
int h;
unsigned char opt = t->ct[c + r * t->cf];
int h;
- assert (t->w[c] != NOT_INT);
if (opt & (TAB_JOIN | TAB_EMPTY))
continue;
if (opt & (TAB_JOIN | TAB_EMPTY))
continue;