Fixed a few warnings (mostly gcc6 -Wmisleading-indent).
This commit is contained in:
parent
3fcae6b120
commit
71aade6b51
|
@ -599,6 +599,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_min.z - m_max.x + aRay.c_zx > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -614,6 +615,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_max.z - m_max.x + aRay.c_zx > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -628,6 +630,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_min.z - m_max.x + aRay.c_zx > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -642,6 +645,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_max.z - m_max.x + aRay.c_zx > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -656,6 +660,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_min.z - m_min.x + aRay.c_zx < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -671,6 +676,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_max.z - m_min.x + aRay.c_zx < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -685,6 +691,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_min.z - m_min.x + aRay.c_zx < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -699,6 +706,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_max.z - m_min.x + aRay.c_zx < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -710,6 +718,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.kbyj * m_min.y - m_max.z + aRay.c_yz > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -721,6 +730,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.kbyj * m_min.y - m_min.z + aRay.c_yz < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -732,6 +742,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.kbyj * m_max.y - m_max.z + aRay.c_yz > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -743,6 +754,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.kbyj * m_max.y - m_min.z + aRay.c_yz < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -755,6 +767,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_min.z - m_max.x + aRay.c_zx > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -767,6 +780,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_max.z - m_max.x + aRay.c_zx > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -778,6 +792,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_min.z - m_min.x + aRay.c_zx < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -790,6 +805,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyk * m_max.z - m_min.x + aRay.c_zx < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -801,6 +817,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyj * m_min.y - m_max.x + aRay.c_yx > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -812,6 +829,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyj * m_max.y - m_max.x + aRay.c_yx > 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -824,6 +842,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyj * m_min.y - m_min.x + aRay.c_yx < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -835,6 +854,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.ibyj * m_max.y - m_min.x + aRay.c_yx < 0)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -846,6 +866,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.m_Origin.z < m_min.z) || ( aRay.m_Origin.z > m_max.z)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -856,6 +877,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.m_Origin.z < m_min.z) || ( aRay.m_Origin.z > m_max.z)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -866,6 +888,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.m_Origin.z < m_min.z) || ( aRay.m_Origin.z > m_max.z)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -876,6 +899,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.m_Origin.z < m_min.z) || ( aRay.m_Origin.z > m_max.z)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -887,6 +911,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.m_Origin.y < m_min.y) || ( aRay.m_Origin.y > m_max.y)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -897,6 +922,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|
|||
|| ( aRay.m_Origin.y < m_min.y) || ( aRay.m_Origin.y > m_max.y)
|
||||
)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -230,10 +230,9 @@ void MODULE::TransformGraphicShapesWithClearanceToPolygonSet(
|
|||
|
||||
if( outline->GetLayer() != aLayer )
|
||||
break;
|
||||
outline->TransformShapeWithClearanceToPolygon( aCornerBuffer,
|
||||
0,
|
||||
aCircleToSegmentsCount,
|
||||
aCorrectionFactor );
|
||||
|
||||
outline->TransformShapeWithClearanceToPolygon( aCornerBuffer, 0,
|
||||
aCircleToSegmentsCount, aCorrectionFactor );
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -3677,7 +3677,7 @@ void Clipper::FixupFirstLefts3(OutRec* OldOutRec, OutRec* NewOutRec)
|
|||
for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
|
||||
{
|
||||
OutRec* outRec = m_PolyOuts[i];
|
||||
OutRec* firstLeft = ParseFirstLeft(outRec->FirstLeft);
|
||||
//OutRec* firstLeft = ParseFirstLeft(outRec->FirstLeft);
|
||||
if (outRec->Pts && outRec->FirstLeft == OldOutRec)
|
||||
outRec->FirstLeft = NewOutRec;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue