Revision: 76732
http://sourceforge.net/p/brlcad/code/76732
Author: starseeker
Date: 2020-08-13 14:11:02 +0000 (Thu, 13 Aug 2020)
Log Message:
-----------
Merge r76729 through r76730 from trunk
Modified Paths:
--------------
brlcad/branches/RELEASE/src/gtools/gdiff/gdiff.c
brlcad/branches/RELEASE/src/librt/db_diff.c
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-08-13 14:10:48 UTC (rev 76731)
+++ brlcad/branches/RELEASE 2020-08-13 14:11:02 UTC (rev 76732)
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-76644,76655
\ 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-76644,76655,76729-76730
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/gtools/gdiff/gdiff.c
===================================================================
--- brlcad/branches/RELEASE/src/gtools/gdiff/gdiff.c 2020-08-13 14:10:48 UTC
(rev 76731)
+++ brlcad/branches/RELEASE/src/gtools/gdiff/gdiff.c 2020-08-13 14:11:02 UTC
(rev 76732)
@@ -55,9 +55,17 @@
BU_PTBL_INIT(&results_filtered);
for (i = 0; i < (int)BU_PTBL_LEN(&results); i++) {
struct diff_result *dr = (struct diff_result
*)BU_PTBL_GET(&results, i);
+ // Default to pass - if an object doesn't exist on one side, we
want to pass/fail
+ // based on the object we have.
+ int lpass = 1;
+ int rpass = 1;
// If both sides pass the filters, it's in - otherwise it's out
- int lpass = (dr->dp_left != RT_DIR_NULL &&
(bu_ptbl_locate(&left_dbip_filtered, (long *)dr->dp_left ) != -1));
- int rpass = (dr->dp_right != RT_DIR_NULL &&
(bu_ptbl_locate(&right_dbip_filtered, (long *)dr->dp_right) != -1));
+ if (dr->dp_left != RT_DIR_NULL) {
+ lpass = (bu_ptbl_locate(&left_dbip_filtered, (long
*)dr->dp_left ) != -1);
+ }
+ if (dr->dp_right != RT_DIR_NULL) {
+ rpass = (bu_ptbl_locate(&right_dbip_filtered, (long
*)dr->dp_right) != -1);
+ }
if (lpass && rpass) {
bu_ptbl_ins(&results_filtered, (long *)dr);
filtered_diff_state |= dr->param_state;
Modified: brlcad/branches/RELEASE/src/librt/db_diff.c
===================================================================
--- brlcad/branches/RELEASE/src/librt/db_diff.c 2020-08-13 14:10:48 UTC (rev
76731)
+++ brlcad/branches/RELEASE/src/librt/db_diff.c 2020-08-13 14:11:02 UTC (rev
76732)
@@ -544,8 +544,7 @@
state |= db_diff_dp(dbip1, dbip2, dp1, dp2, diff_tol,
DB_COMPARE_ATTRS, result);
}
if (flags == DB_COMPARE_ALL && state == DIFF_UNCHANGED && extern_state
== DIFF_CHANGED) {
- bu_log("WARNING: internal and bu_external comparison disagree for
%s and %s\n", dp1->d_namep, dp2->d_namep);
-
+ //bu_log("WARNING: internal and bu_external comparison disagree for
%s and %s\n", dp1->d_namep, dp2->d_namep);
}
if (results) {
@@ -919,7 +918,7 @@
ancestor_state |= db_diff3_dp(dbip_left, dbip_ancestor, dbip_right,
dp_left, dp_ancestor, dp_right, diff3_tol, DB_COMPARE_ATTRS, result);
}
if (flags == DB_COMPARE_ALL && (ancestor_state == DIFF_UNCHANGED ||
ancestor_state == DIFF_EMPTY) && extern_state == DIFF_CHANGED) {
- bu_log("WARNING: internal and bu_external comparison disagree\n");
+ //bu_log("WARNING: internal and bu_external comparison disagree\n");
}
if (results) {
@@ -965,7 +964,7 @@
left_state |= db_diff3_dp(dbip_left, dbip_ancestor, dbip_right,
dp_left, NULL, dp_right, diff3_tol, DB_COMPARE_ATTRS, result);
}
if (flags == DB_COMPARE_ALL && (left_state == DIFF_UNCHANGED ||
left_state == DIFF_EMPTY) && extern_state == DIFF_CHANGED) {
- bu_log("WARNING: internal and bu_external comparison disagree");
+ //bu_log("WARNING: internal and bu_external comparison
disagree");
}
if (results) {
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
