projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
output
/
render.c
diff --git
a/src/output/render.c
b/src/output/render.c
index d61a39aae304ebdee23a1be2e943981381fc6ea9..c178839a0bfd1d7f79348f371b4d15cead9b3daf 100644
(file)
--- a/
src/output/render.c
+++ b/
src/output/render.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011
, 2013
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-384,7
+384,7
@@
distribute_spanned_width (int width,
w += width * unspanned * d0;
}
w += width * unspanned * d0;
}
- rows[x].width =
w / d
;
+ rows[x].width =
MAX (rows[x].width, w / d)
;
w -= rows[x].width * d;
}
}
w -= rows[x].width * d;
}
}