← Back to branch summary

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

« back to all changes in this revision

Viewing changes to raster/r.out.vrml/put_grid.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:
raster/r.out.vrml/put_grid.c
 
1
#include <grass/raster.h>
1
2
#include <grass/glocale.h>
2
3
#include "pv.h"
3
4
 
47
48
            if (!shh)
48
49
                G_percent(row, rows - 1, 10);
49
50
 
50
 
            G_get_f_raster_row(elevfd, tf, row);
51
 
            coordz = G_row_to_northing((double)row, w);
 
51
            Rast_get_f_row(elevfd, tf, row);
 
52
            coordz = Rast_row_to_northing((double)row, w);
52
53
            do_coordcnv(&coordz, 'z');
53
54
 
54
55
            /* write a row */
55
56
            for (col = 0; col < cols; col++) {
56
 
                coordx = G_col_to_easting((double)col, w);
 
57
                coordx = Rast_col_to_easting((double)col, w);
57
58
                do_coordcnv(&coordx, 'x');
58
59
 
59
60
                /* HACK: no nulls in vrml grid */
60
 
                if (G_is_f_null_value(tf))
 
61
                if (Rast_is_f_null_value(tf))
61
62
                    *tf = 0.0;
62
63
                coordy = *tf;
63
64
                do_coordcnv(&coordy, 'y');
98
99
            if (!shh)
99
100
                G_percent(row, rows - 1, 5);
100
101
 
101
 
            G_get_f_raster_row(colorfd, tf, row);
102
 
            G_lookup_f_raster_colors(tf, red, green, blue, set, cols, colr);
 
102
            Rast_get_f_row(colorfd, tf, row);
 
103
            Rast_lookup_f_colors(tf, red, green, blue, set, cols, colr);
103
104
 
104
105
            for (col = 0; col < cols; col++) {
105
106
                sprintf(str, "%.3f %.3f %.3f,",