[brlcad-commits] SF.net SVN: brlcad:[33376] brlcad/trunk/src/librtserver/rtserver.c
Revision: 33376
http://brlcad.svn.sourceforge.net/brlcad/?rev=33376view=rev
Author: johnranderson
Date: 2008-12-16 16:22:16 + (Tue, 16 Dec 2008)
Log Message:
---
MUVES3 package names have changed
Modified Paths:
--
brlcad/trunk/src/librtserver/rtserver.c
Modified: brlcad/trunk/src/librtserver/rtserver.c
===
--- brlcad/trunk/src/librtserver/rtserver.c 2008-12-16 06:41:56 UTC (rev
33375)
+++ brlcad/trunk/src/librtserver/rtserver.c 2008-12-16 16:22:16 UTC (rev
33376)
@@ -1155,7 +1155,7 @@
max_pt = rts_geometry[sessionId]-rts_mdl_max;
/* get the BoundingBox class */
-if ( (boundingBox_class=(*env)-FindClass( env,
mil/army/muves/math/BoundingBox ) ) == NULL ) {
+if ( (boundingBox_class=(*env)-FindClass( env,
mil/army/muves/sim/math/BoundingBox ) ) == NULL ) {
fprintf( stderr, Failed to find BoundingBox class\n );
(*env)-ExceptionDescribe(env);
return( (jobject)NULL );
@@ -1163,14 +1163,14 @@
/* get the BoundingBox constructor id */
if ( (boundingBox_constructor_id=(*env)-GetMethodID( env,
boundingBox_class, init,
-
(Lmil/army/muves/math/Point;Lmil/army/muves/math/Point;)V ) ) == NULL ) {
+
(Lmil/army/muves/sim/math/Point;Lmil/army/muves/sim/math/Point;)V ) ) == NULL
) {
fprintf( stderr, Failed to find BoundingBox constructor method id\n );
(*env)-ExceptionDescribe(env);
return( (jobject)NULL );
}
/* get the Point class */
-if ( (point_class=(*env)-FindClass( env, mil/army/muves/math/Point ) )
== NULL ) {
+if ( (point_class=(*env)-FindClass( env, mil/army/muves/sim/math/Point
) ) == NULL ) {
fprintf( stderr, Failed to find Point class\n );
(*env)-ExceptionDescribe(env);
return( (jobject)NULL );
@@ -1405,33 +1405,33 @@
struct bu_vlb *vlb;
unsigned char buffer[SIZEOF_NETWORK_DOUBLE*3];
-if ( (rayClass=(*env)-FindClass( env, mil/army/muves/math/Ray ) ) ==
NULL ) {
+if ( (rayClass=(*env)-FindClass( env, mil/army/muves/sim/math/Ray ) )
== NULL ) {
fprintf( stderr, Failed to find Ray class\n );
(*env)-ExceptionDescribe(env);
return( (jobject)NULL );
}
-fidStart = (*env)-GetFieldID( env, rayClass, start,
Lmil/army/muves/math/Point; );
+fidStart = (*env)-GetFieldID( env, rayClass, start,
Lmil/army/muves/sim/math/Point; );
if ( fidStart == 0 (*env)-ExceptionOccurred(env) ) {
fprintf( stderr, Exception thrown while getting fid of ray start
point\n );
(*env)-ExceptionDescribe(env);
return( (jobject)NULL );
}
-fidDirection = (*env)-GetFieldID( env, rayClass, direction,
Lmil/army/muves/math/Vector3; );
+fidDirection = (*env)-GetFieldID( env, rayClass, direction,
Lmil/army/muves/sim/math/Vector3; );
if ( fidDirection == 0 (*env)-ExceptionOccurred(env) ) {
fprintf( stderr, Exception thrown while getting fid of ray direction
vector\n );
(*env)-ExceptionDescribe(env);
return( (jobject)NULL );
}
-if ( (pointClass=(*env)-FindClass( env, mil/army/muves/math/Point ) )
== NULL ) {
+if ( (pointClass=(*env)-FindClass( env, mil/army/muves/sim/math/Point )
) == NULL ) {
fprintf( stderr, Failed to find Point class\n );
(*env)-ExceptionDescribe(env);
return( (jobject)NULL );
}
-if ( (vector3Class=(*env)-FindClass( env, mil/army/muves/math/Vector3 )
) == NULL ) {
+if ( (vector3Class=(*env)-FindClass( env,
mil/army/muves/sim/math/Vector3 ) ) == NULL ) {
fprintf( stderr, Failed to find Vector3 class\n );
(*env)-ExceptionDescribe(env);
return( (jobject)NULL );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33382] brlcad/trunk/src/libbu/xdr.c
Revision: 33382 http://brlcad.svn.sourceforge.net/brlcad/?rev=33382view=rev Author: brlcad Date: 2008-12-16 17:18:25 + (Tue, 16 Dec 2008) Log Message: --- fix typo in comment, these are alternates for the bsd [hn]to[nh][sl] byteorder routines. Modified Paths: -- brlcad/trunk/src/libbu/xdr.c Modified: brlcad/trunk/src/libbu/xdr.c === --- brlcad/trunk/src/libbu/xdr.c2008-12-16 17:00:31 UTC (rev 33381) +++ brlcad/trunk/src/libbu/xdr.c2008-12-16 17:18:25 UTC (rev 33382) @@ -28,7 +28,7 @@ * Routines to insert/extract short/long's into char arrays, * independend of machine byte order and word-alignment. * Uses encoding compatible with routines found in libpkg, - * and BSD system routines ntohl(), ntons(), ntohl(), ntohs(). + * and BSD system routines htonl(), htons(), ntohl(), ntohs(). * */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33383] brlcad/trunk/src/archer/plugins/Wizards/Makefile .am
Revision: 33383 http://brlcad.svn.sourceforge.net/brlcad/?rev=33383view=rev Author: brlcad Date: 2008-12-16 17:22:39 + (Tue, 16 Dec 2008) Log Message: --- tankwizard was renamed sans IA suffix, fix distcheck Modified Paths: -- brlcad/trunk/src/archer/plugins/Wizards/Makefile.am Modified: brlcad/trunk/src/archer/plugins/Wizards/Makefile.am === --- brlcad/trunk/src/archer/plugins/Wizards/Makefile.am 2008-12-16 17:18:25 UTC (rev 33382) +++ brlcad/trunk/src/archer/plugins/Wizards/Makefile.am 2008-12-16 17:22:39 UTC (rev 33383) @@ -1,12 +1,12 @@ SUBDIRS = \ - tankwizardIA \ + tankwizard \ tirewizard documentationdir = $(BRLCAD_DATA)/plugins/archer/Wizards documentation_DATA = \ - tankwizardIA.tcl \ + tankwizard.tcl \ tirewizard.tcl EXTRA_DIST = \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33385] brlcad/trunk/misc/win32-msvc8/libged/libged. vcproj
Revision: 33385 http://brlcad.svn.sourceforge.net/brlcad/?rev=33385view=rev Author: bob1961 Date: 2008-12-16 18:32:09 + (Tue, 16 Dec 2008) Log Message: --- Added tire to libged build on Windows. Modified Paths: -- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj === --- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-12-16 17:48:32 UTC (rev 33384) +++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-12-16 18:32:09 UTC (rev 33385) @@ -914,6 +914,10 @@ /File File + RelativePath=..\..\..\src\libged\tire.c + + /File + File RelativePath=..\..\..\src\libged\title.c /File This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33389] brlcad/trunk/src/conv/dem-g.c
Revision: 33389
http://brlcad.svn.sourceforge.net/brlcad/?rev=33389view=rev
Author: brlcad
Date: 2008-12-17 02:20:40 + (Wed, 17 Dec 2008)
Log Message:
---
use libbu facilities where appropriate, bu_log bu_exit BRLCAD_ERROR/OK status
codes
Modified Paths:
--
brlcad/trunk/src/conv/dem-g.c
Modified: brlcad/trunk/src/conv/dem-g.c
===
--- brlcad/trunk/src/conv/dem-g.c 2008-12-17 02:14:39 UTC (rev 33388)
+++ brlcad/trunk/src/conv/dem-g.c 2008-12-17 02:20:40 UTC (rev 33389)
@@ -127,10 +127,7 @@
*/
#define MAX_STRING_LENGTH 45
-#define SUCCESS 0
-#define FAILURE 1
-
/**
* ResultStruct DESCRIPTION
*
@@ -153,7 +150,7 @@
void usage(void)
{
-fprintf(stderr, Usage: %s dem_file\n, progname);
+bu_log(Usage: %s dem_file\n, progname);
}
@@ -187,7 +184,7 @@
/* a string of at least 3 characters */
unsigned char highbyte = '\0';
unsigned char lowbyte = '\0';
-int status = FAILURE;
+int status = BRLCAD_ERROR;
if ((in_value = 0) (in_value = 65535)) {
highbyte = (unsigned char)floor(in_value / 256);
@@ -195,11 +192,11 @@
out_string[0] = highbyte;
out_string[1] = lowbyte;
out_string[2] = '\0';
-status = SUCCESS;
+status = BRLCAD_OK;
} else {
-printf(Error, function flip_high_low_bytes input value '%ld' not
within 0-65535.\n, in_value);
+bu_log(ERROR: function flip_high_low_bytes input value '%ld' not
within 0-65535.\n, in_value);
out_string[0] = '\0';
-status = FAILURE;
+status = BRLCAD_ERROR;
}
return(status);
}
@@ -209,20 +206,20 @@
output_elevation(signed long int in_value, FILE *fp)
{
unsigned char buf[3] = ;
-int status = FAILURE;
+int status = BRLCAD_ERROR;
/* allow for clipping */
if (in_value DSP_MAX_RAW_ELEVATION) {
in_value = DSP_MAX_RAW_ELEVATION;
}
-if (flip_high_low_bytes(in_value, buf) == SUCCESS) {
+if (flip_high_low_bytes(in_value, buf) == BRLCAD_OK) {
if (fwrite(buf, 2, 1, fp) == 1) {
-status = SUCCESS;
+status = BRLCAD_OK;
}
}
-if (status == FAILURE) {
-printf(Within function output_elevation, error writing elevation to
temp file.\n);
+if (status == BRLCAD_ERROR) {
+bu_log(Within function output_elevation, error writing elevation to
temp file.\n);
}
return(status);
}
@@ -317,7 +314,7 @@
char *endp;
char *tmp_ptr = '\0';
char *buf = '\0';
-int status = FAILURE;
+int status = BRLCAD_ERROR;
logical_record_type record_type ;
int start_character = 0;
int field_width = 0;
@@ -381,7 +378,7 @@
if (datatype == type_alpha) {
/* tmp_ptr = strcpy((*io_struct).out_alpha, tmp_str); */
bu_strlcpy((*io_struct).out_alpha, tmp_str, strlen(tmp_str)+1);
-status = SUCCESS;
+status = BRLCAD_OK;
}
/*
*
@@ -394,12 +391,12 @@
if ((tmp_str != endp) (*endp == '\0')) {
/* convert to integer success */
(*io_struct).out_integer = tmp_long;
-status = SUCCESS;
+status = BRLCAD_OK;
} else {
/* convert to integer failed */
/* copy string which failed to convert to inetger to output
structure */
tmp_ptr = strcpy((*io_struct).out_alpha, tmp_str);
-status = FAILURE;
+status = BRLCAD_ERROR;
}
}
/*
@@ -430,12 +427,12 @@
if ((tmp_str != endp) (*endp == '\0')) {
/* convert to double success */
(*io_struct).out_double = tmp_dbl;
-status = SUCCESS;
+status = BRLCAD_OK;
} else {
/* convert to double failed */
/* copy string which failed to convert to double to output
structure */
tmp_ptr = strcpy((*io_struct).out_alpha, tmp_str);
-status = FAILURE;
+status = BRLCAD_ERROR;
}
}
/*
@@ -446,7 +443,7 @@
} else {
/* data was all whitespace */
(*io_struct).out_undefined = true;
-status = SUCCESS;
+status = BRLCAD_OK;
}
return (status);
}
@@ -458,7 +455,7 @@
/* and 'sub_elements_required_list_counts' */
ResultStruct my_out2;
ResultStruct *my_out_ptr2;
-int status = FAILURE;
+int status = BRLCAD_ERROR;
int element_number = 0;
int sub_element_number = 0;
int idx = 0;
@@ -473,13 +470,13 @@
(*my_out_ptr2).in_record_type = record_type;
(*my_out_ptr2).in_element_number = element_number;
[brlcad-commits] SF.net SVN: brlcad:[33391] brlcad/trunk/src/conv/dem-g.c
Revision: 33391
http://brlcad.svn.sourceforge.net/brlcad/?rev=33391view=rev
Author: brlcad
Date: 2008-12-17 02:38:11 + (Wed, 17 Dec 2008)
Log Message:
---
restructure reduce the logic nesting, simplify; remove a few obvious comments;
more style cleanup
Modified Paths:
--
brlcad/trunk/src/conv/dem-g.c
Modified: brlcad/trunk/src/conv/dem-g.c
===
--- brlcad/trunk/src/conv/dem-g.c 2008-12-17 02:24:32 UTC (rev 33390)
+++ brlcad/trunk/src/conv/dem-g.c 2008-12-17 02:38:11 UTC (rev 33391)
@@ -103,10 +103,10 @@
* the size of each dimension is increased by 1 one to accomidate
* this.
*/
-#define A_ROWS 32 /* DEM-G file type 'A' record, number of elements.
*/
-#define A_COLS 16 /* DEM-G file type 'A' record, max number of sub-elements
per element.*/
-#define A_VALS 4 /* DEM-G file type 'A' record, number of values to store
per sub-element. */
-#define RECORD_TYPE 4 /* DEM-G file type, record type (1=A, 2=B, 3=C) */
+#define A_ROWS 32 /* DEM-G file type 'A' record, number of elements.
*/
+#define A_COLS 16 /* DEM-G file type 'A' record, max number of
sub-elements per element.*/
+#define A_VALS 4 /* DEM-G file type 'A' record, number of values to
store per sub-element. */
+#define RECORD_TYPE 4 /* DEM-G file type, record type (1=A, 2=B, 3=C) */
int element_counts[4];
int sub_elements_required_list_counts[4];
@@ -182,13 +182,13 @@
{
/* it is expected the out_string points to */
/* a string of at least 3 characters */
-unsigned char highbyte = '\0';
+unsigned char highbyte = '\0';
unsigned char lowbyte = '\0';
-int status = BRLCAD_ERROR;
+int status = BRLCAD_ERROR;
if ((in_value = 0) (in_value = 65535)) {
highbyte = (unsigned char)floor(in_value / 256);
-lowbyte = (unsigned char)(in_value - (highbyte * 256));
+lowbyte = (unsigned char)(in_value - (highbyte * 256));
out_string[0] = highbyte;
out_string[1] = lowbyte;
out_string[2] = '\0';
@@ -246,55 +246,60 @@
/* initially lastp points to null at end of input string */
lastp = firstp + input_string_length;
/* test for zero length input_string, if zero then do nothing */
-if (input_string_length != 0) {
- /* find start character and set pointer firstp to this character */
- found_start = false;
- idx = firstp;
- while ((found_start == false) (idx lastp)) {
- if (isspace(idx[0]) == 0) {
- /* execute if non-space found */
- found_start = true;
- firstp = idx;
- }
- idx++;
+if (input_string_length == 0) {
+ return;
+}
+
+/* find start character and set pointer firstp to this character */
+found_start = false;
+idx = firstp;
+while ((found_start == false) (idx lastp)) {
+ if (isspace(idx[0]) == 0) {
+ /* execute if non-space found */
+ found_start = true;
+ firstp = idx;
}
- /* if found_start is false then string must be all whitespace */
+ idx++;
+}
+/* if found_start is false then string must be all whitespace */
+if (found_start == false) {
/* set null to first character a do nothing more */
- if (found_start == false) {
- input_string[0] = '\0';
- } else {
- /* If found_start is true, check for trailing whitespace */
- /* Find last character and set pointer lastp to next */
- /* character after, i.e. where null would be. */
- /* There as at least one non-space character in this string */
- /* therefore will not need to deal with an empty string */
- /* condition in the loop looking for the string end. */
- found_end = false;
- idx = lastp - 1;
- while ((found_end == false) (idx = firstp)) {
- if (isspace(idx[0]) == 0) {
- /* execute if non-space found */
- found_end = true;
- lastp = idx + 1;
- }
- idx--;
- }
- /* Test if characters in string need to be shifted left. */
- /* If no need to shift left, set null to location of lastp */
- /* and do nothing more. */
- if (firstp input_string) {
- /* Execute if need to shift left, this would happen only */
- /* if input_string contained pre whitspace. */
- cleaned_string_length = lastp - firstp;
- for (idx2 = 0; idx2 cleaned_string_length; idx2++) {
- input_string[idx2] = firstp[idx2];
- }
- input_string[cleaned_string_length] = '\0';
- } else {
- lastp[0] = '\0';
- }
+ input_string[0] = '\0';
+
[brlcad-commits] SF.net SVN: brlcad:[33392] brlcad/trunk/src/conv/dem-g.c
Revision: 33392 http://brlcad.svn.sourceforge.net/brlcad/?rev=33392view=rev Author: brlcad Date: 2008-12-17 02:43:53 + (Wed, 17 Dec 2008) Log Message: --- quell compilation warnings. curious unused arguments for process_manual_dem_max_real_elevation() and it's nearly identical cousin func. Modified Paths: -- brlcad/trunk/src/conv/dem-g.c Modified: brlcad/trunk/src/conv/dem-g.c === --- brlcad/trunk/src/conv/dem-g.c 2008-12-17 02:38:11 UTC (rev 33391) +++ brlcad/trunk/src/conv/dem-g.c 2008-12-17 02:43:53 UTC (rev 33392) @@ -864,6 +864,9 @@ long int manual_dem_max_raw_elevation_lowerlimit = 1; long int manual_dem_max_raw_elevation_upperlimit = 99; +/* unused variable quelling */ +in_raw_dem_2_raw_dsp_auto_scale_factor_ptr = in_raw_dem_2_raw_dsp_auto_scale_factor_ptr; + /* compute raw_dem_2_raw_dsp_scale_factor based on the user entered */ /* dem max raw elevation */ /* test for zero to avoid divide by 0 math error */ @@ -952,6 +955,10 @@ double adjusted_manual_dem_max_real_elevation = 0; /* value adjusted to multiple of z_spatial */ /* resolution then add datum elevation */ +/* unused variable quelling */ +in_raw_dem_2_raw_dsp_auto_scale_factor_ptr = in_raw_dem_2_raw_dsp_auto_scale_factor_ptr; +in_derived_dem_max_raw_elevation_ptr = in_derived_dem_max_raw_elevation_ptr; + /* makes sure *in_manual_dem_max_real_elevation_ptr = *in_datum_elevation_in_curr_b_record_ptr */ manual_dem_max_real_elevation_lowerlimit = *in_z_spatial_resolution_ptr + *in_datum_elevation_in_curr_b_record_ptr; manual_dem_max_real_elevation_upperlimit = (99 * *in_z_spatial_resolution_ptr) + *in_datum_elevation_in_curr_b_record_ptr; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33393] brlcad/trunk/src/conv/dem-g.c
Revision: 33393 http://brlcad.svn.sourceforge.net/brlcad/?rev=33393view=rev Author: brlcad Date: 2008-12-17 02:58:13 + (Wed, 17 Dec 2008) Log Message: --- some last touch-ups to restore some of the comment alignments and use multiline comments in (just some of) the places where the comments spanned multiple lines. Modified Paths: -- brlcad/trunk/src/conv/dem-g.c Modified: brlcad/trunk/src/conv/dem-g.c === --- brlcad/trunk/src/conv/dem-g.c 2008-12-17 02:43:53 UTC (rev 33392) +++ brlcad/trunk/src/conv/dem-g.c 2008-12-17 02:58:13 UTC (rev 33393) @@ -21,6 +21,46 @@ * * USGS ASCII DEM file to dsp primitive converter * + * There are several global element arrays that contain information + * about the structure of the DEM-G file, record types 'A', 'B' and + * 'C'. Data is loaded into these arrays during main(). + * + * An 'element' is a 'data element' as defined in the DEM-G file + * specification. + * + * A 'sub-element' is a field of data within an 'element'. + * + * An 'element' will contain at least one 'sub-element'. The '?' + * within these array descriptions can be replaced with 'a', 'b' or + * 'c' to indicate a specific array which corresponds to a specific + * record type. + * + * ARRAY DESCRIPTION: record_?_element_size[index1][index2][index3] + * index1 = element number + * index2 = sub-element number within element + * index3 = value number + * Three values are stored for each sub-element... + * + * when index3=1, value = start character of sub-element within DEM-G + * file 1024 character A/B/C record. + * + * when index3=2, value = number of characters in sub-element. + * + * when index3=3, value = datatype of sub-element (1=alpha, 2=signed + * long integer, 3=double precision float). + * + * ARRAY DESCRIPTION: record_?_sub_elements[index] + * index = element number + * value = number of sub-elements per element + * + * This information allows the code to loop through the contents of + * the array 'record_?_element_size' since each element can contain a + * different number of sub-elements. + * + * No values are stored with an index of zero within these arrays, + * therefore the size of each dimension is increased by one to + * accommodate this. + * */ #include common.h @@ -65,44 +105,6 @@ } sub_element_datatype; -/** - * The arrays documented in this comment block contain information - * about the structure of the DEM-G file, record types 'A', 'B' and - * 'C'. Data is loaded into these arrays after they are declared. - * - * In the following descriptions, an 'element' is a 'data element' as - * defined in the DEM-G file specification. A 'sub-element' is a field - * of data within an 'element'. An 'element' will contain at least - * one 'sub-element'. The '?' within these array descriptions can be - * replaced with 'a', 'b' or 'c' to indicate a specific array which - * corresponds to a specific record type. - * - * ARRAY DESCRIPTION: record_?_element_size[index1][index2][index3] - * index1 = element number - * index2 = sub-element number within element - * index3 = value number - * Three values are stored for each sub-element... - * - * when index3=1, value = start character of sub-element within DEM-G - * file 1024 character A/B/C record. - * - * when index3=2, value = number of characters in sub-element. - * - * when index3=3, value = datatype of sub-element (1=alpha, 2=signed - * long integer, 3=double precision float). - * - * ARRAY DESCRIPTION: record_?_sub_elements[index] - * index = element number - * value = number of sub-elements per element - * - * This information allows the code to loop through the contents of - * the array 'record_?_element_size' since each element can contain a - * different number of sub-elements. - * - * No values are stored with index 0 within these arrays, therefore - * the size of each dimension is increased by 1 one to accomidate - * this. - */ #define A_ROWS 32 /* DEM-G file type 'A' record, number of elements. */ #define A_COLS 16 /* DEM-G file type 'A' record, max number of sub-elements per element.*/ #define A_VALS 4 /* DEM-G file type 'A' record, number of values to store per sub-element. */ @@ -116,8 +118,6 @@ double conversion_factor_to_milimeters[4]; /** - * MAX_STRING_LENGTH DESCRIPTION - * * The size of the largest string needed to contain the widest ascii * sub-element field as defined in the DEM-G file specification for * record types 'A', 'B' and 'C'. To this size add '4' to account for @@ -127,10 +127,7 @@ */ #define MAX_STRING_LENGTH 45 - /** - * ResultStruct DESCRIPTION - * * This type defines the structure which contains the input output * parameters passed to from the function 'read_element'. */ @@ -268,12 +265,13 @@ return; } -/* If found_start is true, check for trailing whitespace */ -/* Find last
