← Back to branch summary

~ubuntu-branches/ubuntu/vivid/grass/vivid-proposed

« back to all changes in this revision

Viewing changes to ps/ps.map/read_cfg.c

  • Committer: Package Import Robot
  • Author(s): Bas Couwenberg
  • Date: 2015-02-20 23:12:08 UTC
  • mfrom: (8.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20150220231208-1u6qvqm84v430b10
Tags: 7.0.0-1~exp1
* New upstream release.
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
* Drop check4dev patch, rely on upstream check.
* Add build dependency on libpq-dev to grass-dev for libpq-fe.h.
* Drop patches applied upstream, refresh remaining patches.
* Update symlinks for images switched from jpg to png.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ps/ps.map/read_cfg.c
82
82
    w = PS.page_width - PS.map_x_orig - PS.right_marg;
83
83
    h = PS.page_height - PS.map_y_loc - PS.bot_marg;
84
84
 
85
 
    if (PS.map_width <= 0 || PS.map_width > w)  /* not specified or greater than available space */
 
85
    if (PS.map_width <= 0 || PS.map_width > w)
 
86
        /* not specified or greater than available space */
86
87
        PS.map_width = w;
87
88
 
88
89
    if (PS.map_height <= 0 || PS.map_height > h)