Fixed the bugs related to CFF & merged to upstream

did this get changed to if(TTF) ?