Apache OpenOffice (AOO) Bugzilla – Issue 10070
OOO_STABLE_1_PORTS/X11: vcl libxrender & font discovery fixes
Last modified: 2004-03-25 07:43:15 UTC
Clean up our libxrender loading code and add our TrueType font discovery hack.
Created attachment 4028 [details] cd to SRC_ROOT/vcl, patch -p0 < /path/to/patchfile. Cleans up libXrender loading and adds TrueType Font discovery fix
Correction: vcl.xrender.OOO_STABLE_1_PORTS.121402.patch should be applied with: cd to vcl/unx/source/gdi patch -p0 < /path/to/patchfile Dan
Please approve the vcl 121402 patch for integration into OOO_STABLE_1_PORTS. Dan
Hi Dan, the patch looks good, is entirely MACOSX specific, and is thus approved. Removing the 'approval_pending' keyword. Just go ahead. Matthias
Committed to OOO_STABLE_1_PORTS. Added keyword merge pending.
Hi, I'd love to have the MACOSX and UNIX code converge to reduce maintenance work in the future. What do you think of http://gsl.openoffice.org/source/browse/gsl/vcl/unx/source/gdi/gcach_xpeer.cxx?rev=1.27&content-type=text/x-cvsweb-markup With the one exception for XRenderCompositeString32 vs. XRenderCompositeString16 everything should be mergeable.
Herbert, Why don't you go ahead and make the switch. Remember that we need a #ifdef MACOSX/#endif around the #include <dlfcn.h> because we're not using that header. We'll test and notify/commit changes as necessary. With the XRenderCompositeString32(), is there any reason why we cannot use this on Darwin? It _is_ exported from our libXrender.dylib, so we should be able to call it. Anyway, don't bother changing the 32->16, we will test and modify if necessary. Dan
The #include <dlfcn.h> is no longer needed with OSL loading. I forgot to remove it when I merged the two branches. I suggest to keep XRenderCompositeString16 until the ports branch moves to SRX644. I have yet to see a font with more than 65k glyphs, but with non-BMP code handling becoming mandatory in some locales we should be prepared. Does the attached gcach_xpeer.cxx work on OSX?
Created attachment 4067 [details] Suggested merge of OSX and UNX gcach_xpeer.cxx
I believe the Mac OS X section is around the wrong code... The XRenderCompositeString16 is for X and the 32 for non Mac OS X, right? I have attached the corrected file. I have verified that it does indeed compile with my changes (ie the CompositeString16 for OS X and 32 for others) and does indeed work correctly at run-time. dAn
Created attachment 4069 [details] place file in vcl/unx/source/gdi
2002-12-17 01:14 PST file contains my changes and is verified to compile and operate correctly on OS X. dan
Great. Since I cannot check in directly into head I'll put it into a child workspace which will be promoted to head in a couple of days. Please tag it with the ports tag then.
close issue.