Revision: 77133
http://sourceforge.net/p/brlcad/code/77133
Author: starseeker
Date: 2020-09-13 17:25:19 +0000 (Sun, 13 Sep 2020)
Log Message:
-----------
Merge from trunk r76963 through r77132, sans libgcv/gcv changes.
Modified Paths:
--------------
brlcad/branches/RELEASE/NEWS
brlcad/branches/RELEASE/doc/CMakeLists.txt
brlcad/branches/RELEASE/doc/docbook/system/man1/CMakeLists.txt
brlcad/branches/RELEASE/doc/docbook/system/mann/whichair.xml
brlcad/branches/RELEASE/include/icv/io.h
brlcad/branches/RELEASE/misc/CMake/NSIS.template.in
brlcad/branches/RELEASE/misc/CMake/NSIS_silent.template.in
brlcad/branches/RELEASE/src/libdm/tests/CMakeLists.txt
brlcad/branches/RELEASE/src/librt/db5_scan.c
brlcad/branches/RELEASE/src/librt/db_lookup.c
Added Paths:
-----------
brlcad/branches/RELEASE/doc/README.BSD
brlcad/branches/RELEASE/doc/README.Solaris
brlcad/branches/RELEASE/doc/README.VAX
brlcad/branches/RELEASE/doc/docbook/system/man1/bolt.xml
Property Changed:
----------------
brlcad/branches/RELEASE/
brlcad/branches/RELEASE/NEWS
brlcad/branches/RELEASE/doc/
brlcad/branches/RELEASE/include/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-09-13 17:24:05 UTC (rev 77132)
+++ brlcad/branches/RELEASE 2020-09-13 17:25:19 UTC (rev 77133)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-76967,76975-76991,76994-77096,77105,77109
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-77132
\ No newline at end of property
Modified: brlcad/branches/RELEASE/NEWS
===================================================================
--- brlcad/branches/RELEASE/NEWS 2020-09-13 17:24:05 UTC (rev 77132)
+++ brlcad/branches/RELEASE/NEWS 2020-09-13 17:25:19 UTC (rev 77133)
@@ -13,6 +13,10 @@
--- 2020-08-XX Release 7.32.X ---
----------------------------------------------------------------------
+* added new 'nburst' version of classic burst tool - Cliff Yapp
+* added 'bot set' command for low level BoT manipulation - Cliff Yapp
+* report semantic strings for 'bot get' mode/orientation - Cliff Yapp
+* added new manual page for the libicv library - Sumagna Das
* added -size filter to MGED search command - Cliff Yapp
* upgraded Tcl/Tk from 8.5.19 to 8.6.10 - Cliff Yapp
* bundled zlib & libpng use API prefix and library suffix - Cliff Yapp
@@ -38,7 +42,13 @@
* improved Combination Editor button behaviors in MGED - Sean Morrison
* consistent usage taxonomy for ident-related commands - Sean Morrison
* added units label to the Archer in-scene scale graphic - Cliff Yapp
+* added framebuffer capture option to screengrab command - Cliff Yapp
+* added framebuffer writing option to overlay command - Cliff Yapp
+* added tree search option to 'whichid' and 'whichair' - Cliff Yapp
+* changed 'whichid' and 'whichair' to print ranges of unused IDs
+ - Nick Reed, Cliff Yapp
* improved output path sorting of search command - Cliff Yapp
+* added "bot extrude" command for making ARB6s from bots - Cliff Yapp
* added 3dm-g failure message about supported versions - Cliff Yapp
* fixed bw-png writing corrupted png files on Windows - Sean Morrison
* added MGED 'dm type' subcommand for reporting DM type - Cliff Yapp
Property changes on: brlcad/branches/RELEASE/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,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,76645-76654,76748-76764,76862-76954,76980-76991,76994-77014,77078-77096
\ 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,76645-76654,76748-76764,76862-76954,76963-77131
\ No newline at end of property
Index: brlcad/branches/RELEASE/doc
===================================================================
--- brlcad/branches/RELEASE/doc 2020-09-13 17:24:05 UTC (rev 77132)
+++ brlcad/branches/RELEASE/doc 2020-09-13 17:25:19 UTC (rev 77133)
Property changes on: brlcad/branches/RELEASE/doc
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/doc:62110-62113
/brlcad/branches/prep-cache/doc:68236-68933
/brlcad/branches/tcltk86/doc:68300-75257
-/brlcad/trunk/doc:76645-76726,76795-76858,76862-76954,76980-76991,77032-77065,77078-77096
\ No newline at end of property
+/brlcad/trunk/doc:76645-76726,76795-76858,76862-76954,76963-77131
\ No newline at end of property
Modified: brlcad/branches/RELEASE/doc/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/doc/CMakeLists.txt 2020-09-13 17:24:05 UTC (rev
77132)
+++ brlcad/branches/RELEASE/doc/CMakeLists.txt 2020-09-13 17:25:19 UTC (rev
77133)
@@ -9,11 +9,9 @@
README.Linux
README.MacOSX
README.Windows
- README.other/README.AIX
- README.other/README.BSD
- README.other/README.IRIX
- README.other/README.Solaris
- README.other/README.VAX
+ README.BSD
+ README.Solaris
+ README.VAX
checklist.txt
description.txt
notes/TODO.BREP
@@ -208,7 +206,6 @@
CMAKEFILES(
CMakeLists.txt
- README.other/README.OSCON-2014
STARTERS
STRATEGY
notes/bsd_semaphore_bug.txt
Copied: brlcad/branches/RELEASE/doc/README.BSD (from rev 77131,
brlcad/trunk/doc/README.BSD)
===================================================================
--- brlcad/branches/RELEASE/doc/README.BSD (rev 0)
+++ brlcad/branches/RELEASE/doc/README.BSD 2020-09-13 17:25:19 UTC (rev
77133)
@@ -0,0 +1,16 @@
+BRL-CAD on BSD README
+=====================
+
+BRL-CAD is frequently compiled under various variants of
+BSD including FreeBSD, NetBSD, OpenBSD, and even the original
+4.3 BSD (though now rare) - FreeBSD is the most common BSD
+platform tested, not counting Mac OSX. See the README.VAX
+document for additional details that pertain to building
+BRL-CAD on a VAX running BSD.
+
+CMake binaries for *BSD operating systems are not distributed
+by Kitware, but should be available through standard *BSD
+packaging mechanisms. Failing that, CMake can be bootstrapped
+without much difficulty on most modern Unix-style platforms.
+
+BRL-CAD is included in the FreeBSD Ports system.
Copied: brlcad/branches/RELEASE/doc/README.Solaris (from rev 77131,
brlcad/trunk/doc/README.Solaris)
===================================================================
--- brlcad/branches/RELEASE/doc/README.Solaris (rev 0)
+++ brlcad/branches/RELEASE/doc/README.Solaris 2020-09-13 17:25:19 UTC (rev
77133)
@@ -0,0 +1,61 @@
+BRL-CAD on Solaris README
+=========================
+In recent years, there have been a variety of Solaris-style operating
+systems that have appeared, following Sun's open-source release of
+OpenSolaris. OpenSolaris itself doesn't seem to be especially active, but
+another derivative system called OpenIndiana has appeared, based on the
+illumos kernel - the Solaris file will be the place to add any notes
+needed to build on such derivative systems, as well as Solaris proper.
+
+Kitware does not provide a pre-compiled binary for CMake on Solaris
+type systems. To bootstrap from the source code, try the following:
+
+(You probably want to use gmake and gcc/g++ for this...)
+
+1. Download the source from http://www.cmake.org/cmake/resources/software.html
+2. unzip the tarball: gunzip cmake-X.Y.Z.tar.gz
+3. open the tarball: tar -xvf cmake-X.Y.Z.tar
+4. cd cmake-X.Y.Z
+5. CXX=g++ ./bootstrap -prefix=/home/user/cmake-install (or your preferred
directory)
+6. gmake
+7. gmake install
+
+Then (if you installed to somewhere other than a system dir) add the
+bin directory to your path:
+
+csh: setenv PATH /home/user/cmake-install/bin:$PATH
+bash: export PATH=/home/user/cmake-install/bin:$PATH
+
+From there, you should be good to build BRL-CAD. The most recent tests
+of the Sun Studio compiler suggest that there are issues to resolve,
+so (unless you want to fix those issues, which would be welcome!) you
+probably want to use the GCC compiler suite to build BRL-CAD as well:
+
+CC=gcc CXX=g++ cmake ../brlcad
+
+If while compiling you encounter an error "Text relocation remains
+against symbol" along with some number of lines following, it usually
+means that the build has attempted to link a static system library
+into a shared library being compiled (e.g. attempting to link a system
+libz.a into the png library distributed in src/other/libpng being
+compiled as libpng.so). If this happens, it likely indicates a problem
+with the CMake build logic and should be reported as a bug - you may also
+need to install a shared version of the library. Another possibility
+would be to add -mipure-text to the linker flags.
+
+OpenIndiana
+-----------
+
+To build with gcc and CMake on OpenIndiana, you need to install the
+following packages:
+
+pkg install pkg:/developer/gcc-7
+pkg install pkg:/developer/build/cmake
+pkg install pkg:/developer/versioning/subversion
+pkg install pkg:/system/header
+pkg install pkg:/developer/lexer/flex
+
+(Note that gcc-7 building doesn't work as of 2017-08-23 - the above
+install list is a starting point, but the repo currently doesn't
+build and isn't close to building. It may be an older gcc would
+have better luck...)
Copied: brlcad/branches/RELEASE/doc/README.VAX (from rev 77131,
brlcad/trunk/doc/README.VAX)
===================================================================
--- brlcad/branches/RELEASE/doc/README.VAX (rev 0)
+++ brlcad/branches/RELEASE/doc/README.VAX 2020-09-13 17:25:19 UTC (rev
77133)
@@ -0,0 +1,43 @@
+BRL-CAD on VAX README
+=====================
+
+One of the first systems to run BRL-CAD was the VAX. In particular, a
+VAX 11/780 named VGR is the baseline reference machine for the BRL-CAD
+Benchmark suite. Through the 80's and most of the 90's, BRL-CAD was
+compiled for and maintained on VGR running 4.3 BSD until the hardware
+was finally decommissioned.
+
+BRL-CAD has been successfully compiled for and run under the simh
+Computer History Simulation Project's VAX simulator. Using this
+simulator, it's feasible to install one of the BSD variants
+(e.g. NetBSD) and the GCC compiler.
+
+No one has tried bootstrapping CMake on a VAX simh NetBSD image yet, so it
+is not known what problems may occur - the basic bootstrap procedure is:
+
+1. Download the source from http://www.cmake.org/cmake/resources/software.html
+2. unzip the tarball: gunzip cmake-X.Y.Z.tar.gz
+3. open the tarball: tar -xvf cmake-X.Y.Z.tar
+4. cd cmake-X.Y.Z
+5. CXX=g++ ./bootstrap -prefix=/home/user/cmake-install (or your preferred
directory)
+6. gmake
+7. gmake install
+
+As of the last effort involved in compiling BRL-CAD under this
+environment (using GNU Autotools), there were a few steps
+necessary that included the following:
+
+ - Define the preprocessor symbol "vax".
+
+ - Disable compilation of libfft and sig. The FFT library builds
+ convolution kernels that are too large for the usual VAX memory
+ sizes.
+
+ - Compile against libm.a instead of libm.so. The shared object
+ library (at least under NetBSD) is buggy and will cause run-time
+ bus errors (i.e. rt will crash). With CMake, you might try:
+ -DM_LIBRARY=/usr/lib/libm.a
+
+After those steps, you should at least be able to perform a benchmark
+compilation (i.e. "make benchmark"), raytrace images, and obtain
+performance metrics.
Modified: brlcad/branches/RELEASE/doc/docbook/system/man1/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/doc/docbook/system/man1/CMakeLists.txt
2020-09-13 17:24:05 UTC (rev 77132)
+++ brlcad/branches/RELEASE/doc/docbook/system/man1/CMakeLists.txt
2020-09-13 17:25:19 UTC (rev 77133)
@@ -6,6 +6,7 @@
asc2dsp.xml
asc2g.xml
benchmark.xml
+ bolt.xml
brlman.xml
bot_dump.xml
brep_simple.xml
Copied: brlcad/branches/RELEASE/doc/docbook/system/man1/bolt.xml (from rev
77131, brlcad/trunk/doc/docbook/system/man1/bolt.xml)
===================================================================
--- brlcad/branches/RELEASE/doc/docbook/system/man1/bolt.xml
(rev 0)
+++ brlcad/branches/RELEASE/doc/docbook/system/man1/bolt.xml 2020-09-13
17:25:19 UTC (rev 77133)
@@ -0,0 +1,190 @@
+<refentry xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="bolt1">
+
+<refmeta>
+ <refentrytitle>BOLT</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="source">BRL-CAD</refmiscinfo>
+ <refmiscinfo class="manual">BRL-CAD User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv xml:id="name">
+ <refname>bolt</refname>
+ <refpurpose>
+ Creates a BRL-CAD .g file containing bolts.
+ </refpurpose>
+</refnamediv>
+
+<!-- body begins here -->
+<refsynopsisdiv xml:id="synopsis">
+ <cmdsynopsis sepchar=" ">
+ <command>bolt</command>
+ <arg choice="opt" rep="repeat"><replaceable>options</replaceable></arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsection xml:id="description"><title>DESCRIPTION</title>
+
+ <para>
+ <command>bolt</command> is a program to create a BRL-CAD data base of
+ one of four different kinds of bolts. Up to twenty-six bolts of one type
+ and size may be created. <command>bolt</command> uses libwdb to create a
+ database file. This program may be run interactively or the user may
+ specify options on a command line. If the user chooses to run the program
+ interactively he answers the questions as the program prompts him. Below
+ are the options that can be used on the command line.
+ </para>
+</refsection>
+
+
+<refsection xml:id="options"><title>OPTIONS</title>
+
+ <variablelist remap="TP">
+ <varlistentry>
+ <term><option>-o#</option></term>
+ <listitem>
+ <para>
+ Type of bolt to be created: 1=>bolt head; 2=>bolt head and
washer; 3=>bolt
+ head, washer, and bolt stem; and 4=>bolt head and bolt stem.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-f </option><replaceable>name.g</replaceable></term>
+ <listitem>
+ <para>
+ BRL-CAD file name.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-n #</option></term>
+ <listitem>
+ <para>
+ The number of bolts to be created. This number must be less than or
equal to
+ 26 (or it will be set to 26).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-hd #</option></term>
+ <listitem>
+ <para>
+ Diameter of bolt head, flat edge to flat edge, in millimeters.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-hh #</option></term>
+ <listitem>
+ <para>
+ Height of bolt head in millimeters.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-wd #</option></term>
+ <listitem>
+ <para>
+ Diameter of washer in millimeters.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-wh #</option></term>
+ <listitem>
+ <para>
+ Height of washer in millimeters.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-sd #</option></term>
+ <listitem>
+ <para>
+ Diameter of bolt stem in millimeters.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-sh #</option></term>
+ <listitem>
+ <para>
+ Height of bolt stem in millimeters.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</refsection>
+
+<refsection xml:id="examples"><title>EXAMPLES</title>
+
+ <example><title>Interactive <command>bolt</command> Session</title>
+
+ <para>
+ <literallayout class="normal">
+$ bolt
+Enter option:
+ 1 - bolt head
+ 2 - bolt head & washer
+ 3 - bolt head, washer, & stem
+ 4 - bolt head & stem
+1
+Enter name of mged file to be created (25 char max).
+ bolt.g
+Enter the number of bolts to be created (26 max).
+ 3
+Enter diameter (flat edge to flat edge) & height of bolt head.
+ 30 10
+
+option: 1 - bolt head
+file: bolt.g
+head diameter: 30.000000, & height: 10.000000
+washer diameter: 0.000000, & height: 0.000000
+stem diameter: 0.000000, & height: 0.000000
+number of bolts: 3
+ </literallayout>
+ </para>
+ </example>
+
+ <example><title>Single-Line <command>bolt</command> Command</title>
+
+ <para>
+ <userinput>bolt -o1 -fbolt.g -n3 -hd30 -hh10</userinput>
+ </para>
+ </example>
+
+ <para>
+ Both examples produce the same output - the bolt heads (option 1)
+ are created with a diameter of 30mm and a height of 10mm in a database
+ file called bolt.g.
+ </para>
+
+</refsection>
+
+<refsection xml:id="author"><title>AUTHOR</title>
+ <para>Susan A. Coates</para>
+</refsection>
+
+<refsection xml:id="copyright"><title>COPYRIGHT</title>
+
+ <para>
+ This software is Copyright (c) 2005-2020 United States Government as
+ represented by the U.S. Army Research Laboratory.
+ </para>
+</refsection>
+
+<refsection xml:id="see_also"><title>SEE ALSO</title>
+
+ <para>
+ handle(1), window(1), window_frame(1), gastank(1)
+ </para>
+</refsection>
+
+<refsection xml:id="bug_reports"><title>BUG REPORTS</title>
+
+ <para>
+ Reports of bugs or problems should be submitted via electronic
+ mail to <email>[email protected]</email>
+ </para>
+</refsection>
+</refentry>
Modified: brlcad/branches/RELEASE/doc/docbook/system/mann/whichair.xml
===================================================================
--- brlcad/branches/RELEASE/doc/docbook/system/mann/whichair.xml
2020-09-13 17:24:05 UTC (rev 77132)
+++ brlcad/branches/RELEASE/doc/docbook/system/mann/whichair.xml
2020-09-13 17:25:19 UTC (rev 77133)
@@ -9,7 +9,7 @@
<refnamediv xml:id="name">
<refname>whichair</refname>
- <refpurpose>Lists all the regions that use one of the air codes
specified.</refpurpose>
+ <refpurpose>Reports information relating to usag of air codes on
regions.</refpurpose>
</refnamediv>
<!-- body begins here -->
@@ -16,36 +16,93 @@
<refsynopsisdiv xml:id="synopsis">
<cmdsynopsis sepchar=" ">
<command>whichair</command>
-
+ <arg choice="opt" rep="norepeat"><replaceable>options
...</replaceable></arg>
<arg choice="req" rep="norepeat"><replaceable>air_codes</replaceable></arg>
-
</cmdsynopsis>
</refsynopsisdiv>
<refsection xml:id="description"><title>DESCRIPTION</title>
- <para>Lists all the regions that use one of the air codes specified.
-The <command>eac</command> command will perform a similar search, but will
draw the qualifying regions
-in the MGED display rather than listing them. Regions that have nonzero ident
-numbers will not be listed by this command.
+<para>
- </para>
+ Reports information about the usage of the <emphasis>air_codes</emphasis>
property
+ by regions in a .g file. Its default mode is to report which regions in a
.g file
+ are using one or a range of region_id values. If a root object is
specified, it
+ will report that result only for the regions in the tree of the root object.
+
+ If the <option>U</option> is specified, the reporting is inverted and the
command
+ will report the ranges of <emphasis>unused</emphasis> aircodes rather than
the regions
+ using various aircodes.
+</para>
+<para>
+ The <command>eac</command> command will perform a similar search, but will
draw
+ the qualifying regions in the MGED display rather than listing them.
+</para>
</refsection>
+<refsection xml:id="search_options"><title>OPTIONS</title>
+
+<variablelist remap="TP">
+ <varlistentry>
+ <term><emphasis remap="B" role="bold">-U</emphasis></term>
+ <listitem>
+ <para>
+ Report unused aircode ranges.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><emphasis remap="B" role="bold">--root objname</emphasis></term>
+ <listitem>
+ <para>
+ Limit reporting to regions in the CSG tree below
<emphasis>objname</emphasis>.
+ </para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+
+</refsection>
+
<refsection xml:id="examples"><title>EXAMPLES</title>
- <para>The example shows the use of the <command>whichair</command> command
to list all the regions that use one of the air codes specified.
+<para>
+ For these examples the geometry file used is the standard
<emphasis>m35.g</emphasis>
+ included with BRL-CAD.
+</para>
+
+<example>
+ <title>Report all regions using air codes between 7 and 10.</title>
+ <para>
+ <prompt>mged></prompt><userinput>whichair 7-10</userinput>
+ <literallayout class="normal">
+Region[s] with air code 7:
+ r11
+ r13
+ r15
+Region[s] with air code 8:
+ r25
+ r27
+ r29
+ r31
+ r33
+ r35
+ </literallayout>
</para>
+</example>
- <example><title>List all regions that use the specified air codes.</title>
+<example>
+ <title>Report all unused aircode ranges in the database between 1 and
10.</title>
+ <para>
+ <prompt>mged></prompt><userinput>whichair -U 1-10</userinput>
+ <literallayout class="normal">
+Unused air codes:
+ 1-3
+ 5
+ 9-10
+ </literallayout>
+ </para>
+</example>
- <para>
- <prompt>mged></prompt><userinput>whichair 2 3</userinput>
- </para>
- <para>Lists all regions in the current database that have <emphasis>air
codes</emphasis> of 2 or 3.
- </para>
- </example>
-
</refsection>
<refsection xml:id="author"><title>AUTHOR</title><para>BRL-CAD
Team</para></refsection>
Index: brlcad/branches/RELEASE/include
===================================================================
--- brlcad/branches/RELEASE/include 2020-09-13 17:24:05 UTC (rev 77132)
+++ brlcad/branches/RELEASE/include 2020-09-13 17:25:19 UTC (rev 77133)
Property changes on: brlcad/branches/RELEASE/include
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl/include:65867-66137
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
-/brlcad/trunk/include:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76726,76729-76730,76748-76764,76771-76858,76862-76962,76994-77065,77067-77077
\ No newline at end of property
+/brlcad/trunk/include:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76726,76729-76730,76748-76764,76771-76858,76862-77131
\ No newline at end of property
Modified: brlcad/branches/RELEASE/include/icv/io.h
===================================================================
--- brlcad/branches/RELEASE/include/icv/io.h 2020-09-13 17:24:05 UTC (rev
77132)
+++ brlcad/branches/RELEASE/include/icv/io.h 2020-09-13 17:25:19 UTC (rev
77133)
@@ -66,9 +66,14 @@
* dimensions of an image, when the image doesn't supply such
* information.
*
- * @param[in] name String identifying a particular size (pass NULL if
not using)
+ * Standard image sizes may be hinted using the label parameter. Many
+ * standard print and display sizes (e.g., "A4" and "SVGA") are
+ * recognized and used in concert with the dpi and data_size
+ * parameters.
+ *
+ * @param[in] label String hinting at a size (pass NULL if not using)
* @param[in] dpi Dots per inch of image (pass 0 if not using)
- * @param[in] file_size File or in-memory size of image (necessary if
deducing an unspecified image size)
+ * @param[in] data_size Number of uncompressed image bytes (necessary if
deducing an unspecified image size)
* @param[in] type Image type (necessary if deducing an unspecified
image size)
*
* @param[out] widthp Pointer to variable that will hold image width
@@ -78,7 +83,7 @@
* Returns 1 if an image size was identified, zero otherwise.
*
*/
-ICV_EXPORT extern int icv_image_size(const char *name, size_t dpi, size_t
file_size, bu_mime_image_t type, size_t *widthp, size_t *heightp);
+ICV_EXPORT extern int icv_image_size(const char *label, size_t dpi, size_t
data_size, bu_mime_image_t type, size_t *widthp, size_t *heightp);
/**
* Load a file into an ICV struct. For most formats, this will be
Modified: brlcad/branches/RELEASE/misc/CMake/NSIS.template.in
===================================================================
--- brlcad/branches/RELEASE/misc/CMake/NSIS.template.in 2020-09-13 17:24:05 UTC
(rev 77132)
+++ brlcad/branches/RELEASE/misc/CMake/NSIS.template.in 2020-09-13 17:25:19 UTC
(rev 77133)
@@ -654,7 +654,7 @@
!include LogicLib.nsh
; Create desktop icons
Function installdesktopicons
-SetOutPath $INSTDIR
+SetOutPath $PROFILE
CreateShortCut "$DESKTOP\Archer.lnk" "$INSTDIR\bin\archer.exe" ""
"$INSTDIR\@CPACK_DATA_DIR@\icons\archer.ico" 0
CreateShortCut "$DESKTOP\MGED.lnk" "$INSTDIR\bin\mged.exe" ""
"$INSTDIR\@CPACK_DATA_DIR@\icons\brlcad.ico" 0
CreateShortCut "$DESKTOP\RtWizard.lnk" "$INSTDIR\bin\rtwizard.exe" ""
"$INSTDIR\@CPACK_DATA_DIR@\icons\brlcad.ico" 0
@@ -716,6 +716,7 @@
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+ SetOutPath $PROFILE
@CPACK_NSIS_CREATE_ICONS@
@CPACK_NSIS_CREATE_ICONS_EXTRA@
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Archer.lnk"
"$INSTDIR\bin\archer.exe" "" "$INSTDIR\@CPACK_DATA_DIR@\icons\archer.ico" 0
Modified: brlcad/branches/RELEASE/misc/CMake/NSIS_silent.template.in
===================================================================
--- brlcad/branches/RELEASE/misc/CMake/NSIS_silent.template.in 2020-09-13
17:24:05 UTC (rev 77132)
+++ brlcad/branches/RELEASE/misc/CMake/NSIS_silent.template.in 2020-09-13
17:25:19 UTC (rev 77133)
@@ -665,7 +665,7 @@
!include LogicLib.nsh
; Create desktop icons
Function installdesktopicons
-SetOutPath $INSTDIR
+SetOutPath $PROFILE
CreateShortCut "$DESKTOP\Archer.lnk" "$INSTDIR\bin\archer.exe" ""
"$INSTDIR\@CPACK_DATA_DIR@\icons\archer.ico" 0
CreateShortCut "$DESKTOP\MGED.lnk" "$INSTDIR\bin\mged.exe" ""
"$INSTDIR\@CPACK_DATA_DIR@\icons\brlcad.ico" 0
CreateShortCut "$DESKTOP\RtWizard.lnk" "$INSTDIR\bin\rtwizard.exe" ""
"$INSTDIR\@CPACK_DATA_DIR@\icons\brlcad.ico" 0
@@ -727,6 +727,7 @@
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+ SetOutPath $PROFILE
@CPACK_NSIS_CREATE_ICONS@
@CPACK_NSIS_CREATE_ICONS_EXTRA@
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Archer.lnk"
"$INSTDIR\bin\archer.exe" "" "$INSTDIR\@CPACK_DATA_DIR@\icons\archer.ico" 0
Modified: brlcad/branches/RELEASE/src/libdm/tests/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libdm/tests/CMakeLists.txt 2020-09-13
17:24:05 UTC (rev 77132)
+++ brlcad/branches/RELEASE/src/libdm/tests/CMakeLists.txt 2020-09-13
17:25:19 UTC (rev 77133)
@@ -42,13 +42,16 @@
${TCL_INCLUDE_PATH}
${TK_INCLUDE_PATH}
)
+
BRLCAD_ADDEXEC(tcl_img tcl_img.cpp
"libdm;libbu;${TCL_LIBRARY};${TK_LIBRARY}" TEST_USEDATA)
BRLCAD_ADDEXEC(tcl_tevent tcl_tevent.cpp
"libdm;libbu;${TCL_LIBRARY};${TK_LIBRARY}" TEST_USEDATA)
endif (BRLCAD_ENABLE_TK)
CMAKEFILES(CMakeLists.txt)
-CMAKEFILES(tcl_img.cpp)
-CMAKEFILES(tcl_tevent.cpp)
+CMAKEFILES(
+ tcl_img.cpp
+ tcl_tevent.cpp
+ )
# Local Variables:
# tab-width: 8
@@ -57,3 +60,4 @@
# End:
# ex: shiftwidth=2 tabstop=8
+
Modified: brlcad/branches/RELEASE/src/librt/db5_scan.c
===================================================================
--- brlcad/branches/RELEASE/src/librt/db5_scan.c 2020-09-13 17:24:05 UTC
(rev 77132)
+++ brlcad/branches/RELEASE/src/librt/db5_scan.c 2020-09-13 17:25:19 UTC
(rev 77133)
@@ -234,6 +234,10 @@
}
+/**
+ * Add a raw internal to the database. If client_data is 1, the entry
+ * will be marked as in-mem.
+ */
struct directory *
db5_diradd(struct db_i *dbip,
const struct db5_raw_internal *rip,
@@ -313,8 +317,10 @@
}
-/*
- * In support of db5_scan, add a named entry to the directory.
+/**
+ * In support of db5_scan(), this helper function adds a named entry
+ * to the directory. If client_data is 1, it entry will be added as
+ * in-mem database object.
*/
HIDDEN void
db5_diradd_handler(
@@ -321,7 +327,7 @@
struct db_i *dbip,
const struct db5_raw_internal *rip,
b_off_t laddr,
- void *client_data) /* unused client_data from db5_scan() */
+ void *client_data)
{
RT_CK_DBI(dbip);
Modified: brlcad/branches/RELEASE/src/librt/db_lookup.c
===================================================================
--- brlcad/branches/RELEASE/src/librt/db_lookup.c 2020-09-13 17:24:05 UTC
(rev 77132)
+++ brlcad/branches/RELEASE/src/librt/db_lookup.c 2020-09-13 17:25:19 UTC
(rev 77133)
@@ -281,6 +281,10 @@
RT_CK_DIR(dp);
RT_DIR_SET_NAMEP(dp, bu_vls_addr(&local)); /* sets d_namep */
dp->d_addr = laddr;
+
+ /* TODO: investigate removing exclusion of INMEM flag, added by
+ * mike in c13285 when in-mem support was originally added
+ */
dp->d_flags = flags & ~(RT_DIR_INMEM);
dp->d_len = len;
dp->d_forw = *headp;
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
