Kaydet (Commit) 3b51ba24 authored tarafından Julien Nabet's avatar Julien Nabet

cppcheck: fix duplicateBranch

Git history shows it was like this since first commit (2009-12-15)
Moreover I noticed these lines:
    220     if ( mpCGM->pElement->nAspectSourceFlags & ASF_FILLCOLOR )
    221         nFillColor = mpCGM->pElement->pFillBundle->GetColor();
    222     else
    223         nFillColor = mpCGM->pElement->aFillBundle.GetColor();
even if nFillColor can have another value in case below
    249         case FIS_GEOPATTERN :
    250         {
    251             if ( mpCGM->pElement->eTransparency == T_ON )
    252                 nFillColor = mpCGM->pElement->nAuxiliaryColor;
    253             eFS = drawing::FillStyle_NONE;
    254         }
this change is still safe since it's just a simplification.

Change-Id: Icf41dbeee6405780483649e0968dd30e8a533882
üst 507169c1
......@@ -321,10 +321,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
{
drawing::Hatch aHatch;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_LINECOLOR )
aHatch.Color = nFillColor;
else
aHatch.Color = nFillColor;
aHatch.Color = nFillColor;
if ( mpCGM->pElement->maHatchMap.find( nHatchIndex ) != mpCGM->pElement->maHatchMap.end() )
{
HatchEntry& rHatchEntry = mpCGM->pElement->maHatchMap[ nHatchIndex ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment