Revision: 55221
          http://sourceforge.net/p/brlcad/code/55221
Author:   brlcad
Date:     2013-04-24 16:17:40 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
fixed the search command that was bombing if ran on a v4 database file.  needed 
to call rt_db_get_internal() instead of rt_db_get_internal5().

Modified Paths:
--------------
    brlcad/trunk/NEWS
    brlcad/trunk/src/librt/search.c

Modified: brlcad/trunk/NEWS
===================================================================
--- brlcad/trunk/NEWS   2013-04-24 16:05:48 UTC (rev 55220)
+++ brlcad/trunk/NEWS   2013-04-24 16:17:40 UTC (rev 55221)
@@ -13,6 +13,7 @@
 --- 2013-03-XX  Release 7.24.0                                     ---
 ----------------------------------------------------------------------
 
+* fixed search command bombing on v4 database file - Sean Morrison
 * fixed graphics window z-clipping bug in mged - Bob Parker
 * fixed mged lesson 15 toy truck 'inside' ordering bug - Sean Morrison
 * fixed uninstallable Linux RPM package on Fedora 18 - Jordi Sayol

Modified: brlcad/trunk/src/librt/search.c
===================================================================
--- brlcad/trunk/src/librt/search.c     2013-04-24 16:05:48 UTC (rev 55220)
+++ brlcad/trunk/src/librt/search.c     2013-04-24 16:17:40 UTC (rev 55221)
@@ -254,7 +254,7 @@
            struct rt_db_internal in;
            struct rt_comb_internal *comb;
 
-           if (rt_db_get_internal5(&in, dp, dbip, NULL, resp) < 0)
+           if (rt_db_get_internal(&in, dp, dbip, NULL, resp) < 0)
                return;
 
            comb = (struct rt_comb_internal *)in.idb_ptr;
@@ -530,7 +530,7 @@
            struct rt_db_internal in;
            struct rt_comb_internal *comb;
 
-           if (rt_db_get_internal5(&in, dp, dbip, NULL, resp) < 0)
+           if (rt_db_get_internal(&in, dp, dbip, NULL, resp) < 0)
                return 0;
 
            comb = (struct rt_comb_internal *)in.idb_ptr;
@@ -583,7 +583,7 @@
        return 0;
 
     if (dp->d_flags & RT_DIR_COMB) {
-       if (rt_db_get_internal5(&in, dp, dbip, NULL, wdbp->wdb_resp) < 0)
+       if (rt_db_get_internal(&in, dp, dbip, NULL, wdbp->wdb_resp) < 0)
            return 0;
 
        comb = (struct rt_comb_internal *)in.idb_ptr;
@@ -1388,7 +1388,7 @@
        return 0;
 
     if (dp->d_flags & RT_DIR_COMB) {
-       rt_db_get_internal5(&in, dp, dbip, (fastf_t *)NULL, &rt_uniresource);
+       rt_db_get_internal(&in, dp, dbip, (fastf_t *)NULL, &rt_uniresource);
        comb = (struct rt_comb_internal *)in.idb_ptr;
        if (comb->tree == NULL) {
            node_count = 0;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to