projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't assume that MEASURE_* and ALIGN_* have the same values found in
[pspp-builds.git]
/
src
/
data
/
sys-file-reader.c
diff --git
a/src/data/sys-file-reader.c
b/src/data/sys-file-reader.c
index 8c440849e5a270fdfa5ad4e6588b71044ed10bb5..9a4b33a911f69b75709b6b2edd763107e8f874b3 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-813,7
+813,7
@@
read_display_parameters (struct sfm_reader *r, size_t size, size_t count,
int align = read_int32 (r);
struct variable *v;
int align = read_int32 (r);
struct variable *v;
- if (
!measure_is_valid (measure) || !alignment_is_valid (align)
)
+ if (
measure < 1 || measure > 3 || align < 0 || align > 2
)
{
if (!warned)
sys_warn (r, _("Invalid variable display parameters. "
{
if (!warned)
sys_warn (r, _("Invalid variable display parameters. "
@@
-823,9
+823,13
@@
read_display_parameters (struct sfm_reader *r, size_t size, size_t count,
}
v = dict_get_var (dict, i);
}
v = dict_get_var (dict, i);
- var_set_measure (v, measure);
+ var_set_measure (v, (measure == 1 ? MEASURE_NOMINAL
+ : measure == 2 ? MEASURE_ORDINAL
+ : MEASURE_SCALE));
var_set_display_width (v, width);
var_set_display_width (v, width);
- var_set_alignment (v, align);
+ var_set_alignment (v, (align == 0 ? ALIGN_LEFT
+ : align == 1 ? ALIGN_RIGHT
+ : ALIGN_CENTRE));
}
}
}
}