diff -r 57c618273d5c -r bbf46f59e123 fbs/fontandbitmapserver/sfbs/FBSBMP.CPP --- a/fbs/fontandbitmapserver/sfbs/FBSBMP.CPP Thu Aug 19 11:11:18 2010 +0300 +++ b/fbs/fontandbitmapserver/sfbs/FBSBMP.CPP Tue Aug 31 16:31:06 2010 +0300 @@ -23,7 +23,7 @@ #include "fbshelper.h" #include "fbsrasterizer.h" #include "BitwiseBitmap.inl" -#include "fbsmessage.h" +#include "FbsMessage.H" #include "bitmapconst.h" #include "OstTraceDefinitions.h" #include "fbstrace.h" @@ -569,12 +569,7 @@ IsFileInRom(aFileName, rompointer); TBool romPointerValid; err = DoLoadFromRom(rompointer, aId, aFileOffset, romPointerValid); - if(romPointerValid) - { - FBS_OST(OstTrace1( TRACE_ERROR, CFBSBITMAP_LOAD2_ERROR2, "! this=0x%08x; romPointerValid", (TUint)this);) - err = KErrCouldNotConnect; - } - else + if(!romPointerValid) { _LIT(KResourcePath, "?:\\Resource\\*"); TInt match = aFileName.MatchF(KResourcePath);