uigraphics/AknIcon/src/AknNvgFormatHandler.cpp
changeset 98 4c5ac0e85ed3
parent 0 05e9090e2422
equal deleted inserted replaced
80:3bd7be4c9278 98:4c5ac0e85ed3
   168 //
   168 //
   169 void CAknNvgFormatHandler::RenderPreparedIconL(CFbsBitmap* aBitmap,
   169 void CAknNvgFormatHandler::RenderPreparedIconL(CFbsBitmap* aBitmap,
   170         CFbsBitmap* aMask, TSize Bitmapsize, TDisplayMode Bitmapdepth,
   170         CFbsBitmap* aMask, TSize Bitmapsize, TDisplayMode Bitmapdepth,
   171         TDisplayMode Maskdepth, TRgb aColor, TBool aMarginFlag)
   171         TDisplayMode Maskdepth, TRgb aColor, TBool aMarginFlag)
   172     {
   172     {
       
   173     if(!iData)
       
   174         User::Leave(KErrNotFound);
   173     FormCommonHeader(aBitmap, EFalse, aColor, aMarginFlag);
   175     FormCommonHeader(aBitmap, EFalse, aColor, aMarginFlag);
   174     aBitmap->CreateExtendedBitmap(Bitmapsize, Bitmapdepth,
   176     aBitmap->CreateExtendedBitmap(Bitmapsize, Bitmapdepth,
   175             KUidNvgProprietaryFormat, iData->Ptr(), iData->Length());
   177             KUidNvgProprietaryFormat, iData->Ptr(), iData->Length());
   176 
   178 
   177     if (aMask)
   179     if (aMask)
   236 void CAknNvgFormatHandler::SupportedDisplayMode(
   238 void CAknNvgFormatHandler::SupportedDisplayMode(
   237     TDisplayMode& aMode, TDisplayMode aPreferredMode )
   239     TDisplayMode& aMode, TDisplayMode aPreferredMode )
   238     {
   240     {
   239     // Modes currently supported by SVG engine are:
   241     // Modes currently supported by SVG engine are:
   240     // EGray2, EColor4K, EColor64K, EColor16M
   242     // EGray2, EColor4K, EColor64K, EColor16M
   241     if ( aMode != EGray2 )
   243 //    if ( aMode != EGray2 ) EASK-824CMD:VGISymbianCopyToBitmap fails for bitmaps with EGray2 display modes.Modifying to create bitmaps with supported displaymodes
   242         {
   244         {
   243         aMode = aPreferredMode;
   245         aMode = aPreferredMode;
   244         }
   246         }
   245     }
   247     }
   246 
   248