# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272882137 -10800 # Node ID df65ec4f2d28edb2e928119c783ef24689409709 # Parent 443d52b01c620778fcfab94fe6ea010c520b1d30 Revision: 201015 Kit: 201018 diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGEngine/inc/SVGContentHandler.h --- a/svgtopt/SVG/SVGEngine/inc/SVGContentHandler.h Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/inc/SVGContentHandler.h Mon May 03 13:22:17 2010 +0300 @@ -28,8 +28,8 @@ #include "SVGAttributeVerifier.h" #include "SVGErrorImpl.h" -#include "mxmlattributes.h" -#include "mxmlcontenthandler.h" +#include "MXMLAttributes.h" +#include "MXMLContentHandler.h" #include "SVGSchemaData.h" #include "SVGDocumentImpl.h" diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGEngine/src/SVGContentHandler.cpp --- a/svgtopt/SVG/SVGEngine/src/SVGContentHandler.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/src/SVGContentHandler.cpp Mon May 03 13:22:17 2010 +0300 @@ -26,7 +26,7 @@ #include "SVGUseElementImpl.h" #include "SVGAnimationElementImpl.h" -#include "rxmlreader.h" +#include "RXMLReader.h" #include "SVGPaintCssValueImpl.h" #include "SVGPathElementImpl.h" @@ -1434,9 +1434,14 @@ CleanupStack::PopAndDestroy( 1 ); // tBufC2 } - iCurrentElement->SetTransform(KTransform,tPf); - - CleanupStack::PopAndDestroy( 2 ); // tBufC & TFinal + TBool rVal = iCurrentElement->SetTransform(KTransform,tPf); + CleanupStack::PopAndDestroy( 2 ); // tBufC & TFinal + + if (!rVal) + { + return EFalse; + } + return ETrue; } diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGEngine/src/SVGEngineImpl.cpp --- a/svgtopt/SVG/SVGEngine/src/SVGEngineImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/src/SVGEngineImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -1406,7 +1406,7 @@ // Document is an animation if( iSvgDocument->IsAnimationFile() ) { - { // Mahesh: Atleast first frame should get drawn + { // Atleast first frame should get drawn TRAPD(error, RedrawL() ); { if ( error != KErrNone && aError != NULL ) diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGEngine/src/SVGEngineInterfaceImpl.cpp --- a/svgtopt/SVG/SVGEngine/src/SVGEngineInterfaceImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/src/SVGEngineInterfaceImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -1055,67 +1055,36 @@ TInt aX,aY; // Check in Left direction aX = 1; aY = 0; - if ( xmax <= clipWidth && aX < 0 ) - aX = 0; - if ( bound.iX >= zero && aX > 0 ) + //Coverity fixes + if ( bound.iX >= zero ) aX = 0; - if ( ymax <= clipHeight && aY < 0 ) - aY = 0; - if ( bound.iY >= zero && aY > 0 ) - aY = 0; + // Do panning - if ( ( aY == 0 ) && ( aX == 0 ) ) - left = EFalse; - else - left = ETrue; + left = ((aY)||(aX)); // Check in Right direction aX = -1; aY = 0; - if ( xmax <= clipWidth && aX < 0 ) - aX = 0; - if ( bound.iX >= zero && aX > 0 ) + if ( xmax <= clipWidth ) aX = 0; - if ( ymax <= clipHeight && aY < 0 ) - aY = 0; - if ( bound.iY >= zero && aY > 0 ) - aY = 0; + // Do panning - if ( ( aY == 0 ) && ( aX == 0 ) ) - right = EFalse; - else - right = ETrue; + right = ((aY)||(aX)); // Check in Up direction aX = 0; aY = 1; - if ( xmax <= clipWidth && aX < 0 ) - aX = 0; - if ( bound.iX >= zero && aX > 0 ) - aX = 0; - if ( ymax <= clipHeight && aY < 0 ) + if ( bound.iY >= zero ) aY = 0; - if ( bound.iY >= zero && aY > 0 ) - aY = 0; + // Do panning - if ( ( aY == 0 ) && ( aX == 0 ) ) - up = EFalse; - else - up = ETrue; + up = ((aY)||(aX)); // Check in down direction aX = 0; aY = -1; - if ( xmax <= clipWidth && aX < 0 ) - aX = 0; - if ( bound.iX >= zero && aX > 0 ) - aX = 0; - if ( ymax <= clipHeight && aY < 0 ) + if ( ymax <= clipHeight ) aY = 0; - if ( bound.iY >= zero && aY > 0 ) - aY = 0; + // Do panning - if ( ( aY == 0 ) && ( aX == 0 ) ) - down = EFalse; - else - down = ETrue; + down = ((aY)||(aX)); } // -------------------------------------------------------------------------- @@ -1219,19 +1188,11 @@ { bbSize.iWidth = ((TReal32)bbSize.iWidth) * percentWidth / 100.0; } - else - { - bbSize.iWidth = bbSize.iWidth; - } if( svgElement->iHeightInPercentage ) { bbSize.iHeight = ((TReal32)bbSize.iHeight) * percentHeight / 100.0; } - else - { - bbSize.iHeight = bbSize.iHeight; - } return bbSize; } } @@ -3102,10 +3063,9 @@ TSvgFourPointRect fourPointRect; //updates CTM from root - aTextElementHandle->UpdateCTM(); - if (aTextElementHandle) { + aTextElementHandle->UpdateCTM(); aTextElementHandle->GetFourPointBBox(fourPointRect); } diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGEngine/src/Svgdecoder.cpp --- a/svgtopt/SVG/SVGEngine/src/Svgdecoder.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/src/Svgdecoder.cpp Mon May 03 13:22:17 2010 +0300 @@ -2511,30 +2511,20 @@ // --------------------------------------------------------------------------- TBool CSvgDecoder::DecodeIdAndXmlAttributeL(const TUint16 aName) { - + TBool rVal = EFalse; if (aName== KAtrId) { - iCurrentElement->SetIdandXmlbaseL( _L("id"), DecodeTDesCLC()); - CleanupStack::PopAndDestroy( 1 ); - return ETrue; + rVal = iCurrentElement->SetIdandXmlbaseL( _L("id"), DecodeTDesCLC()); + CleanupStack::PopAndDestroy( 1 ); } - - if (aName== KAtrXmlBase) + else if (aName== KAtrXmlBase) { - iCurrentElement->SetIdandXmlbaseL( _L("xml:base"), DecodeTDesCLC()); - CleanupStack::PopAndDestroy( 1 ); - return ETrue; + rVal = iCurrentElement->SetIdandXmlbaseL( _L("xml:base"), DecodeTDesCLC()); + CleanupStack::PopAndDestroy( 1 ); } - - else - { - return EFalse; - } + return rVal; } - - - // -------------------------------------------------------------------------- // TBool CSvgDecoder::DecodeUriRefAttributeL(const TUint16 aName) // --------------------------------------------------------------------------- diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGImpl/src/SVGAnimationBase.cpp --- a/svgtopt/SVG/SVGImpl/src/SVGAnimationBase.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGImpl/src/SVGAnimationBase.cpp Mon May 03 13:22:17 2010 +0300 @@ -679,11 +679,13 @@ iAnimTime->SaveBeginTime(); } - if ( ( ((CSvgDocumentImpl*)iOwnerDocument)->Engine() && iAnimTime && ((CSvgDocumentImpl*)iOwnerDocument)->Engine()->CurrentTIme() >= iAnimTime->BeginTime() ) - || ( iAnimTime && ((CSvgDocumentImpl*)iOwnerDocument)->iTimeForJSR226 >= iAnimTime->BeginTime() ) ) + if ( ( ((CSvgDocumentImpl*)iOwnerDocument)->Engine() && ((CSvgDocumentImpl*)iOwnerDocument)->Engine()->CurrentTIme() >= iAnimTime->BeginTime() ) + || ( ((CSvgDocumentImpl*)iOwnerDocument)->iTimeForJSR226 >= iAnimTime->BeginTime() ) ) { - iTargetElement->SetIsAnimating( ETrue ); - SetIsAnimating( ETrue ); + if (iTargetElement) + iTargetElement->SetIsAnimating( ETrue ); + + SetIsAnimating( ETrue ); } } diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGImpl/src/SVGAnimationElementImpl.cpp --- a/svgtopt/SVG/SVGImpl/src/SVGAnimationElementImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGImpl/src/SVGAnimationElementImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -473,6 +473,9 @@ // void CSvgAnimationElementImpl::RemoveEventListener() { + if ( !iMyAnimationElementList ) + return; + FindAllAnimationElements( (CSvgElementImpl* )this, iMyAnimationElementList ); // Remove event listening for every animation elements that are child of diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGImpl/src/SVGDocumentImpl.cpp --- a/svgtopt/SVG/SVGImpl/src/SVGDocumentImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGImpl/src/SVGDocumentImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -374,11 +374,7 @@ // ellipse return ( MXmlElement * ) CSvgEllipseElementImpl::NewL( (TUint8) position, this ); - case KSvgDefsElement: - // defs - return ( MXmlElement * ) CSvgDefsElementImpl::NewL((TUint8) position, this); - - case KSvgForeignObjectElement: + case KSvgForeignObjectElement: // foreignObject return ( MXmlElement * ) CSvgForeignObjectElementImpl::NewL((TUint8) position, this); diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGImpl/src/SVGElementImpl.cpp --- a/svgtopt/SVG/SVGImpl/src/SVGElementImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGImpl/src/SVGElementImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -101,8 +101,6 @@ CSvgElementImpl* lParentElement = (CSvgElementImpl*)aElement->ParentNode (); while(lParentElement && (lParentElement->iSvgStyleProperties != NULL)) { - if(!lParentElement) - return EFalse; if (aElement->iSvgStyleProperties->operator[](aAttrIndex) == lParentElement->iSvgStyleProperties->operator[](aAttrIndex)) { @@ -673,7 +671,8 @@ { ((CSvgFontFaceElementImpl *)this)->SetFontFamilyL(aValue); } - + break; + case KCSS_ATTR_STROKE_LINECAP: case KCSS_ATTR_STROKE_LINEJOIN: case KCSS_ATTR_FILLRULE: diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGImpl/src/SVGFontFaceElementImpl.cpp --- a/svgtopt/SVG/SVGImpl/src/SVGFontFaceElementImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGImpl/src/SVGFontFaceElementImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -117,28 +117,31 @@ { //AJD this whole thing needs to be replaced with some sort of external resource registry area.... //for images, fonts, other svg files - if ( ((CSvgDocumentImpl*)iOwnerDocument)->Engine() && ((CSvgDocumentImpl*)iOwnerDocument)->Engine()->iFontHashMap) - { - TRAPD(err, ((CSvgDocumentImpl*)iOwnerDocument)->Engine()->iFontHashMap->RemoveReferenceFromFontL(iFontFamily->Des())); - if (err) + CSvgDocumentImpl * ownerDoc = (CSvgDocumentImpl*)iOwnerDocument; + if ( ownerDoc ) { - #ifdef _DEBUG - RDebug::Printf("CSvgFontFaceElementImpl::~CSvgFontFaceElementImpl: Error trapped=%d", err); - #endif + if ( ownerDoc->Engine() && ownerDoc->Engine()->iFontHashMap) + { + TRAPD(err, ownerDoc->Engine()->iFontHashMap->RemoveReferenceFromFontL(iFontFamily->Des())); + if (err) + { + #ifdef _DEBUG + RDebug::Printf("CSvgFontFaceElementImpl::~CSvgFontFaceElementImpl: Error trapped=%d", err); + #endif + } + } + + if ( ownerDoc->iFontHashMap) + { + TRAPD(err, ownerDoc->iFontHashMap->RemoveReferenceFromFontL(iFontFamily->Des())); + if (err) + { + #ifdef _DEBUG + RDebug::Printf("CSvgFontFaceElementImpl::~CSvgFontFaceElementImpl: Error trapped=%d", err); + #endif + } + } } - } - - if ( (CSvgDocumentImpl*)iOwnerDocument && ((CSvgDocumentImpl*)iOwnerDocument)->iFontHashMap) - { - TRAPD(err, ((CSvgDocumentImpl*)iOwnerDocument)->iFontHashMap->RemoveReferenceFromFontL(iFontFamily->Des())); - if (err) - { - #ifdef _DEBUG - RDebug::Printf("CSvgFontFaceElementImpl::~CSvgFontFaceElementImpl: Error trapped=%d", err); - #endif - } - } - if ( iFontFamily ) { delete iFontFamily; diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGImpl/src/SVGSetElementImpl.cpp --- a/svgtopt/SVG/SVGImpl/src/SVGSetElementImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGImpl/src/SVGSetElementImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -151,16 +151,9 @@ case KSvgTypeTransform: break; case KSvgTypeColor: - iEndInt = iToInt; - iTargetElement->SetAttributeIntL( iAttrId, iToInt ); - break; case KSvgTypeTextAnchor: case KSvgTypeInteger: - iEndInt = iToInt; - iTargetElement->SetAttributeIntL( iAttrId, iToInt ); case KSvgTypeVisibility: - iEndInt = iToInt; - iTargetElement->SetAttributeIntL( iAttrId, iToInt ); case KSvgTypeDisplay: iEndInt = iToInt; iTargetElement->SetAttributeIntL( iAttrId, iToInt ); diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGImpl/src/SVGTextElementImpl.cpp --- a/svgtopt/SVG/SVGImpl/src/SVGTextElementImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGImpl/src/SVGTextElementImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -2885,12 +2885,7 @@ //SetFontFamilyL(_L("NokiaSansWide")); if(!aReturn) { - if(lNewFontDoc) - { - delete lNewFontDoc; - lNewFontDoc = NULL; - } - + delete lNewFontDoc; } return ETrue; } @@ -2904,7 +2899,6 @@ } delete lNewFontDoc; - lNewFontDoc = NULL; return EFalse; } diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVG/SVGImpl/src/SVGTokenizer.cpp --- a/svgtopt/SVG/SVGImpl/src/SVGTokenizer.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVG/SVGImpl/src/SVGTokenizer.cpp Mon May 03 13:22:17 2010 +0300 @@ -305,11 +305,12 @@ TLex lex( decimalString ); // Specify the decimal seperator, instead of using // locale specific seperator. - lex.Val( aValue, '.' ); - - tokenizer.SkipWhiteSpace(); - aRemainder.Set( tokenizer.Remainder() ); - return ETrue; - } + if(lex.Val( aValue, '.' )== KErrNone) + { + tokenizer.SkipWhiteSpace(); + aRemainder.Set( tokenizer.Remainder() ); + return ETrue; + } + } return EFalse; } diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVGEngineJI/src/SvgJavaInterfaceImpl.cpp --- a/svgtopt/SVGEngineJI/src/SvgJavaInterfaceImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVGEngineJI/src/SvgJavaInterfaceImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -1327,13 +1327,13 @@ { if(lSvgAttrId == KCSS_ATTR_FONTSIZE) { - if(lValue != KErrNotFound) - { + // if(lValue != KErrNotFound) + // { // font is internally considered to be a float. TReal32 lValue = GetElementFloatAttribute((CSvgElementImpl*)aElementHandle,lSvgAttrId); return short (lValue) ; - } - return KInvalidEnumAttribute; + // } + //return KInvalidEnumAttribute; } TInt lResult = GetEnumAttribute((CSvgElementImpl*)aElementHandle, lSvgAttrId , lValue); if(lResult == KErrNotFound) @@ -2653,36 +2653,42 @@ */ TInt CSvgJavaInterfaceImpl::SvgStringtoEnumerationMappingSVGtoJSR(const TInt aAttributeId , TPtrC16 aValue) { + TInt attribVal = KErrNotFound; + switch(aAttributeId) { case KCSS_ATTR_FILLRULE: { if(aValue == _L("evenodd")) - return FILL_RULE_EVENODD; - if(aValue == _L("nonzero")) - return FILL_RULE_NONZERO; + attribVal = FILL_RULE_EVENODD; + else if(aValue == _L("nonzero")) + attribVal = FILL_RULE_NONZERO; } + break; case KCSS_ATTR_STROKE_LINECAP: { if(aValue == _L("butt")) - return STROKE_LINECAP_BUTT; - if(aValue == _L("round")) - return STROKE_LINECAP_ROUND; - if(aValue == _L("square")) - return STROKE_LINECAP_SQUARE; + attribVal = STROKE_LINECAP_BUTT; + else if(aValue == _L("round")) + attribVal = STROKE_LINECAP_ROUND; + else if(aValue == _L("square")) + attribVal = STROKE_LINECAP_SQUARE; } - - case KCSS_ATTR_STROKE_LINEJOIN: - + break; + case KCSS_ATTR_STROKE_LINEJOIN: { if(aValue == _L("miter")) - return STROKE_LINEJOIN_MITER; - if(aValue == _L("round")) - return STROKE_LINEJOIN_ROUND; - if(aValue == _L("bevel")) - return STROKE_LINEJOIN_BEVEL; + attribVal = STROKE_LINEJOIN_MITER; + else if(aValue == _L("round")) + attribVal = STROKE_LINEJOIN_ROUND; + else if(aValue == _L("bevel")) + attribVal = STROKE_LINEJOIN_BEVEL; } - default: return KErrNotFound; + break; + default: + attribVal = KErrNotFound; + + return attribVal; } } /** diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVGTPlugin/inc/Svgtplugin.h --- a/svgtopt/SVGTPlugin/inc/Svgtplugin.h Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVGTPlugin/inc/Svgtplugin.h Mon May 03 13:22:17 2010 +0300 @@ -33,9 +33,9 @@ #include "SVGListener.h" #include -#include +#include -#include +#include #include "MRepositoryVolumeObserver.h" diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVGTPlugin/src/RepositoryVolumeListener.cpp --- a/svgtopt/SVGTPlugin/src/RepositoryVolumeListener.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVGTPlugin/src/RepositoryVolumeListener.cpp Mon May 03 13:22:17 2010 +0300 @@ -23,7 +23,7 @@ #include "RepositoryVolumeListener.h" //#include //include this file when KSDUidMediaVolumeControl and KMediaVolume will be needed //#include "epocdebug.h" -#include +#include #include "MRepositoryVolumeObserver.h" CRepositoryVolumeListener* CRepositoryVolumeListener::NewL(MRepositoryVolumeObserver* aObserver) diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVGTPlugin/src/Svgtpluginmain.cpp --- a/svgtopt/SVGTPlugin/src/Svgtpluginmain.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVGTPlugin/src/Svgtpluginmain.cpp Mon May 03 13:22:17 2010 +0300 @@ -20,7 +20,7 @@ #include -#include +#include /***************************************************/ /**********ECOM STYLE SVGT PLUGIN ENTRY POINTS******/ /***************************************************/ diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/SVGTPlugin/src/VolumeKeyListener.cpp --- a/svgtopt/SVGTPlugin/src/VolumeKeyListener.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/SVGTPlugin/src/VolumeKeyListener.cpp Mon May 03 13:22:17 2010 +0300 @@ -19,7 +19,7 @@ #include #include -#include +#include #include "VolumeKeyListener.h" #include "MRepositoryVolumeObserver.h" diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/VGRenderer/PseudoVG/src/PseodoVGRendererImpl.cpp --- a/svgtopt/VGRenderer/PseudoVG/src/PseodoVGRendererImpl.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/VGRenderer/PseudoVG/src/PseodoVGRendererImpl.cpp Mon May 03 13:22:17 2010 +0300 @@ -801,7 +801,7 @@ { #ifdef VGRENDERER_LOG TInt err = iLog.Connect(); - TRAPD(logerror,iLog.CreateLog(_L("ranjithencoder"),_L("ranjithencoder.txt"),EFileLoggingModeOverwrite)); + TRAPD(logerror,iLog.CreateLog(_L("PseodoEncoder"),_L("PseodoEncoder.txt"),EFileLoggingModeOverwrite)); #endif } diff -r 443d52b01c62 -r df65ec4f2d28 svgtopt/gfx2d/src/GfxGc/Gfx2dGcOpenVG.cpp --- a/svgtopt/gfx2d/src/GfxGc/Gfx2dGcOpenVG.cpp Fri Apr 16 15:55:53 2010 +0300 +++ b/svgtopt/gfx2d/src/GfxGc/Gfx2dGcOpenVG.cpp Mon May 03 13:22:17 2010 +0300 @@ -2467,7 +2467,8 @@ buffer = new (ELeave) TUint32[ iColorBufferSize.iWidth * iColorBufferSize.iHeight ] ; iVgSurface->PrepareToBindClientBuffer(); - VGImage vgImage = CreateVGImage( buffer, iColorBufferSize, EColor16MU, ETrue ); + //VGImage vgImage = CreateVGImage( buffer, iColorBufferSize, EColor16MU, ETrue ); + VGImage vgImage = iVgRenderer->vgCreateImage( VG_sRGBA_8888_PRE,iColorBufferSize.iWidth, iColorBufferSize.iHeight, VG_IMAGE_QUALITY_FASTER ); //Clear VGImage VGfloat color[4] = { 1.0f, 1.0f, 1.0f, 0.0f }; iVgRenderer->vgSetfv(VG_CLEAR_COLOR, 4, color); @@ -2874,7 +2875,7 @@ { // Ensure OpenVG is initialized: could have been terminated by another Svg engine // Returns immediately if already initialized - TInt err = iVgSurface->InitializeSurface( iColorBufferSize, VGI_COLORSPACE_SRGB );//NGA --- testing purpose//srikanth + TInt err = iVgSurface->InitializeSurface( iColorBufferSize, VGI_COLORSPACE_SRGB ); if (!((err == KErrNone) || (err == KErrAlreadyExists))) { #ifdef _DEBUG