--- a/package_definition.xml Fri Mar 19 09:42:47 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="svgt" name="SVG Tiny" levels="util ui">
- <collection id="svgt_info" name="SVG Tiny Info" level="ui">
- <component id="svgt_plat" filter="s60" name="SVG Tiny Platform Interfaces" class="api" introduced="9.2">
- <unit bldFile="svgt_plat/group"/>
- </component>
- </collection>
- <collection id="svgtopt" name="SVG-T Engine" level="util">
- <component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
- <unit bldFile="svgtopt/group"/>
- </component>
- <component id="nvgdecoder" filter="s60" name="NVG Decoder" introduced="9.2">
- <!-- extract relevant parts of above bld.inf or remove this component -->
- </component>
- <component id="svgengineji" filter="s60" name="SVG Engine Java Interface" introduced="9.2">
- <!-- extract relevant parts of above bld.inf or remove this component -->
- </component>
- <component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
- <unit bldFile="svgtopt/svgtplugin/group"/>
- </component>
- </collection>
- </package>
-</SystemDefinition>
--- a/svgtopt/SVG/SVGEngine/group/SVGEngine.mmp Fri Mar 19 09:42:47 2010 +0200
+++ b/svgtopt/SVG/SVGEngine/group/SVGEngine.mmp Fri Apr 16 15:55:53 2010 +0300
@@ -19,7 +19,12 @@
#include <platform_paths.hrh>
ALWAYS_BUILD_AS_ARM
-OPTION_REPLACE ARMCC --cpu 5T -O3 -Otime
+/* Srini: Raptor automatically adds --cpu 5te when building for rvct4.0
+ and adds --cpu 5t when building with rvct 2.2.
+ basically the option is redundant. please don't add the option.
+
+ */
+OPTION_REPLACE ARMCC -O3 -Otime
TARGET SVGEngine.dll
TARGETTYPE dll
--- a/svgtopt/SVG/SVGImpl/src/SVGElementImpl.cpp Fri Mar 19 09:42:47 2010 +0200
+++ b/svgtopt/SVG/SVGImpl/src/SVGElementImpl.cpp Fri Apr 16 15:55:53 2010 +0300
@@ -2177,12 +2177,13 @@
{
MGfxPaint* lPaintValue = (MGfxPaint *)((( CPaintCssValueImpl* )lCssValue)->Value());
+ /*
if(lPaintValue && lPaintValue->GetColor()== KSvgCurrentColor)
{
lPaintValue = CurrentColor();
aValue = lPaintValue->GetColor();
}
- else if(lPaintValue)
+ else*/ if(lPaintValue)
{
aValue = lPaintValue->GetColor();
}
@@ -2309,8 +2310,10 @@
}
if( lParentElement && aValue == KInherit )
{
- tParentValue = (CIntCssValueImpl *)(lParentElement->iSvgStyleProperties->operator[](aNameId));
- (*iSvgStyleProperties)[aNameId]= tParentValue;
+ //tParentValue = (CIntCssValueImpl *)(lParentElement->iSvgStyleProperties->operator[](aNameId));
+ //(*iSvgStyleProperties)[aNameId]= tParentValue;
+ if(tParentValue)
+ tValue->SetValueL(tParentValue->Value());
}
else
{
--- a/svgtopt/SVGEngineJI/inc/SVGjsrconstants.h Fri Mar 19 09:42:47 2010 +0200
+++ b/svgtopt/SVGEngineJI/inc/SVGjsrconstants.h Fri Apr 16 15:55:53 2010 +0300
@@ -265,7 +265,6 @@
#define TEXT_UNDER_LINE 363
#define TEXT_OVER_LINE 364
#define TEXT_LINE_THROUGH 365
- #define ATTRIBUTE_INHERIT -2
// These are actual sizes in 8:8 fixed point, not "choices"
#define FONT_SIZE_XXSMALL 0x20000
--- a/svgtopt/SVGEngineJI/src/SvgJavaInterfaceImpl.cpp Fri Mar 19 09:42:47 2010 +0200
+++ b/svgtopt/SVGEngineJI/src/SvgJavaInterfaceImpl.cpp Fri Apr 16 15:55:53 2010 +0300
@@ -1257,15 +1257,17 @@
********************************************************/
if(aElementHandle)
{
- TInt32 lValue = 0;
+ //TInt32 lValue = 0;
+
TInt lSvgAttrId = SvgGetAttributeTypeMappingJSRtoSVG(aAttribute);
if(lSvgAttrId != KSvgUnknownAttribute)
{
-
+ TInt lValue = SvgEnumerationMappingJSRtoSVG(lSvgAttrId , (TInt)aValue);
+ /*
lValue = SvgEnumerationMappingJSRtoSVG(lSvgAttrId , (TInt)aValue);
if ( lValue == KErrNotFound && aValue == ATTRIBUTE_INHERIT )
- lValue = KSVGAttributeInherit;
+ lValue = KSVGAttributeInherit;*/
if(lSvgAttrId == KCSS_ATTR_FONTSIZE)
{
if(lValue != KErrNotFound)
--- a/svgtopt/SVGTPlugin/src/SvgtPluginControl.cpp Fri Mar 19 09:42:47 2010 +0200
+++ b/svgtopt/SVGTPlugin/src/SvgtPluginControl.cpp Fri Apr 16 15:55:53 2010 +0300
@@ -527,6 +527,7 @@
iXPosAtMouseDown = iPointerX;
iYPosAtMouseDown = iPointerY;
iPlugin->iSvgModule->MouseMove( iPointerX, iPointerY );
+ User::After(10);
DrawNow();
}
}
--- a/svgtopt/nvgdecoder/src/TLVIconCreator.cpp Fri Mar 19 09:42:47 2010 +0200
+++ b/svgtopt/nvgdecoder/src/TLVIconCreator.cpp Fri Apr 16 15:55:53 2010 +0300
@@ -71,45 +71,45 @@
:
iNVGDataPtr((TUint8 *)&aWidth, 1)
{
- vgapi[EvgSeti] = &DvgAddCommandL;
- vgapi[EvgSetf] = &DvgAddCommandL;
- vgapi[EvgSetParameteri] = &DvgAddCommandL;
- vgapi[EvgSetParameterf] = &DvgAddCommandL;
- vgapi[EvgSetParameterfv] = &DvgSetParameterfvL;
- vgapi[EvgSetColor] = &DvgAddCommandL;
- vgapi[EvgSetPaint] = &DvgAddCommandL;
- vgapi[EvgLoadMatrix] = &DvgAddCommandL;
- vgapi[EvgMultMatrix] = &DvgAddCommandL;
- vgapi[EvgLoadIdentity] = &DvgAddCommandL;
- vgapi[EvgScale] = &DvgAddCommandL;
- vgapi[EvgTranslate] = &DvgAddCommandL;
- vgapi[EvgAppendPathData] = &DvgAppendPathDataL;
- vgapi[EvgDrawPath] = &DvgDrawPathL;
- vgapi[EvgClearPath] = &DvgAddCommandL;
- vgapi[EvguRect] = &DvguRectL;
- vgapi[EvguEllipse] = &DvguEllipseL;
- vgapi[EvguRoundRect] = &DvguRoundRectL;
- vgapi[EvguLine] = &DvguLineL;
- vgapi[EvgCreatePaint] = &DvgAddCommandL;
- vgapi[EvgSetiv] = &DvgSetivL;
- vgapi[EvgClear] = &DvgAddCommandL;
- vgapi[EvgSetfv] = &DvgSetfvL;
- vgapi[EvgRotate] = &DvgAddCommandL;
- vgapi[EvgCreatePath] = &DvgCreatePathL;
- vgapi[EvgCreateImage] = &DvgAddCommandL;
- vgapi[EvgGetPixels] = &DvgGetPixelsL;
- vgapi[EvgDrawImage] = &DvgAddCommandL;
- vgapi[EvgClearImage] = &DvgAddCommandL;
- vgapi[EvgImageSubData] = &DvgImageSubDataL;
- vgapi[EvgDestroyImage] = &DvgAddCommandL;
- vgapi[EvgDestroyPaint] = &DvgDestroyPaintL;
- vgapi[EvgDestroyPath] = &DvgDestroyPathL;
+ vgapi[EvgSeti] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgSetf] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgSetParameteri] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgSetParameterf] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgSetParameterfv] = &CTLVIconCreator::DvgSetParameterfvL;
+ vgapi[EvgSetColor] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgSetPaint] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgLoadMatrix] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgMultMatrix] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgLoadIdentity] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgScale] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgTranslate] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgAppendPathData] = &CTLVIconCreator::DvgAppendPathDataL;
+ vgapi[EvgDrawPath] = &CTLVIconCreator::DvgDrawPathL;
+ vgapi[EvgClearPath] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvguRect] = &CTLVIconCreator::DvguRectL;
+ vgapi[EvguEllipse] = &CTLVIconCreator::DvguEllipseL;
+ vgapi[EvguRoundRect] = &CTLVIconCreator::DvguRoundRectL;
+ vgapi[EvguLine] = &CTLVIconCreator::DvguLineL;
+ vgapi[EvgCreatePaint] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgSetiv] = &CTLVIconCreator::DvgSetivL;
+ vgapi[EvgClear] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgSetfv] = &CTLVIconCreator::DvgSetfvL;
+ vgapi[EvgRotate] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgCreatePath] = &CTLVIconCreator::DvgCreatePathL;
+ vgapi[EvgCreateImage] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgGetPixels] = &CTLVIconCreator::DvgGetPixelsL;
+ vgapi[EvgDrawImage] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgClearImage] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgImageSubData] = &CTLVIconCreator::DvgImageSubDataL;
+ vgapi[EvgDestroyImage] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgDestroyPaint] = &CTLVIconCreator::DvgDestroyPaintL;
+ vgapi[EvgDestroyPath] = &CTLVIconCreator::DvgDestroyPathL;
- vgapi[EvgPrepareToBindImage]= &DvgAddCommandL;
- vgapi[EvgBindImage] = &DvgAddCommandL;
- vgapi[EvgUnBindImage] = &DvgAddCommandL;
+ vgapi[EvgPrepareToBindImage]= &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgBindImage] = &CTLVIconCreator::DvgAddCommandL;
+ vgapi[EvgUnBindImage] = &CTLVIconCreator::DvgAddCommandL;
- vgapi[EvgFlush] = &DvgAddCommandL;
+ vgapi[EvgFlush] = &CTLVIconCreator::DvgAddCommandL;
iTargetWidth = aWidth;
iTargetHeight = aHeight;
--- a/svgtopt/nvgdecoder/src/TLVRenderer.cpp Fri Mar 19 09:42:47 2010 +0200
+++ b/svgtopt/nvgdecoder/src/TLVRenderer.cpp Fri Apr 16 15:55:53 2010 +0300
@@ -51,43 +51,43 @@
void CTLVRenderer::ConstructL(const TDesC8& aBuf)
{
- vgapi[EvgSeti] = &DvgSetiL;
- vgapi[EvgSetf] = &DvgSetfL;
- vgapi[EvgSetParameteri] = &DvgSetParameteriL;
- vgapi[EvgSetParameterf] = &DvgSetParameterfL;
- vgapi[EvgSetParameterfv] = &DvgSetParameterfvL;
- vgapi[EvgSetColor] = &DvgSetColorL;
- vgapi[EvgSetPaint] = &DvgSetPaintL;
- vgapi[EvgLoadMatrix] = &DvgLoadMatrixL;
- vgapi[EvgMultMatrix] = &DvgMultMatrixL;
- vgapi[EvgLoadIdentity] = &DvgLoadIdentityL;
- vgapi[EvgScale] = &DvgScaleL;
- vgapi[EvgTranslate] = &DvgTranslateL;
- vgapi[EvgAppendPathData] = &DvgAppendPathDataL;
- vgapi[EvgDrawPath] = &DvgDrawPathL;
- vgapi[EvgClearPath] = &DvgClearPathL;
- vgapi[EvguRect] = &DvguRectL;
- vgapi[EvguEllipse] = &DvguEllipseL;
- vgapi[EvguRoundRect] = &DvguRoundRectL;
- vgapi[EvguLine] = &DvguLineL;
- vgapi[EvgCreatePaint] = &DvgCreatePaintL;
- vgapi[EvgSetiv] = &DvgSetivL;
- vgapi[EvgClear] = &DvgClearL;
- vgapi[EvgSetfv] = &DvgSetfvL;
- vgapi[EvgRotate] = &DvgRotateL;
- vgapi[EvgCreatePath] = &DvgCreatePathL;
- vgapi[EvgCreateImage] = &DvgCreateImageL;
- vgapi[EvgGetPixels] = &DvgGetPixelsL;
- vgapi[EvgDrawImage] = &DvgDrawImageL;
- vgapi[EvgClearImage] = &DvgClearImageL;
- vgapi[EvgImageSubData] = &DvgImageSubDataL;
- vgapi[EvgDestroyImage] = &DvgDestroyImageL;
- vgapi[EvgDestroyPaint] = &DvgDestroyPaintL;
- vgapi[EvgDestroyPath] = &DvgDestroyPathL;
- vgapi[EvgPrepareToBindImage]= &DvgPrepareToBindImageL;
- vgapi[EvgBindImage] = &DvgBindImageL;
- vgapi[EvgUnBindImage] = &DvgUnBindImageL;
- vgapi[EvgFlush] = &DvgFlushL;
+ vgapi[EvgSeti] = &CTLVRenderer::DvgSetiL;
+ vgapi[EvgSetf] = &CTLVRenderer::DvgSetfL;
+ vgapi[EvgSetParameteri] = &CTLVRenderer::DvgSetParameteriL;
+ vgapi[EvgSetParameterf] = &CTLVRenderer::DvgSetParameterfL;
+ vgapi[EvgSetParameterfv] = &CTLVRenderer::DvgSetParameterfvL;
+ vgapi[EvgSetColor] = &CTLVRenderer::DvgSetColorL;
+ vgapi[EvgSetPaint] = &CTLVRenderer::DvgSetPaintL;
+ vgapi[EvgLoadMatrix] = &CTLVRenderer::DvgLoadMatrixL;
+ vgapi[EvgMultMatrix] = &CTLVRenderer::DvgMultMatrixL;
+ vgapi[EvgLoadIdentity] = &CTLVRenderer::DvgLoadIdentityL;
+ vgapi[EvgScale] = &CTLVRenderer::DvgScaleL;
+ vgapi[EvgTranslate] = &CTLVRenderer::DvgTranslateL;
+ vgapi[EvgAppendPathData] = &CTLVRenderer::DvgAppendPathDataL;
+ vgapi[EvgDrawPath] = &CTLVRenderer::DvgDrawPathL;
+ vgapi[EvgClearPath] = &CTLVRenderer::DvgClearPathL;
+ vgapi[EvguRect] = &CTLVRenderer::DvguRectL;
+ vgapi[EvguEllipse] = &CTLVRenderer::DvguEllipseL;
+ vgapi[EvguRoundRect] = &CTLVRenderer::DvguRoundRectL;
+ vgapi[EvguLine] = &CTLVRenderer::DvguLineL;
+ vgapi[EvgCreatePaint] = &CTLVRenderer::DvgCreatePaintL;
+ vgapi[EvgSetiv] = &CTLVRenderer::DvgSetivL;
+ vgapi[EvgClear] = &CTLVRenderer::DvgClearL;
+ vgapi[EvgSetfv] = &CTLVRenderer::DvgSetfvL;
+ vgapi[EvgRotate] = &CTLVRenderer::DvgRotateL;
+ vgapi[EvgCreatePath] = &CTLVRenderer::DvgCreatePathL;
+ vgapi[EvgCreateImage] = &CTLVRenderer::DvgCreateImageL;
+ vgapi[EvgGetPixels] = &CTLVRenderer::DvgGetPixelsL;
+ vgapi[EvgDrawImage] = &CTLVRenderer::DvgDrawImageL;
+ vgapi[EvgClearImage] = &CTLVRenderer::DvgClearImageL;
+ vgapi[EvgImageSubData] = &CTLVRenderer::DvgImageSubDataL;
+ vgapi[EvgDestroyImage] = &CTLVRenderer::DvgDestroyImageL;
+ vgapi[EvgDestroyPaint] = &CTLVRenderer::DvgDestroyPaintL;
+ vgapi[EvgDestroyPath] = &CTLVRenderer::DvgDestroyPathL;
+ vgapi[EvgPrepareToBindImage]= &CTLVRenderer::DvgPrepareToBindImageL;
+ vgapi[EvgBindImage] = &CTLVRenderer::DvgBindImageL;
+ vgapi[EvgUnBindImage] = &CTLVRenderer::DvgUnBindImageL;
+ vgapi[EvgFlush] = &CTLVRenderer::DvgFlushL;
vgGetMatrix(iUserMatrix);