Revision: 42455
http://brlcad.svn.sourceforge.net/brlcad/?rev=42455&view=rev
Author: brlcad
Date: 2011-01-19 16:51:51 +0000 (Wed, 19 Jan 2011)
Log Message:
-----------
more const dbi pointers that need to be undone, access direct (fine for librt)
Modified Paths:
--------------
brlcad/trunk/src/librt/db_io.c
brlcad/trunk/src/librt/dir.c
brlcad/trunk/src/librt/primitives/obj_export.c
brlcad/trunk/src/librt/primitives/obj_import.c
Modified: brlcad/trunk/src/librt/db_io.c
===================================================================
--- brlcad/trunk/src/librt/db_io.c 2011-01-19 16:36:54 UTC (rev 42454)
+++ brlcad/trunk/src/librt/db_io.c 2011-01-19 16:51:51 UTC (rev 42455)
@@ -116,7 +116,7 @@
RT_CK_DBI(dbip);
RT_CK_DIR(dp);
- if (db_version(dbip) > 4) {
+ if (dbip->dbi_version > 4) {
/* can't get an mrec on a v5 */
return (union record *)NULL;
}
@@ -320,7 +320,7 @@
return -1; /* was dummy DB entry */
BU_INIT_EXTERNAL(ep);
- if (db_version(dbip) < 5)
+ if (dbip->dbi_version < 5)
ep->ext_nbytes = dp->d_len * sizeof(union record);
else
ep->ext_nbytes = dp->d_len;
Modified: brlcad/trunk/src/librt/dir.c
===================================================================
--- brlcad/trunk/src/librt/dir.c 2011-01-19 16:36:54 UTC (rev 42454)
+++ brlcad/trunk/src/librt/dir.c 2011-01-19 16:51:51 UTC (rev 42455)
@@ -99,7 +99,7 @@
BU_INIT_EXTERNAL(&ext);
RT_INIT_DB_INTERNAL(ip);
- if ( db_version(dbip) > 4 )
+ if ( dbip->dbi_version > 4 )
return rt_db_get_internal5( ip, dp, dbip, mat, resp );
if ( db_get_external( &ext, dp, dbip ) < 0 )
Modified: brlcad/trunk/src/librt/primitives/obj_export.c
===================================================================
--- brlcad/trunk/src/librt/primitives/obj_export.c 2011-01-19 16:36:54 UTC
(rev 42454)
+++ brlcad/trunk/src/librt/primitives/obj_export.c 2011-01-19 16:51:51 UTC
(rev 42455)
@@ -47,7 +47,7 @@
if (!ft)
return -3;
- if (db_version(dbip) < 5) {
+ if (dbip->dbi_version < 5) {
export = ft->ft_export4;
} else {
export = ft->ft_export5;
Modified: brlcad/trunk/src/librt/primitives/obj_import.c
===================================================================
--- brlcad/trunk/src/librt/primitives/obj_import.c 2011-01-19 16:36:54 UTC
(rev 42454)
+++ brlcad/trunk/src/librt/primitives/obj_import.c 2011-01-19 16:51:51 UTC
(rev 42455)
@@ -47,7 +47,7 @@
if (!ft)
return -3;
- if (db_version(dbip) < 5) {
+ if (dbip->dbi_version < 5) {
import = ft->ft_import4;
} else {
import = ft->ft_import5;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
