storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Treat table height as int instead of short

Browse Source 
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838952
This commit is contained in:
Tatsuya Kinoshita
2016-10-08 10:27:41 +09:00
parent d01de738f5
commit 0c9aebb26a
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
table.c
+7 -7
View File
@@ -278,7 +278,7 @@ newTable()
t->max_rowsize = MAXROW; t->max_rowsize = MAXROW;
t->tabdata = New_N(GeneralList **, MAXROW); t->tabdata = New_N(GeneralList **, MAXROW);
t->tabattr = New_N(table_attr *, MAXROW); t->tabattr = New_N(table_attr *, MAXROW);
t->tabheight = NewAtom_N(short, MAXROW); t->tabheight = NewAtom_N(int, MAXROW);
#ifdef ID_EXT #ifdef ID_EXT
t->tabidvalue = New_N(Str *, MAXROW); t->tabidvalue = New_N(Str *, MAXROW);
t->tridvalue = New_N(Str, MAXROW); t->tridvalue = New_N(Str, MAXROW);
@@ -331,7 +331,7 @@ check_row(struct table *t, int row)
int i, r; int i, r;
GeneralList ***tabdata; GeneralList ***tabdata;
table_attr **tabattr; table_attr **tabattr;
short *tabheight; int *tabheight;
#ifdef ID_EXT #ifdef ID_EXT
Str **tabidvalue; Str **tabidvalue;
Str *tridvalue; Str *tridvalue;
@@ -341,7 +341,7 @@ check_row(struct table *t, int row)
r = max(t->max_rowsize * 2, row + 1); r = max(t->max_rowsize * 2, row + 1);
tabdata = New_N(GeneralList **, r); tabdata = New_N(GeneralList **, r);
tabattr = New_N(table_attr *, r); tabattr = New_N(table_attr *, r);
tabheight = NewAtom_N(short, r); tabheight = NewAtom_N(int, r);
#ifdef ID_EXT #ifdef ID_EXT
tabidvalue = New_N(Str *, r); tabidvalue = New_N(Str *, r);
tridvalue = New_N(Str, r); tridvalue = New_N(Str, r);
@@ -846,7 +846,7 @@ table_rule_width(struct table *t)
} }
static void static void
check_cell_width(short *tabwidth, short *cellwidth, check_cell_width(int *tabwidth, int *cellwidth,
short *col, short *colspan, short maxcell, short *col, short *colspan, short maxcell,
short *indexarray, int space, int dir) short *indexarray, int space, int dir)
{ {
@@ -1478,7 +1478,7 @@ check_table_height(struct table *t)
short *indexarray; short *indexarray;
short maxcell; short maxcell;
short size; short size;
short *height; int *height;
} cell; } cell;
int space = 0; int space = 0;
@@ -1517,7 +1517,7 @@ check_table_height(struct table *t)
cell.row = NewAtom_N(short, cell.size); cell.row = NewAtom_N(short, cell.size);
cell.rowspan = NewAtom_N(short, cell.size); cell.rowspan = NewAtom_N(short, cell.size);
cell.indexarray = NewAtom_N(short, cell.size); cell.indexarray = NewAtom_N(short, cell.size);
cell.height = NewAtom_N(short, cell.size); cell.height = NewAtom_N(int, cell.size);
} }
else { else {
cell.size = max(cell.size + MAXCELL, c + 1); cell.size = max(cell.size + MAXCELL, c + 1);
@@ -1526,7 +1526,7 @@ check_table_height(struct table *t)
cell.size); cell.size);
cell.indexarray = New_Reuse(short, cell.indexarray, cell.indexarray = New_Reuse(short, cell.indexarray,
cell.size); cell.size);
cell.height = New_Reuse(short, cell.height, cell.size); cell.height = New_Reuse(int, cell.height, cell.size);
} }
} }
if (c > cell.maxcell) { if (c > cell.maxcell) {
table.h
+1 -1
View File
@@ -100,7 +100,7 @@ struct table {
short minimum_width[MAXCOL]; short minimum_width[MAXCOL];
short fixed_width[MAXCOL]; short fixed_width[MAXCOL];
struct table_cell cell; struct table_cell cell;
short *tabheight; int *tabheight;
struct table_in *tables; struct table_in *tables;
short ntable; short ntable;
short tables_size; short tables_size;
textlist.h
+3 -3
View File
@@ -14,7 +14,7 @@ typedef struct _listitem {
typedef struct _generallist { typedef struct _generallist {
ListItem *first; ListItem *first;
ListItem *last; ListItem *last;
short nitem; int nitem;
} GeneralList; } GeneralList;
extern ListItem *newListItem(void *s, ListItem *n, ListItem *p); extern ListItem *newListItem(void *s, ListItem *n, ListItem *p);
@@ -36,7 +36,7 @@ typedef struct _textlistitem {
typedef struct _textlist { typedef struct _textlist {
TextListItem *first; TextListItem *first;
TextListItem *last; TextListItem *last;
short nitem; int nitem;
} TextList; } TextList;
#define newTextList() ((TextList *)newGeneralList()) #define newTextList() ((TextList *)newGeneralList())
@@ -62,7 +62,7 @@ typedef struct _textlinelistitem {
typedef struct _textlinelist { typedef struct _textlinelist {
TextLineListItem *first; TextLineListItem *first;
TextLineListItem *last; TextLineListItem *last;
short nitem; int nitem;
} TextLineList; } TextLineList;
extern TextLine *newTextLine(Str line, int pos); extern TextLine *newTextLine(Str line, int pos);