← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/nviz/draw.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:
lib/nviz/draw.c
246
246
    /* North Arrow */
247
247
    if (data->draw_arrow) {
248
248
        gsd_north_arrow(data->arrow->where, data->arrow->size,
249
 
                        (GLuint)NULL, data->arrow->color, data->arrow->color);
 
249
                        0, data->arrow->color, data->arrow->color);
250
250
    }
251
251
 
252
252
    /* scale bar */
253
253
    for (i = 0; i < data->num_scalebars; i++) {
254
 
        struct scalebar_data *s = data->scalebar[i];
255
 
        gsd_scalebar_v2(s->where, s->size, 0, s->color, s->color);
 
254
        if (data->scalebar[i]){
 
255
            struct scalebar_data *s = data->scalebar[i];
 
256
            gsd_scalebar_v2(s->where, s->size, 0, s->color, s->color);
 
257
        }
256
258
    }
257
 
    
258
259
    GS_done_draw();
259
260
    GS_set_draw(GSD_BACK);
260
261