[GRASS-SVN] r40618 - in grass/trunk: lib/python raster/r.out.bin
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jan 22 07:05:16 EST 2010
Author: glynn
Date: 2010-01-22 07:05:16 -0500 (Fri, 22 Jan 2010)
New Revision: 40618
Modified:
grass/trunk/lib/python/array.py
grass/trunk/raster/r.out.bin/main.c
Log:
Change size -> bytes for consistency with r.in.bin
Modified: grass/trunk/lib/python/array.py
===================================================================
--- grass/trunk/lib/python/array.py 2010-01-22 12:04:13 UTC (rev 40617)
+++ grass/trunk/lib/python/array.py 2010-01-22 12:05:16 UTC (rev 40618)
@@ -68,7 +68,7 @@
flags = flags,
input = mapname,
output = self.filename,
- size = size,
+ bytes = size,
null = null,
quiet = True)
Modified: grass/trunk/raster/r.out.bin/main.c
===================================================================
--- grass/trunk/raster/r.out.bin/main.c 2010-01-22 12:04:13 UTC (rev 40617)
+++ grass/trunk/raster/r.out.bin/main.c 2010-01-22 12:05:16 UTC (rev 40618)
@@ -130,7 +130,7 @@
static void write_bil_hdr(
const char *outfile, const struct Cell_head *region,
- int size, int order, int header, double null_val)
+ int bytes, int order, int header, double null_val)
{
char out_tmp[GPATH_MAX];
FILE *fp;
@@ -146,7 +146,7 @@
fprintf(fp, "nrows %d\n", region->rows);
fprintf(fp, "ncols %d\n", region->cols);
fprintf(fp, "nbands 1\n");
- fprintf(fp, "nbits %d\n", size * 8);
+ fprintf(fp, "nbits %d\n", bytes * 8);
fprintf(fp, "byteorder %s\n", order == 0 ? "M" : "I");
fprintf(fp, "layout bil\n");
fprintf(fp, "skipbytes %d\n", header ? 892 : 0);
@@ -157,10 +157,10 @@
static void convert_cell(
unsigned char *out_cell, const DCELL in_cell,
- int is_fp, int size, int swap_flag)
+ int is_fp, int bytes, int swap_flag)
{
if (is_fp) {
- switch (size) {
+ switch (bytes) {
case 4:
*(float *) out_cell = (float) in_cell;
break;
@@ -170,7 +170,7 @@
}
}
else {
- switch (size) {
+ switch (bytes) {
case 1:
*(unsigned char *) out_cell = (unsigned char) in_cell;
break;
@@ -189,7 +189,7 @@
}
if (swap_flag) {
- switch (size) {
+ switch (bytes) {
case 1: break;
case 2: swap_2(out_cell); break;
case 4: swap_4(out_cell); break;
@@ -200,7 +200,7 @@
static void convert_row(
unsigned char *out_buf, const DCELL *raster, int ncols,
- int is_fp, int size, int swap_flag, double null_val)
+ int is_fp, int bytes, int swap_flag, double null_val)
{
unsigned char *ptr = out_buf;
int i;
@@ -209,8 +209,8 @@
DCELL x = Rast_is_d_null_value(&raster[i])
? null_val
: raster[i];
- convert_cell(ptr, x, is_fp, size, swap_flag);
- ptr += size;
+ convert_cell(ptr, x, is_fp, bytes, swap_flag);
+ ptr += bytes;
}
}
@@ -245,7 +245,7 @@
struct Option *input;
struct Option *output;
struct Option *null;
- struct Option *size;
+ struct Option *bytes;
struct Option *order;
} parm;
struct
@@ -261,7 +261,7 @@
double null_val;
int do_stdout;
int is_fp;
- int size;
+ int bytes;
int order;
int swap_flag;
struct Cell_head region;
@@ -302,12 +302,12 @@
parm.null->answer = "0";
parm.null->description = _("Value to write out for null");
- parm.size = G_define_option();
- parm.size->key = "size";
- parm.size->type = TYPE_INTEGER;
- parm.size->required = NO;
- parm.size->options = "1,2,4,8";
- parm.size->description = _("Number of bytes per cell");
+ parm.bytes = G_define_option();
+ parm.bytes->key = "bytes";
+ parm.bytes->type = TYPE_INTEGER;
+ parm.bytes->required = NO;
+ parm.bytes->options = "1,2,4,8";
+ parm.bytes->description = _("Number of bytes per cell");
parm.order = G_define_option();
parm.order->key = "order";
@@ -383,19 +383,19 @@
else
is_fp = Rast_get_map_type(fd) != CELL_TYPE;
- if (parm.size->answer)
- size = atoi(parm.size->answer);
+ if (parm.bytes->answer)
+ bytes = atoi(parm.bytes->answer);
else if (is_fp)
- size = 4;
+ bytes = 4;
else
- size = 2;
+ bytes = 2;
- if (is_fp && size < 4)
- G_fatal_error(_("Floating-point output requires size=4 or size=8"));
+ if (is_fp && bytes < 4)
+ G_fatal_error(_("Floating-point output requires bytes=4 or bytes=8"));
#ifndef HAVE_LONG_LONG_INT
- if (!is_fp && size > 4)
- G_fatal_error(_("Integer output doesn't support size=8 in this build"));
+ if (!is_fp && bytes > 4)
+ G_fatal_error(_("Integer output doesn't support bytes=8 in this build"));
#endif
G_get_window(®ion);
@@ -408,7 +408,7 @@
/* Set up Parameters for GMT header */
if (flag.gmt_hd->answer) {
- if (!is_fp && size > 4)
+ if (!is_fp && bytes > 4)
G_fatal_error(_("GMT grid doesn't support 64-bit integers"));
make_gmt_header(&header, name, outfile, ®ion, null_val);
}
@@ -417,7 +417,7 @@
if (flag.bil_hd->answer) {
G_message(_("Creating BIL support files..."));
write_bil_hdr(outfile, ®ion,
- size, order, flag.gmt_hd->answer, null_val);
+ bytes, order, flag.gmt_hd->answer, null_val);
write_bil_wld(outfile, ®ion);
}
@@ -429,15 +429,15 @@
ncols = G_window_cols();
in_buf = Rast_allocate_d_buf();
- out_buf = G_malloc(ncols * size);
+ out_buf = G_malloc(ncols * bytes);
if (is_fp) {
- G_message(_("Exporting raster as floating values (bytes=%d)"), size);
+ G_message(_("Exporting raster as floating values (bytes=%d)"), bytes);
if (flag.gmt_hd->answer)
G_message(_("Writing GMT float format ID=1"));
}
else {
- G_message(_("Exporting raster as integer values (bytes=%d)"), size);
+ G_message(_("Exporting raster as integer values (bytes=%d)"), bytes);
if (flag.gmt_hd->answer)
G_message(_("Writing GMT integer format ID=2"));
}
@@ -455,9 +455,9 @@
Rast_get_d_row(fd, in_buf, row);
- convert_row(out_buf, in_buf, ncols, is_fp, size, swap_flag, null_val);
+ convert_row(out_buf, in_buf, ncols, is_fp, bytes, swap_flag, null_val);
- if (fwrite(out_buf, size, ncols, fp) != ncols)
+ if (fwrite(out_buf, bytes, ncols, fp) != ncols)
G_fatal_error(_("Error writing data"));
}
More information about the grass-commit
mailing list