Re: pango_font_map_changed()



On 13-04-26 01:00 PM, John Emmas wrote:
On 25/04/2013 20:23, Behdad Esfahbod wrote:
Just remove the "return" please.

Thanks Behdad.  I'll pick up your fixed version as soon as possible.

BTW - MSVC has flagged up an issue in modules/basic/basic-win32.c (at line
819, which looks like this):-

        class->script_shape = basic_engine_shape;

'class->script_shape' (a function pointer) is set to the address of
'basic_engine_shape'.  However, the two functions have different parameter
lists.  'script_shape' expects a function looking like this:-

        void (*script_shape) (PangoEngineShape    *engine,
                  PangoFont           *font,
                  const char          *item_text,
                  unsigned int         item_length,
                  const PangoAnalysis *analysis,
                  PangoGlyphString    *glyphs,
                  const char          *paragraph_text,
                  unsigned int         paragraph_length);

whereas 'basic_engine_shape' actually looks like this:-

        static void
        basic_engine_shape (PangoEngineShape     *engine,
                    PangoFont            *font,
                    const char           *text,
                    int                   length,
                    const PangoAnalysis *analysis,
                    PangoGlyphString    *glyphs)

I think the same problem exists elsewhere (in 'basic_coretext.c') although
'basic_fc.c' seems to be correct.  Is this a work in progress maybe?

Yes and no.  I changed the script_shape API to pass down two extra variables.
 Shapers that are not updated to use these new values will work the way they
used to, thanks to the C calling convention.

Simple fix would be to update those function signatures to receive the two
extra arguments and don't do anything to them.  I'll fix them now.

-- 
behdad
http://behdad.org/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]