← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnudatalanguage/saucy-proposed

« back to all changes in this revision

Viewing changes to src/plotting_map_proj.cpp

  • Committer: Package Import Robot
  • Author(s): Axel Beckert
  • Date: 2013-05-15 02:23:58 UTC
  • mfrom: (15.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20130515022358-rziznpf225zn9lv9
Tags: 0.9.3-2
* Upload to unstable.
* Revamp debian/rules
  - Allow parallel builds
  - Use debian/manpages instead of dh_installman parameter
  - Switch to dh7 style debian/rules file
* Bump debhelper compatibility to 9
  - Update versioned debhelper build-dependency
* Bump Standards-Version to 3.9.4 (no changes)
* Apply wrap-and-sort

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plotting_map_proj.cpp
53
53
    if ( nParam == 1) {
54
54
      p0 = e->GetParDefined( 0);
55
55
      DDoubleGDL* ll = static_cast<DDoubleGDL*>
56
 
        (p0->Convert2( DOUBLE, BaseGDL::COPY));
 
56
        (p0->Convert2( GDL_DOUBLE, BaseGDL::COPY));
57
57
 
58
58
      dims[0] = 2;
59
59
      if (p0->Rank() == 1) {
79
79
      p0 = e->GetParDefined( 0);
80
80
      p1 = e->GetParDefined( 1);
81
81
      DDoubleGDL* lon = static_cast<DDoubleGDL*>
82
 
        (p0->Convert2( DOUBLE, BaseGDL::COPY));
 
82
        (p0->Convert2( GDL_DOUBLE, BaseGDL::COPY));
83
83
      DDoubleGDL* lat = static_cast<DDoubleGDL*>
84
 
        (p1->Convert2( DOUBLE, BaseGDL::COPY));
 
84
        (p1->Convert2( GDL_DOUBLE, BaseGDL::COPY));
85
85
 
86
86
      dims[0] = 2;
87
87
      if (p0->Rank() == 0 || p0->Rank() == 1) {
105
105
    }
106
106
#else
107
107
    e->Throw("GDL was compiled without support for map projections");
 
108
    return NULL;
108
109
#endif
109
110
  }
110
111
 
137
138
    if ( nParam == 1) {
138
139
      p0 = e->GetParDefined( 0);
139
140
      DDoubleGDL* xy = static_cast<DDoubleGDL*>
140
 
        (p0->Convert2( DOUBLE, BaseGDL::COPY));
 
141
        (p0->Convert2( GDL_DOUBLE, BaseGDL::COPY));
141
142
 
142
143
      dims[0] = 2;
143
144
      if (p0->Rank() == 1) {
163
164
      p0 = e->GetParDefined( 0);
164
165
      p1 = e->GetParDefined( 1);
165
166
      DDoubleGDL* x = static_cast<DDoubleGDL*>
166
 
        (p0->Convert2( DOUBLE, BaseGDL::COPY));
 
167
        (p0->Convert2( GDL_DOUBLE, BaseGDL::COPY));
167
168
      DDoubleGDL* y = static_cast<DDoubleGDL*>
168
 
        (p1->Convert2( DOUBLE, BaseGDL::COPY));
 
169
        (p1->Convert2( GDL_DOUBLE, BaseGDL::COPY));
169
170
 
170
171
      dims[0] = 2;
171
172
      if (p0->Rank() == 0 || p0->Rank() == 1) {
189
190
    }
190
191
#else
191
192
    e->Throw("GDL was compiled without support for map projections");
 
193
    return NULL;
192
194
#endif
193
195
  }
194
196