Revision: 77946
http://sourceforge.net/p/brlcad/code/77946
Author: starseeker
Date: 2020-12-07 23:29:45 +0000 (Mon, 07 Dec 2020)
Log Message:
-----------
Merge from trunk - r77934 through r77945
Modified Paths:
--------------
brlcad/branches/extbuild/include/brep/defines.h
brlcad/branches/extbuild/src/conv/step/step-g/OpenNurbsInterfaces.cpp
brlcad/branches/extbuild/src/libbg/spsr/MarchingCubes.cpp
brlcad/branches/extbuild/src/libbg/spsr/MultiGridOctreeData.IsoSurface.inl
brlcad/branches/extbuild/src/libbg/spsr/Octree.inl
brlcad/branches/extbuild/src/librt/primitives/arbn/arbn.c
Property Changed:
----------------
brlcad/branches/extbuild/
brlcad/branches/extbuild/include/
brlcad/branches/extbuild/src/other/
Index: brlcad/branches/extbuild
===================================================================
--- brlcad/branches/extbuild 2020-12-07 17:03:47 UTC (rev 77945)
+++ brlcad/branches/extbuild 2020-12-07 23:29:45 UTC (rev 77946)
Property changes on: brlcad/branches/extbuild
___________________________________________________________________
Modified: svn:mergeinfo
## -11,4 +11,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:77547-77933
\ No newline at end of property
+/brlcad/trunk:77547-77945
\ No newline at end of property
Index: brlcad/branches/extbuild/include
===================================================================
--- brlcad/branches/extbuild/include 2020-12-07 17:03:47 UTC (rev 77945)
+++ brlcad/branches/extbuild/include 2020-12-07 23:29:45 UTC (rev 77946)
Property changes on: brlcad/branches/extbuild/include
___________________________________________________________________
Modified: svn:mergeinfo
## -10,4 +10,4 ##
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
/brlcad/branches/tcltk86/include:68300-75257
-/brlcad/trunk/include:77660-77699,77784-77829,77838-77865
\ No newline at end of property
+/brlcad/trunk/include:77660-77699,77784-77829,77838-77865,77934-77945
\ No newline at end of property
Modified: brlcad/branches/extbuild/include/brep/defines.h
===================================================================
--- brlcad/branches/extbuild/include/brep/defines.h 2020-12-07 17:03:47 UTC
(rev 77945)
+++ brlcad/branches/extbuild/include/brep/defines.h 2020-12-07 23:29:45 UTC
(rev 77946)
@@ -48,7 +48,9 @@
# pragma clang diagnostic push
#endif
#if defined(__GNUC__) && !defined(__clang__)
-# pragma GCC diagnostic ignored "-Wclass-memaccess"
+# if GCC_PREREQ(8,0)
+# pragma GCC diagnostic ignored "-Wclass-memaccess"
+# endif
#endif
/* don't let opennurbs include windows.h */
Modified: brlcad/branches/extbuild/src/conv/step/step-g/OpenNurbsInterfaces.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/OpenNurbsInterfaces.cpp
2020-12-07 17:03:47 UTC (rev 77945)
+++ brlcad/branches/extbuild/src/conv/step/step-g/OpenNurbsInterfaces.cpp
2020-12-07 23:29:45 UTC (rev 77946)
@@ -33,7 +33,9 @@
# pragma clang diagnostic push
#endif
#if defined(__GNUC__) && !defined(__clang__)
-# pragma GCC diagnostic ignored "-Wclass-memaccess"
+# if GCC_PREREQ(8,0)
+# pragma GCC diagnostic ignored "-Wclass-memaccess"
+# endif
#endif
#include "opennurbs.h"
Modified: brlcad/branches/extbuild/src/libbg/spsr/MarchingCubes.cpp
===================================================================
--- brlcad/branches/extbuild/src/libbg/spsr/MarchingCubes.cpp 2020-12-07
17:03:47 UTC (rev 77945)
+++ brlcad/branches/extbuild/src/libbg/spsr/MarchingCubes.cpp 2020-12-07
23:29:45 UTC (rev 77946)
@@ -35,7 +35,9 @@
#endif
#if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic ignored "-Wfloat-equal"
-# pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+# if (__GNUC__ >= 7)
+# pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+# endif
#endif
#if defined(__clang__)
# pragma clang diagnostic ignored "-Wfloat-equal"
Modified:
brlcad/branches/extbuild/src/libbg/spsr/MultiGridOctreeData.IsoSurface.inl
===================================================================
--- brlcad/branches/extbuild/src/libbg/spsr/MultiGridOctreeData.IsoSurface.inl
2020-12-07 17:03:47 UTC (rev 77945)
+++ brlcad/branches/extbuild/src/libbg/spsr/MultiGridOctreeData.IsoSurface.inl
2020-12-07 23:29:45 UTC (rev 77946)
@@ -396,7 +396,7 @@
if( stillOwner )
{
// We only need
to pass the iso-vertex down if the edge it lies on is adjacent to a coarser leaf
- bool isNeeded;
+ bool isNeeded =
false;
switch( o )
{
case 0:
isNeeded = ( neighborKey.neighbors[depth].neighbors[1][2*y][1]==NULL ||
neighborKey.neighbors[depth].neighbors[1][2*y][2*z]==NULL ||
neighborKey.neighbors[depth].neighbors[1][1][2*z]==NULL ) ; break;
Modified: brlcad/branches/extbuild/src/libbg/spsr/Octree.inl
===================================================================
--- brlcad/branches/extbuild/src/libbg/spsr/Octree.inl 2020-12-07 17:03:47 UTC
(rev 77945)
+++ brlcad/branches/extbuild/src/libbg/spsr/Octree.inl 2020-12-07 23:29:45 UTC
(rev 77946)
@@ -188,7 +188,8 @@
int OctNode< NodeData >::maxDepth(void) const{
if(!children){return 0;}
else{
- int c,d;
+ int c = 0;
+ int d = 0;
for(int i=0;i<Cube::CORNERS;i++){
d=children[i].maxDepth();
if(!i || d>c){c=d;}
Modified: brlcad/branches/extbuild/src/librt/primitives/arbn/arbn.c
===================================================================
--- brlcad/branches/extbuild/src/librt/primitives/arbn/arbn.c 2020-12-07
17:03:47 UTC (rev 77945)
+++ brlcad/branches/extbuild/src/librt/primitives/arbn/arbn.c 2020-12-07
23:29:45 UTC (rev 77946)
@@ -1169,13 +1169,14 @@
int
rt_arbn_adjust(struct bu_vls *logstr, struct rt_db_internal *intern, int argc,
const char **argv)
{
- struct rt_arbn_internal *arbn;
- unsigned char *c;
- int len;
- size_t i, j;
- long val;
- fastf_t *new_planes;
- fastf_t *array;
+ struct rt_arbn_internal *arbn = NULL;
+ unsigned char *c = NULL;
+ int len = 0;
+ size_t i = 0;
+ size_t j = 0;
+ long val = 0;
+ fastf_t *new_planes = NULL;
+ fastf_t *array = NULL;
RT_CK_DB_INTERNAL(intern);
Index: brlcad/branches/extbuild/src/other
===================================================================
--- brlcad/branches/extbuild/src/other 2020-12-07 17:03:47 UTC (rev 77945)
+++ brlcad/branches/extbuild/src/other 2020-12-07 23:29:45 UTC (rev 77946)
Property changes on: brlcad/branches/extbuild/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
/brlcad/branches/tcltk86/src/other:68300-75257
-/brlcad/trunk/src/other:77547-77657,77836-77857,77870-77920,77924-77933
\ No newline at end of property
+/brlcad/trunk/src/other:77547-77657,77836-77857,77870-77920,77924-77945
\ No newline at end of property
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
