diff -r 78e19bc09b73 -r eaa079afe64c uiacceltk/hitchcock/coretoolkit/src/HuiFxEffectParser.cpp --- a/uiacceltk/hitchcock/coretoolkit/src/HuiFxEffectParser.cpp Tue Sep 14 23:02:38 2010 +0300 +++ b/uiacceltk/hitchcock/coretoolkit/src/HuiFxEffectParser.cpp Wed Sep 15 13:12:27 2010 +0300 @@ -356,7 +356,7 @@ } if (aLayer && aLayer->Type() == ELayerTypeGroup) { - CHuiFxGroupLayer* group = reinterpret_cast(aLayer); + CHuiFxGroupLayer* group = static_cast(aLayer); group->AddLayerL( visual ); // ownership transferred } else @@ -1196,6 +1196,8 @@ #ifdef _HUI_FX_PARSER_LOGGING __ALFFXLOGSTRING1("CHuiFxEffectParser::GetSrcTypeL - 0x%x ",this); #endif + + if (aNode->NodeType() != CMDXMLNode::EElementNode) { FAIL(KErrGeneral, _L("Text node expected while reading visual source type")); @@ -1211,17 +1213,18 @@ TPtrC attributeValue; TPtrC attributeName; User::LeaveIfError(((CMDXMLElement*)aNode)->AttributeDetails( attributeIndex, attributeName, attributeValue )); - - if( attributeValue.Compare( KLitItem ) == 0 ) + + + if( attributeValue.CompareF( KLitItem ) == 0 ) { return EVisualSrcVisual; } - else if ( attributeValue.Compare( KLitInput1 ) == 0 ) + else if ( attributeValue.CompareF( KLitInput1 ) == 0 ) { // This means that the source is given as a parameter to the effect return EVisualSrcInput1; } - else if ( attributeValue.Compare( KLitInput2 ) == 0 ) + else if ( attributeValue.CompareF( KLitInput2 ) == 0 ) { // This means that the source is given as a parameter to the effect return EVisualSrcInput2;