Merge branch 'RELEASE' into STABLE

BRL-CAD · Nov 7, 2023 · 9ebf41d · 9ebf41d
2 parents e718f70 + a17ff9b
commit 9ebf41d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -23,10 +23,6 @@ processing high level assemblies in BRL-CAD's example geometry files:
 % success, old: 88.9%  (249 of 280) Time elapsed:  7256 seconds
 % success, new: 98.9%  (277 of 280) Time elapsed:  1044 seconds
 
-Also in this release is an alpha version of the new "gist" tool, which
-leverages the OpenCV library to create one page summaries of the
-geometric information present in .g files.
-
 * add 'brep dump' subcommand to write out brep objects - Cliff Yapp
 * improve 'x' default behavior in MGED - Chris McGregor
 * fixed 'edcolor' and 'color -e' on Windows - Chris McGregor

diff --git a/src/gtools/gist/InformationGatherer.cpp b/src/gtools/gist/InformationGatherer.cpp
@@ -622,7 +622,7 @@ InformationGatherer::gatherInformation(std::string name)
                 DomainName = (LPTSTR)GlobalAlloc(GMEM_FIXED, dwDomainName * sizeof(wchar_t));
                 if (DomainName == NULL) {
                     worked = false;
-                } eelse {
+                } else {
                     bRtnBool = LookupAccountSid(NULL, pSidOwner, AcctName, (LPDWORD)&dwAcctName, DomainName, (LPDWORD)&dwDomainName, &eUse);
                     if (bRtnBool == FALSE) {
                         worked = false;