Revision: 76766
http://sourceforge.net/p/brlcad/code/76766
Author: starseeker
Date: 2020-08-15 00:28:25 +0000 (Sat, 15 Aug 2020)
Log Message:
-----------
Merge trunk changes from r76747 through r76764
Modified Paths:
--------------
brlcad/branches/RELEASE/CMakeLists.txt
brlcad/branches/RELEASE/NEWS
brlcad/branches/RELEASE/src/rt/viewweight.c
Property Changed:
----------------
brlcad/branches/RELEASE/NEWS
Modified: brlcad/branches/RELEASE/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/CMakeLists.txt 2020-08-15 00:28:10 UTC (rev
76765)
+++ brlcad/branches/RELEASE/CMakeLists.txt 2020-08-15 00:28:25 UTC (rev
76766)
@@ -3699,7 +3699,7 @@
string(REGEX REPLACE "\r?\n" "" NEW_STR "${BIN_STR}")
if(NOT "${OLD_STR}" STREQUAL "${NEW_STR}")
set(CONFIG_FATAL_ERROR 1 PARENT_SCOPE)
- message("\n\"${BRLCAD_SOURCE_DIR}/${filename}\" is out of date. An
updated version has been generated at
\"${BRLCAD_BINARY_DIR}/${filename}.new\"\nTo clear this warning, replace
\"${BRLCAD_SOURCE_DIR}/${filename}\" with
\"${BRLCAD_BINARY_DIR}/${filename}.new\"\n")
+ message("\nERROR: \"${BRLCAD_SOURCE_DIR}/${filename}\" is out of date. An
updated version has been generated at
\"${BRLCAD_BINARY_DIR}/${filename}.new\"\nTo clear this, replace
\"${BRLCAD_SOURCE_DIR}/${filename}\" with
\"${BRLCAD_BINARY_DIR}/${filename}.new\" or find the source of the
difference.\n")
endif(NOT "${OLD_STR}" STREQUAL "${NEW_STR}")
endfunction(DIFF_FILE filename)
@@ -3725,7 +3725,7 @@
DIFF_FILE(configure)
if(CONFIG_FATAL_ERROR)
- message(FATAL_ERROR "Configure haulted.")
+ message(FATAL_ERROR "Configure haulted because INSTALL and/or configure
script are out of date.")
endif(CONFIG_FATAL_ERROR)
Modified: brlcad/branches/RELEASE/NEWS
===================================================================
--- brlcad/branches/RELEASE/NEWS 2020-08-15 00:28:10 UTC (rev 76765)
+++ brlcad/branches/RELEASE/NEWS 2020-08-15 00:28:25 UTC (rev 76766)
@@ -10,9 +10,11 @@
changes made. See document footer for additional details.
----------------------------------------------------------------------
---- 20XX-XX-XX Release 7.3X.X ---
+--- 2020-08-XX Release 7.32.X ---
----------------------------------------------------------------------
+* dynamic LIBGED command loading in MGED & Archer - Cliff Yapp
+* dynamic LIBDM display manager loading in MGED & Archer - Cliff Yapp
* fixed 'idents' crash when running in a read-only dir - Sean Morrison
* fixed fb tools w/ redirected files and cv on Windows - Sean Morrison
* expanded 'bo' command docs with a DSP input example - Sean Morrison
Property changes on: brlcad/branches/RELEASE/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/prep-cache/NEWS:68236-68933
/brlcad/branches/tcltk86/NEWS:68300-75257
/brlcad/trunk:68170-68252
-/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74373,74376-75141,75375,75377-75378,75565-75566,75811
\ No newline at end of property
+/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74373,74376-75141,75375,75377-75378,75565-75566,75811,76748-76764
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/rt/viewweight.c
===================================================================
--- brlcad/branches/RELEASE/src/rt/viewweight.c 2020-08-15 00:28:10 UTC (rev
76765)
+++ brlcad/branches/RELEASE/src/rt/viewweight.c 2020-08-15 00:28:25 UTC (rev
76766)
@@ -64,7 +64,7 @@
int noverlaps = 0;
FILE *densityfp;
-struct bu_vls *densityfile_vls;
+struct bu_vls densityfile_vls = BU_VLS_INIT_ZERO;
#define DENSITY_FILE ".density"
struct analyze_densities *density = NULL;
@@ -195,20 +195,19 @@
/* densityfile is global to this file and will be used later (and then
freed) */
- BU_GET(densityfile_vls, struct bu_vls);
- bu_vls_init(densityfile_vls);
+ bu_vls_init(&densityfile_vls);
if (densityfile) {
analyze_densities_create(&density);
- bu_vls_sprintf(densityfile_vls, "%s", densityfile);
- if (!bu_file_exists(bu_vls_cstr(densityfile_vls), NULL)) {
- bu_log("Unable to load density file \"%s\" for reading\n",
bu_vls_cstr(densityfile_vls));
+ bu_vls_sprintf(&densityfile_vls, "%s", densityfile);
+ if (!bu_file_exists(bu_vls_cstr(&densityfile_vls), NULL)) {
+ bu_log("Unable to load density file \"%s\" for reading\n",
bu_vls_cstr(&densityfile_vls));
goto view_init_rtweight_fail;
}
- dfile = bu_open_mapped_file(bu_vls_cstr(densityfile_vls), "densities
file");
+ dfile = bu_open_mapped_file(bu_vls_cstr(&densityfile_vls), "densities
file");
if (!dfile) {
- bu_log("Unable to open density file \"%s\" for reading\n",
bu_vls_cstr(densityfile_vls));
+ bu_log("Unable to open density file \"%s\" for reading\n",
bu_vls_cstr(&densityfile_vls));
goto view_init_rtweight_fail;
}
@@ -217,7 +216,7 @@
/* Read in density */
if (analyze_densities_load(density, dbuff, &pbuff_msgs, NULL) == 0) {
- bu_log("Unable to parse density file \"%s\":%s\n",
bu_vls_cstr(densityfile_vls), bu_vls_cstr(&pbuff_msgs));
+ bu_log("Unable to parse density file \"%s\":%s\n",
bu_vls_cstr(&densityfile_vls), bu_vls_cstr(&pbuff_msgs));
bu_close_mapped_file(dfile);
goto view_init_rtweight_fail;
}
@@ -260,24 +259,24 @@
goto view_init_rtweight_fail;
}
- bu_vls_sprintf(densityfile_vls, "%s",
ap->a_rt_i->rti_dbip->dbi_filename);
+ bu_vls_sprintf(&densityfile_vls, "%s",
ap->a_rt_i->rti_dbip->dbi_filename);
} else {
/* If we still don't have density information, fall back on the
pre-defined defaults */
analyze_densities_create(&density);
- bu_vls_sprintf(densityfile_vls, "%s%c%s", bu_dir(NULL, 0,
BU_DIR_CURR, NULL), BU_DIR_SEPARATOR, DENSITY_FILE);
+ bu_vls_sprintf(&densityfile_vls, "%s%c%s", bu_dir(NULL, 0,
BU_DIR_CURR, NULL), BU_DIR_SEPARATOR, DENSITY_FILE);
- if (!bu_file_exists(bu_vls_cstr(densityfile_vls), NULL)) {
- bu_vls_sprintf(densityfile_vls, "%s%c%s", bu_dir(NULL, 0,
BU_DIR_HOME, NULL), BU_DIR_SEPARATOR, DENSITY_FILE);
- if (!bu_file_exists(bu_vls_cstr(densityfile_vls), NULL)) {
- bu_log("Unable to load density file \"%s\" for reading\n",
bu_vls_cstr(densityfile_vls));
+ if (!bu_file_exists(bu_vls_cstr(&densityfile_vls), NULL)) {
+ bu_vls_sprintf(&densityfile_vls, "%s%c%s", bu_dir(NULL, 0,
BU_DIR_HOME, NULL), BU_DIR_SEPARATOR, DENSITY_FILE);
+ if (!bu_file_exists(bu_vls_cstr(&densityfile_vls), NULL)) {
+ bu_log("Unable to load density file \"%s\" for reading\n",
bu_vls_cstr(&densityfile_vls));
goto view_init_rtweight_fail;
}
}
- dfile = bu_open_mapped_file(bu_vls_cstr(densityfile_vls),
"densities file");
+ dfile = bu_open_mapped_file(bu_vls_cstr(&densityfile_vls),
"densities file");
if (!dfile) {
- bu_log("Unable to open density file \"%s\" for reading\n",
bu_vls_cstr(densityfile_vls));
+ bu_log("Unable to open density file \"%s\" for reading\n",
bu_vls_cstr(&densityfile_vls));
goto view_init_rtweight_fail;
}
@@ -286,7 +285,7 @@
/* Read in density */
if (analyze_densities_load(density, dbuff, &pbuff_msgs, NULL) ==
0) {
- bu_log("Unable to parse density file \"%s\":%s\n",
bu_vls_cstr(densityfile_vls), bu_vls_cstr(&pbuff_msgs));
+ bu_log("Unable to parse density file \"%s\":%s\n",
bu_vls_cstr(&densityfile_vls), bu_vls_cstr(&pbuff_msgs));
bu_close_mapped_file(dfile);
goto view_init_rtweight_fail;
}
@@ -307,10 +306,7 @@
return 0; /* no framebuffer needed */
view_init_rtweight_fail:
- if (densityfile_vls) {
- bu_vls_free(densityfile_vls);
- BU_PUT(densityfile_vls, struct bu_vls);
- }
+ bu_vls_free(&densityfile_vls);
bu_vls_free(&pbuff_msgs);
analyze_densities_destroy(density);
if (minus_o && outfp) {
@@ -434,7 +430,7 @@
fprintf(outfp, "RT Weight Program Output:\n");
fprintf(outfp, "\nDatabase Title: \"%s\"\n", dbp->dbi_title);
- fprintf(outfp, "Time Stamp: %s\n\nDensity Table Used:%s\n\n", timeptr,
bu_vls_cstr(densityfile_vls));
+ fprintf(outfp, "Time Stamp: %s\n\nDensity Table Used:%s\n\n", timeptr,
bu_vls_cstr(&densityfile_vls));
fprintf(outfp, "Material Density(g/cm^3) Name\n");
{
long int curr_id = -1;
@@ -612,8 +608,7 @@
fprintf(outfp, "\nTotal mass = %g %s\n\n", total_weight, units);
/* now finished with density file name*/
- bu_vls_free(densityfile_vls);
- BU_PUT(densityfile_vls, struct bu_vls);
+ bu_vls_free(&densityfile_vls);
analyze_densities_destroy(density);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
