diff options
| author | Thomas White <taw@physics.org> | 2017-11-21 22:32:42 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-11-21 22:32:42 +0100 |
| commit | 55c566558b168b434e955dbefca4745c3a4932a2 (patch) | |
| tree | 77ade1ecfa8de1bfc1e1081146d79691b78a7273 /src/sc_interp.c | |
| parent | cad7675852e8f2fd556b38b8e376913daca2f10a (diff) | |
Calculate image sizes to fill frames horizontally
Diffstat (limited to 'src/sc_interp.c')
| -rw-r--r-- | src/sc_interp.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/sc_interp.c b/src/sc_interp.c index b4ec7cd..b530941 100644 --- a/src/sc_interp.c +++ b/src/sc_interp.c @@ -723,20 +723,29 @@ static int parse_dims(const char *opt, struct frame *parent, if ( check == w ) goto invalid; w_units = get_units(w); if ( w_units == UNITS_FRAC ) { - double pw = parent->w; - pw -= parent->pad_l; - pw -= parent->pad_r; - *wp = pw * *wp; + if ( parent != NULL ) { + double pw = parent->w; + pw -= parent->pad_l; + pw -= parent->pad_r; + *wp = pw * *wp; + } else { + *wp = -1.0; + } + } *hp = strtod(h, &check); if ( check == h ) goto invalid; h_units = get_units(h); if ( h_units == UNITS_FRAC ) { - double ph = parent->h; - ph -= parent->pad_t; - ph -= parent->pad_b; - *hp = ph * *hp; + if ( parent != NULL ) { + double ph = parent->h; + ph -= parent->pad_t; + ph -= parent->pad_b; + *hp = ph * *hp; + } else { + *hp = -1.0; + } } *xp= strtod(x, &check); @@ -810,7 +819,7 @@ static int parse_image_option(const char *opt, struct frame *parent, if ( (index(opt, 'x') != NULL) && (index(opt, '+') != NULL) && (index(opt, '+') != rindex(opt, '+')) ) { double dum; - return parse_dims(opt, parent, wp, hp, &dum, &dum); + return parse_dims(opt, NULL, wp, hp, &dum, &dum); } if ( strncmp(opt, "filename=\"", 10) == 0 ) { |