← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/ogsf/gsd_wire.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/ogsf/gsd_wire.c
1
1
/*!
2
 
   \file gsd_wire.c
 
2
   \file lib/ogsf/gsd_wire.c
3
3
 
4
4
   \brief OGSF library - 
5
5
 
17
17
 */
18
18
 
19
19
#include <grass/gis.h>
20
 
#include <grass/gstypes.h>
 
20
#include <grass/ogsf.h>
21
21
 
22
22
#include "gsget.h"
23
23
#include "rowcol.h"
485
485
     */
486
486
 
487
487
    check_color = 1;
 
488
    curcolor = 0;
488
489
    coloratt = &(surf->att[ATT_COLOR]);
489
490
    col_src = surf->att[ATT_COLOR].att_src;
490
491
 
690
691
    /* will need to check for color source of FUNC_ATT & NOTSET_ATT, 
691
692
       or else use more general and inefficient gets */
692
693
    check_color = 1;
 
694
    curcolor = 0;
693
695
    coloratt = &(surf->att[ATT_COLOR]);
694
696
    col_src = surf->att[ATT_COLOR].att_src;
695
697