Revision: 77144
http://sourceforge.net/p/brlcad/code/77144
Author: starseeker
Date: 2020-09-14 09:46:29 +0000 (Mon, 14 Sep 2020)
Log Message:
-----------
Merge from trunk - r77133 through r77143
Modified Paths:
--------------
brlcad/branches/RELEASE/NEWS
brlcad/branches/RELEASE/TODO
brlcad/branches/RELEASE/doc/docbook/system/mann/search.xml
brlcad/branches/RELEASE/include/brep/defines.h
brlcad/branches/RELEASE/src/libgcv/plugins/rhino/rhino_read.cpp
brlcad/branches/RELEASE/src/libged/make/make.c
brlcad/branches/RELEASE/src/librt/primitives/brep/brep.cpp
brlcad/branches/RELEASE/src/other/openNURBS/example_read/example_read.cpp
brlcad/branches/RELEASE/src/other/openNURBS/example_roundtrip/example_roundtrip.cpp
brlcad/branches/RELEASE/src/other/openNURBS/example_write/example_write.cpp
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_archive.cpp
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_archive.h
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_defines.cpp
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_defines.h
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.cpp
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.h
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_string.cpp
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_userdata.cpp
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_zlib.cpp
Property Changed:
----------------
brlcad/branches/RELEASE/
brlcad/branches/RELEASE/NEWS
brlcad/branches/RELEASE/doc/
brlcad/branches/RELEASE/include/
brlcad/branches/RELEASE/src/libbu/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE 2020-09-14 09:46:29 UTC (rev 77144)
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-77132
\ 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-77143
\ No newline at end of property
Modified: brlcad/branches/RELEASE/NEWS
===================================================================
--- brlcad/branches/RELEASE/NEWS 2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/NEWS 2020-09-14 09:46:29 UTC (rev 77144)
@@ -13,6 +13,15 @@
--- 2020-08-XX Release 7.32.X ---
----------------------------------------------------------------------
+This major release of BRL-CAD introduces significant updates to core
+library infrastructure. The update includes restructuring of nearly
+all of BRL-CAD's display infrastructure in preparation for upcoming
+significant GUI changes. This release also fixes over fifty of
+BRL-CAD's command-line utilities so they work properly to Windows.
+This is likely the last major release of BRL-CAD on Subversion
+inrastructure with BRL-CAD's imminent migration to Git.
+
+* added basic example to remrt man page - Cliff Yapp, Sean Morrison
* 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
@@ -40,6 +49,7 @@
* improved gdiff -F filtering option behavior - Cliff Yapp
* improved gdiff command verbosity reporting options - Cliff Yapp
* improved Combination Editor button behaviors in MGED - Sean Morrison
+* added 'asc' geometry import and export support to gcv - Cliff Yapp
* 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
@@ -54,7 +64,8 @@
* added MGED 'dm type' subcommand for reporting DM type - Cliff Yapp
* improved vdeck input support for Windows text files - Sean Morrison
* fixed MGED 'plot' & 'brep plot' commands on Windows - Sean Morrison
-* fixed numerous image utilities on Windows - Sean Morrison
+* fixed numerous image utilities reading binary input files on Windows
+ - Sean Morrison, 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,76963-77131
\ 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,77133-77143
\ No newline at end of property
Modified: brlcad/branches/RELEASE/TODO
===================================================================
--- brlcad/branches/RELEASE/TODO 2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/TODO 2020-09-14 09:46:29 UTC (rev 77144)
@@ -2514,6 +2514,7 @@
dsel
dstats
dwin
+ gcv
ihist
imod
isst
Index: brlcad/branches/RELEASE/doc
===================================================================
--- brlcad/branches/RELEASE/doc 2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/doc 2020-09-14 09:46:29 UTC (rev 77144)
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,76963-77131
\ No newline at end of property
+/brlcad/trunk/doc:76645-76726,76795-76858,76862-76954,76963-77131,77133-77143
\ No newline at end of property
Modified: brlcad/branches/RELEASE/doc/docbook/system/mann/search.xml
===================================================================
--- brlcad/branches/RELEASE/doc/docbook/system/mann/search.xml 2020-09-14
08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/doc/docbook/system/mann/search.xml 2020-09-14
09:46:29 UTC (rev 77144)
@@ -51,7 +51,27 @@
<emphasis remap="I">before</emphasis> the paths and are used to control
settings
that apply globally to <command>search</command>'s behavior and
reporting during
the execution of the search.
+ </para>
+ <para>
+ The results of the search command will be sorted according to David
Koelle's
+ "alphanum" algorithm, which is basically a human-intuitive ordering for
+ strings with letters and numbers. For example, a result returning d1.r,
d10.r and d2.r
+ will be sorted as:
+
+ <literallayout>
+d1.r
+d2.r
+d10.r
+ </literallayout>
+
+ instead of the default ASCII character ordering, which would look like:
+
+ <literallayout>
+d1.r
+d10.r
+d2.r
+ </literallayout>
</para>
</refsection>
Index: brlcad/branches/RELEASE/include
===================================================================
--- brlcad/branches/RELEASE/include 2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/include 2020-09-14 09:46:29 UTC (rev 77144)
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-77131
\ 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,77133-77143
\ No newline at end of property
Modified: brlcad/branches/RELEASE/include/brep/defines.h
===================================================================
--- brlcad/branches/RELEASE/include/brep/defines.h 2020-09-14 08:45:52 UTC
(rev 77143)
+++ brlcad/branches/RELEASE/include/brep/defines.h 2020-09-14 09:46:29 UTC
(rev 77144)
@@ -43,15 +43,7 @@
/* don't let opennurbs include windows.h */
#define ON_NO_WINDOWS 1
-/* NOTE: we re-define read/write due to the archive_mode enum that
- * shadows the system symbols. we undefine when done to not interfere
- * with app code.
- */
-#define read on_read
-#define write on_write
#include "opennurbs.h"
-#undef read
-#undef write
}
/* @endcond */
Index: brlcad/branches/RELEASE/src/libbu
===================================================================
--- brlcad/branches/RELEASE/src/libbu 2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/libbu 2020-09-14 09:46:29 UTC (rev 77144)
Property changes on: brlcad/branches/RELEASE/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
/brlcad/branches/bioh/src/libbu:75720-75728
-/brlcad/trunk/src/libbu:72518-74373,74376-75207,75729,76645-76726,76771-76788,76795-76858,76862-76954,77032-77065
\ No newline at end of property
+/brlcad/trunk/src/libbu:72518-74373,74376-75207,75729,76645-76726,76771-76788,76795-76858,76862-76954,77032-77065,77133-77143
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/libgcv/plugins/rhino/rhino_read.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libgcv/plugins/rhino/rhino_read.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/libgcv/plugins/rhino/rhino_read.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -972,7 +972,7 @@
if (!source_path) return 0;
FILE *fp = ON::OpenFile(source_path,"rb");
if (!fp) return 0;
- ON_BinaryFile file(ON::read3dm,fp);
+ ON_BinaryFile file(ON::on_read3dm,fp);
if (!file.Read3dmStartSection(&fv, mSC)) return 0;
if (!file.Read3dmProperties(mprop)) return 0;
return 1;
Modified: brlcad/branches/RELEASE/src/libged/make/make.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/make/make.c 2020-09-14 08:45:52 UTC
(rev 77143)
+++ brlcad/branches/RELEASE/src/libged/make/make.c 2020-09-14 09:46:29 UTC
(rev 77144)
@@ -73,6 +73,7 @@
struct rt_pnts_internal *pnts_ip;
struct rt_cline_internal *cline_ip;
+ /* intentionally not included: cline */
static const char *usage = "-h | -t | -o origin -s sf name
<arb8|arb7|arb6|arb5|arb4|arbn|ars|bot|datum|ehy|ell|ell1|epa|eto|extrude|grip|half|hyp|nmg|part|pipe|pnts|rcc|rec|rhc|rpc|rpp|sketch|sph|tec|tgc|tor|trc>";
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
@@ -114,6 +115,7 @@
case 't':
case 'T':
if (argc == 2) {
+ /* intentionally not included: cline */
bu_vls_printf(gedp->ged_result_str, "arb8 arb7 arb6 arb5
arb4 arbn ars bot datum ehy ell ell1 epa eto extrude grip half hyp nmg part
pipe pnts rcc rec rhc rpc rpp sketch sph tec tgc tor trc superell metaball");
return GED_HELP;
}
Modified: brlcad/branches/RELEASE/src/librt/primitives/brep/brep.cpp
===================================================================
--- brlcad/branches/RELEASE/src/librt/primitives/brep/brep.cpp 2020-09-14
08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/librt/primitives/brep/brep.cpp 2020-09-14
09:46:29 UTC (rev 77144)
@@ -2140,13 +2140,13 @@
RT_MemoryArchive::RT_MemoryArchive()
- : ON_BinaryArchive(ON::write3dm), pos(0), m_buffer()
+ : ON_BinaryArchive(ON::on_write3dm), pos(0), m_buffer()
{
}
RT_MemoryArchive::RT_MemoryArchive(const void *memory, size_t len)
- : ON_BinaryArchive(ON::read3dm), pos(0),
+ : ON_BinaryArchive(ON::on_read3dm), pos(0),
m_buffer((char *)memory, (char *)memory + len)
{
}
Modified:
brlcad/branches/RELEASE/src/other/openNURBS/example_read/example_read.cpp
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/example_read/example_read.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/example_read/example_read.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -42,7 +42,7 @@
return false;
}
- ON_BinaryFile file( ON::read3dm, fp );
+ ON_BinaryFile file( ON::on_read3dm, fp );
int version = 0;
ON_String comment_block;
@@ -101,7 +101,7 @@
dump.PushIndent();
// create achive object from file pointer
- ON_BinaryFile archive( ON::read3dm, archive_fp );
+ ON_BinaryFile archive( ON::on_read3dm, archive_fp );
// read the contents of the file into "model"
bool rc = model.Read( archive, &dump );
Modified:
brlcad/branches/RELEASE/src/other/openNURBS/example_roundtrip/example_roundtrip.cpp
===================================================================
---
brlcad/branches/RELEASE/src/other/openNURBS/example_roundtrip/example_roundtrip.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++
brlcad/branches/RELEASE/src/other/openNURBS/example_roundtrip/example_roundtrip.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -66,7 +66,7 @@
dump->PushIndent();
// create achive object from file pointer
- ON_BinaryFile archive( ON::read3dm, archive_fp );
+ ON_BinaryFile archive( ON::on_read3dm, archive_fp );
// read the contents of the file into "model"
bool rc = model.Read( archive, dump );
Modified:
brlcad/branches/RELEASE/src/other/openNURBS/example_write/example_write.cpp
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/example_write/example_write.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/example_write/example_write.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -131,7 +131,7 @@
}
// archive to write to
- ON_BinaryFile archive( ON::write3dm, fp );
+ ON_BinaryFile archive( ON::on_write3dm, fp );
// Set uuid's, indices, etc.
model.Polish();
@@ -254,7 +254,7 @@
mo.m_attributes.m_name = "last point";
}
- ON_BinaryFile archive( ON::write3dm, fp ); // fp = pointer from
fopoen(...,"wb")
+ ON_BinaryFile archive( ON::on_write3dm, fp ); // fp = pointer from
fopoen(...,"wb")
// start section comment
const char* sStartSectionComment = __FILE__ "write_points_example()"
__DATE__;
@@ -394,7 +394,7 @@
// start section comments
const char* sStartSectionComment = __FILE__ "write_curves_example()"
__DATE__;
- ON_BinaryFile archive( ON::write3dm, fp ); // fp = pointer from
fopoen(...,"wb")
+ ON_BinaryFile archive( ON::on_write3dm, fp ); // fp = pointer from
fopoen(...,"wb")
// Set uuid's, indices, etc.
model.Polish();
@@ -471,7 +471,7 @@
bool ok = false;
if ( nurbs_surface.IsValid() )
{
- ON_BinaryFile archive( ON::write3dm, fp );
+ ON_BinaryFile archive( ON::on_write3dm, fp );
ok = ON_WriteOneObjectArchive( archive, version, nurbs_surface );
}
@@ -569,7 +569,7 @@
// them by averaging face normals.
if ( !mesh.HasVertexNormals() )
mesh.ComputeVertexNormals();
- ON_BinaryFile archive( ON::write3dm, fp );
+ ON_BinaryFile archive( ON::on_write3dm, fp );
ok = ON_WriteOneObjectArchive( archive, version, mesh );
}
@@ -1166,7 +1166,7 @@
bool ok = false;
if ( brep.IsValid( &error_log ) )
{
- ON_BinaryFile archive(ON::write3dm,fp);
+ ON_BinaryFile archive(ON::on_write3dm,fp);
ok = ON_WriteOneObjectArchive( archive, version, brep );
}
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_archive.cpp
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_archive.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_archive.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -581,13 +581,13 @@
bool
ON_BinaryArchive::ReadMode() const
{
- return (m_mode & ON::read) ? true : false;
+ return (m_mode & ON::on_read) ? true : false;
}
bool
ON_BinaryArchive::WriteMode() const
{
- return (m_mode & ON::write) ? true : false;
+ return (m_mode & ON::on_write) ? true : false;
}
bool
@@ -7659,7 +7659,7 @@
int layer_index = -1;
- if ( ON::read3dm == m_mode
+ if ( ON::on_read3dm == m_mode
&& 0 == m_3dm_opennurbs_version
&& 1 == m_3dm_version
&& 0 != m_V1_layer_list
@@ -7784,7 +7784,7 @@
}
else if (rc && layer)
{
- if ( ON::read3dm == m_mode
+ if ( ON::on_read3dm == m_mode
&& 0 == m_3dm_opennurbs_version
&& 1 == m_3dm_version
)
@@ -13128,7 +13128,7 @@
&& 0 == m_3dm_start_section_offset
&& ON_BinaryArchive::no_active_table == m_active_table
&& 0 == m_chunk
- && ON::read3dm == m_mode
+ && ON::on_read3dm == m_mode
)
{
// In Read3dmStartSection(), we search for the string
@@ -14719,7 +14719,7 @@
int archive_3dm_version,
int archive_opennurbs_version
)
-: ON_BinaryArchive(ON::read3dm)
+: ON_BinaryArchive(ON::on_read3dm)
, m_p(0)
, m_buffer(0)
, m_sizeof_buffer(0)
@@ -14854,7 +14854,7 @@
int archive_3dm_version,
int archive_opennurbs_version
)
-: ON_BinaryArchive(ON::write3dm)
+: ON_BinaryArchive(ON::on_write3dm)
, m_p(0)
, m_buffer(0)
, m_sizeof_buffer(0)
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_archive.h
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_archive.h
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_archive.h
2020-09-14 09:46:29 UTC (rev 77144)
@@ -2680,7 +2680,7 @@
// compressed buffer I/O uses zlib 1.1.3 inflate()/deflate()
struct
{
- ON::archive_mode mode; // ON::read = read and inflate, ON::write =
deflate and write
+ ON::archive_mode mode; // ON::on_read = read and inflate, ON::on_write =
deflate and write
enum
{
sizeof_x_buffer = 16384
@@ -3065,7 +3065,7 @@
const char* filename = "myfile.3dm";
FILE* fp = ON::OpenFile( filename, "wb" );
- ON_BinaryFile file( fp, ON::write3dm );
+ ON_BinaryFile file( fp, ON::on_write3dm );
ON_BOOL32 ok = ON_WriteArchive( archive, geometry );
ON::CloseFile( fp );
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_defines.cpp
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_defines.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_defines.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -1694,13 +1694,13 @@
ON::archive_mode ON::ArchiveMode(int i)
{
// convert integer to endian enum
- archive_mode a = read;
+ archive_mode a = on_read;
switch(i) {
- case read: a = read; break;
- case write: a = write; break;
- case readwrite: a = readwrite; break;
- case read3dm: a = read3dm; break;
- case write3dm: a = write3dm; break;
+ case on_read: a = on_read; break;
+ case on_write: a = on_write; break;
+ case on_readwrite: a = on_readwrite; break;
+ case on_read3dm: a = on_read3dm; break;
+ case on_write3dm: a = on_write3dm; break;
}
return a;
}
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_defines.h
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_defines.h
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_defines.h
2020-09-14 09:46:29 UTC (rev 77144)
@@ -815,11 +815,11 @@
enum archive_mode
{
unknown_archive_mode = 0,
- read = 1, // all read modes have bit 0x0001 set
- write = 2, // all write modes have bit 0x0002 set
- readwrite = 3,
- read3dm = 5,
- write3dm = 6
+ on_read = 1, // all read modes have bit 0x0001 set
+ on_write = 2, // all write modes have bit 0x0002 set
+ on_readwrite = 3,
+ on_read3dm = 5,
+ on_write3dm = 6
};
static archive_mode ArchiveMode(int); // convert integer to endian enum
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.cpp
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -2130,7 +2130,7 @@
FILE* fp = ON::OpenFile(filename,"rb");
if ( 0 != fp )
{
- ON_BinaryFile file(ON::read3dm,fp);
+ ON_BinaryFile file(ON::on_read3dm,fp);
rc = Read(file,error_log);
ON::CloseFile(fp);
}
@@ -2150,7 +2150,7 @@
FILE* fp = ON::OpenFile(filename,L"rb");
if ( 0 != fp )
{
- ON_BinaryFile file(ON::read3dm,fp);
+ ON_BinaryFile file(ON::on_read3dm,fp);
rc = Read(file,error_log);
ON::CloseFile(fp);
}
@@ -3001,7 +3001,7 @@
FILE* fp = ON::OpenFile( filename, "wb" );
if ( 0 != fp )
{
- ON_BinaryFile file( ON::write3dm, fp );
+ ON_BinaryFile file( ON::on_write3dm, fp );
ONX_Model_WriteHelper(file);
rc = Write( file, version, sStartSectionComment, error_log );
ON::CloseFile(fp);
@@ -3023,7 +3023,7 @@
FILE* fp = ON::OpenFile( filename, L"wb" );
if ( 0 != fp )
{
- ON_BinaryFile file( ON::write3dm, fp );
+ ON_BinaryFile file( ON::on_write3dm, fp );
ONX_Model_WriteHelper(file);
rc = Write( file, version, sStartSectionComment, error_log );
ON::CloseFile(fp);
@@ -3066,9 +3066,9 @@
if ( !archive.WriteMode() )
{
- // You passed in a bogus archive. You must pass ON::write3dm to the
+ // You passed in a bogus archive. You must pass ON::on_write3dm to the
// archive constructor.
- if ( error_log) error_log->Print("ONX_Model::Write archive.Mode() is not
ON::write3dm.\n"
+ if ( error_log) error_log->Print("ONX_Model::Write archive.Mode() is not
ON::on_write3dm.\n"
"See ONX_Model::Write example in the header file.\n");
return false;
}
@@ -3079,10 +3079,10 @@
ok = archive.Write3dmStartSection( version, m_sStartSectionComments );
if ( !ok )
{
- // make sure your archive was created with ON::write3dm mode.
+ // make sure your archive was created with ON::on_write3dm mode.
if ( error_log) error_log->Print("ONX_Model::Write
archive.Write3dmStartSection() failed.\n"
"Your archive is not properly initialized\n"
- "(make sure you passed ON::write3dm to the constructor),\n"
+ "(make sure you passed ON::on_write3dm to the
constructor),\n"
"a file is locked, a disk is locked, or something along
those lines.\n");
return false;
}
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.h
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.h
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.h
2020-09-14 09:46:29 UTC (rev 77144)
@@ -237,7 +237,7 @@
if ( 0 != fp )
{
- ON_BinaryFile archive( ON::read3dm, fp );
+ ON_BinaryFile archive( ON::on_read3dm, fp );
bModelRead = model.read( archive, error_log );
ON::CloseFile( fp );
}
@@ -334,7 +334,7 @@
{
const char* sStartSectionComment = "...";
int version = 5; // 2, 3, 4 or 5 are valid
- ON_BinaryFile archive( ON::write3dm, fp );
+ ON_BinaryFile archive( ON::on_write3dm, fp );
ok = model.write( archive,
version,
sStartSectionComment,
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_string.cpp
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_string.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_string.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -1525,7 +1525,7 @@
int version = 0;
if ( 0 != fp )
{
- ON_BinaryFile archive(ON::read3dm,fp);
+ ON_BinaryFile archive(ON::on_read3dm,fp);
if ( !archive.Read3dmStartSection(&version,sStartSectionComment) )
version = 0;
}
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_userdata.cpp
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_userdata.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_userdata.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -394,7 +394,7 @@
size_t m_buffer_position;
};
-ON_UnknownUserDataArchive::ON_UnknownUserDataArchive( const
ON_UnknownUserData& ud ) : ON_BinaryArchive( ON::read3dm )
+ON_UnknownUserDataArchive::ON_UnknownUserDataArchive( const
ON_UnknownUserData& ud ) : ON_BinaryArchive( ON::on_read3dm )
{
SetArchive3dmVersion(ud.m_3dm_version);
m_sizeof_buffer = ud.m_sizeof_buffer;
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_zlib.cpp
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_zlib.cpp
2020-09-14 08:45:52 UTC (rev 77143)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_zlib.cpp
2020-09-14 09:46:29 UTC (rev 77144)
@@ -525,11 +525,11 @@
// inflateInit() and deflateInit() are in zlib 1.3.3
bool rc = false;
if ( WriteMode() ) {
- rc = ( m_zlib.mode == ON::write ) ? true : false;
+ rc = ( m_zlib.mode == ON::on_write ) ? true : false;
if ( !rc ) {
CompressionEnd();
if ( Z_OK == deflateInit( &m_zlib.strm, Z_BEST_COMPRESSION ) ) {
- m_zlib.mode = ON::write;
+ m_zlib.mode = ON::on_write;
rc = true;
}
else {
@@ -538,11 +538,11 @@
}
}
else if ( ReadMode() ) {
- rc = ( m_zlib.mode == ON::read ) ? true : false;
+ rc = ( m_zlib.mode == ON::on_read ) ? true : false;
if ( !rc ) {
CompressionEnd();
if ( Z_OK == inflateInit( &m_zlib.strm ) ) {
- m_zlib.mode = ON::read;
+ m_zlib.mode = ON::on_read;
rc = true;
}
else {
@@ -560,12 +560,12 @@
{
// inflateEnd() and deflateEnd() are in zlib 1.3.3
switch ( m_zlib.mode ) {
- case ON::read:
- case ON::read3dm:
+ case ON::on_read:
+ case ON::on_read3dm:
inflateEnd(&m_zlib.strm);
break;
- case ON::write:
- case ON::write3dm:
+ case ON::on_write:
+ case ON::on_write3dm:
deflateEnd(&m_zlib.strm);
break;
default: // to quiet lint
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
