Skip to content

Commit ce4b056

Browse files
committed
More GRASS direct functions
1 parent 9fce669 commit ce4b056

File tree

3 files changed

+169
-34
lines changed

3 files changed

+169
-34
lines changed

src/providers/grass/CMakeLists.txt

Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,27 @@ SET ( FUNCTIONS
109109
"G_free_tokens"
110110
"G_fseek"
111111
"G_ftell"
112+
"G__getenv"
113+
"G__getenv2"
112114
"G_get_cat"
113115
"G_get_cats_title"
114116
"G_get_c_raster_cat"
117+
"G_get_color"
118+
"G_get_color_range"
119+
"G_get_d_color_range"
115120
"G_get_d_raster_cat"
116121
"G_get_fp_range_min_max"
117122
"G_get_f_raster_cat"
123+
"G_get_gisrc_mode"
124+
"G_get_histogram_cat"
118125
"G_getl"
119126
"G_getl2"
120127
"G_get_range_min_max"
121128
"G_get_raster_cat"
122129
"G_get_raster_row_colors"
130+
"G_get_raster_value_c"
131+
"G_get_raster_value_d"
132+
"G_get_raster_value_f"
123133
"G_get_set_window"
124134
"G_gettext"
125135
"G_get_window"
@@ -135,21 +145,34 @@ SET ( FUNCTIONS
135145
"G__init_null_patterns"
136146
"G_init_range"
137147
"G_init_raster_cats"
148+
"G_interp_linear"
149+
"G_interp_bilinear"
150+
"G_interp_cubic"
151+
"G_interp_bicubic"
152+
"G_is_absolute_path"
138153
"G_is_c_null_value"
139154
"G_is_d_null_value"
140155
"G_is_f_null_value"
141156
"G_is_null_value"
142157
"G_lat_scan"
143158
"G_llres_scan"
144159
"G_lon_scan"
160+
"G_lookup_colors"
161+
"G_lookup_c_raster_colors"
162+
"G_lookup_d_raster_colors"
163+
"G_lookup_f_raster_colors"
164+
"G_lookup_raster_colors"
145165
"G__ls"
146166
"G_ls"
147167
"G_ls_format"
148168
"G__malloc"
149169
"G_make_gyr_fp_colors"
150170
"G_make_random_colors"
171+
"G_mark_colors_as_fp"
172+
"G_mkdir"
151173
"G_northing_to_row"
152174
"G_number_of_tokens"
175+
"G__null_bitstream_size"
153176
"G__projection_name"
154177
"G_percent"
155178
"G_program_name"
@@ -159,7 +182,9 @@ SET ( FUNCTIONS
159182
"G_quant_get_limits"
160183
"G_quant_init"
161184
"G_quant_round"
185+
"G_quant_set_neg_infinite_rule"
162186
"G_putenv"
187+
"G_raster_cmp"
163188
"G_raster_size"
164189
"G_read_key_value_file"
165190
"G__realloc"
@@ -201,6 +226,8 @@ SET ( FUNCTIONS
201226
"G_str_to_sql"
202227
"G_str_to_upper"
203228
"G_suppress_masking"
229+
"G_suppress_warnings"
230+
"G_system"
204231
"G_tokenize"
205232
"G_trim_decimal"
206233
"G_update_fp_range"
@@ -221,26 +248,6 @@ SET ( FUNCTIONS
221248
"G_zero_raster_buf"
222249
)
223250

224-
# If a function, say G_1 called in true GRASS gis lib (loaded by QLibrary)
225-
# calls another function G_2 which does not have to be reimplemented in gis fake lib:
226-
# - on Linux: G_2 is resolved in original GRASS true gis lib and it is not necessary
227-
# to add it to functions mapped in fake lib
228-
# - on Windows: it seems that dynamic linker is searching for G_2 in the first loaded
229-
# module of the same name, i.e. in our fake library, not in the original
230-
# true GRASS gis lib, so we have to add all functions called in true lib
231-
# also to mapped functions in fake lib
232-
# Maybe that above is nonsese, but on Linux symbols are resolved when called, but on
233-
# Windows, all symbols are resolved at beginning and thus not all missing symbols are
234-
# always catched on Linux if testing with different data
235-
236-
IF(MSVC)
237-
SET ( FUNCTIONS
238-
${FUNCTIONS}
239-
"G__getenv"
240-
"G__getenv2"
241-
"G_get_gisrc_mode"
242-
)
243-
ENDIF(MSVC)
244251

245252
# List of functions which are implemented in qgsgrassgislib.cpp and
246253
# thus we only need prototype
@@ -280,20 +287,26 @@ SET ( FUNCTION_PROTOTYPES
280287
"G_geodesic_distance_lon_to_lon"
281288
"G_geodesic_distance"
282289
"G_get_cellhd"
290+
"G_get_cell_title"
283291
"G_get_c_raster_row"
284292
"G_get_c_raster_row_nomask"
285293
"G_get_d_raster_row"
286294
"G_get_d_raster_row_nomask"
295+
"G_get_ellipsoid_parameters"
287296
"G_get_f_raster_row"
288297
"G_get_f_raster_row_nomask"
289298
"G_get_map_row"
290299
"G_get_map_row_nomask"
291300
"G_get_null_value_row"
301+
"G_get_projinfo"
292302
"G_get_raster_map_type"
293303
"G_get_raster_row"
294304
"G_get_raster_row_nomask"
305+
"G_get_reclass"
295306
"G__gisinit"
307+
"G_gisdbase"
296308
"G_important_message"
309+
"G__insert_color_into_lookup"
297310
"G_legal_filename"
298311
"G_location"
299312
"G_location_path"
@@ -303,15 +316,22 @@ SET ( FUNCTION_PROTOTYPES
303316
"G_mapset"
304317
"G_maskfd"
305318
"G_message"
319+
"G__name_is_fully_qualified"
320+
"G_number_of_cats"
306321
"G_open_cell_new"
307322
"G_open_cell_old"
308323
"G_open_fp_cell_new"
324+
"G_open_new"
309325
"G_open_raster_new"
310326
"G_parser"
311327
"G_put_cell_title"
328+
"G_put_c_raster_row"
329+
"G_put_f_raster_row"
330+
"G_put_d_raster_row"
312331
"G_put_raster_row"
313332
"G_quantize_fp_map_range"
314333
"G_raster_map_is_fp"
334+
"G_raster_map_type"
315335
"G_read_cats"
316336
"G_read_colors"
317337
"G_read_fp_range"
@@ -320,22 +340,26 @@ SET ( FUNCTION_PROTOTYPES
320340
"G_read_raster_cats"
321341
"G_remove"
322342
"G_rename"
343+
"G_round_fp_map"
323344
"G_set_cats_title"
324345
"G_set_error_routine"
325346
"G_set_geodesic_distance_lat1"
326347
"G_set_geodesic_distance_lat2"
327348
"G_set_quant_rules"
328349
"G_short_history"
350+
"G_snprintf"
329351
"G_spawn"
330352
"G_spawn_ex"
331353
"G__temp_element"
332354
"G_tempfile"
355+
"G_unopen_cell"
333356
"G_vasprintf"
334357
"G_verbose_message"
335358
"G_warning"
336359
"G_write_colors"
337360
"G_write_history"
338361
"G_write_raster_cats"
362+
"G_write_cats"
339363
)
340364

341365
SET ( FUNCTIONS_ALL

0 commit comments

Comments
 (0)