> Albrecht, I have coded up the "dynamic loading" of GetGlyphIndicesW  
> and it seems to work as before, on machines that *do* have  
> GetGlyphIndicesW...
> 
> Can you possibly test against a machine that does not, and see what  
> happens?

All,

Following Albrecht testing my patch with winNT yesterday, I pushed the
revised patch into 1.3.x svn last night.

However, I've been going around testing it on various different WinXX
machines here this morning (i.e. not the ones I have at home!) and on
some compilers (but not all!) the patched file fails to compile.

It's a very simple error, but I can't push the fix into svn from here
due to the vagaries of our firewall. If someone else can fix it...

Here's the details:

In file fl_font_win32.cxx, at line 234, I have:

  if(!fl_GetGlyphIndices) goto exit_error; // No GetGlyphIndices
function, use fallback mechanism instead

  // now convert the string to WCHAR and measure it
  unsigned len = fl_utf8toUtf16(c, n, ext_buff, wc_len);


The problem is line 237, the "unsigned len" declaration is potentially
crossed by the preceeding goto (line 234) so some compilers don't like
that (setting aside whether I should be using goto or not anyway...)

The fix would be to change line 237 to just:

   len = fl_utf8toUtf16(c, n, ext_buff, wc_len);

And add a separate defintion of "len" at line 228;

   unsigned len = 0;


Sorry... (again!)

-- 
Ian



SELEX Sensors and Airborne Systems Limited
Registered Office: Sigma House, Christopher Martin Road, Basildon, Essex SS14 
3EL
A company registered in England & Wales.  Company no. 02426132
********************************************************************
This email and any attachments are confidential to the intended
recipient and may also be privileged. If you are not the intended
recipient please delete it from your system and notify the sender.
You should not copy it or use it for any purpose nor disclose or
distribute its contents to any other person.
********************************************************************

_______________________________________________
fltk-dev mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-dev

Reply via email to