← Back to branch summary

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

« back to all changes in this revision

Viewing changes to imagery/i.rectify/get_wind.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:
imagery/i.rectify/get_wind.c
1
1
#include <math.h>
2
2
#include <grass/glocale.h>
3
3
#include "global.h"
4
 
#include "crs.h"                /* CRS HEADER FILE */
5
4
 
6
5
int georef_window(struct Cell_head *w1, struct Cell_head *w2, int order, double res)
7
6
{
11
10
    } nw, ne, se, sw;
12
11
 
13
12
    /* extends */
14
 
    CRS_georef(w1->west, w1->north, &e, &n, E12, N12, order);
 
13
    if (order == 0)
 
14
        I_georef_tps(w1->west, w1->north, &e, &n, E12_t, N12_t, &cp, 1);
 
15
    else
 
16
        I_georef(w1->west, w1->north, &e, &n, E12, N12, order);
15
17
    w2->north = w2->south = n;
16
18
    w2->west = w2->east = e;
17
19
    nw.n = n;
18
20
    nw.e = e;
19
21
 
20
 
    CRS_georef(w1->east, w1->north, &e, &n, E12, N12, order);
 
22
    if (order == 0)
 
23
        I_georef_tps(w1->east, w1->north, &e, &n, E12_t, N12_t, &cp, 1);
 
24
    else
 
25
        I_georef(w1->east, w1->north, &e, &n, E12, N12, order);
21
26
    ne.n = n;
22
27
    ne.e = e;
23
28
    if (n > w2->north)
29
34
    if (e < w2->west)
30
35
        w2->west = e;
31
36
 
32
 
    CRS_georef(w1->west, w1->south, &e, &n, E12, N12, order);
 
37
    if (order == 0)
 
38
        I_georef_tps(w1->west, w1->south, &e, &n, E12_t, N12_t, &cp, 1);
 
39
    else
 
40
        I_georef(w1->west, w1->south, &e, &n, E12, N12, order);
33
41
    sw.n = n;
34
42
    sw.e = e;
35
43
    if (n > w2->north)
41
49
    if (e < w2->west)
42
50
        w2->west = e;
43
51
 
44
 
    CRS_georef(w1->east, w1->south, &e, &n, E12, N12, order);
 
52
    if (order == 0)
 
53
        I_georef_tps(w1->east, w1->south, &e, &n, E12_t, N12_t, &cp, 1);
 
54
    else
 
55
        I_georef(w1->east, w1->south, &e, &n, E12, N12, order);
45
56
    se.n = n;
46
57
    se.e = e;
47
58
    if (n > w2->north)