rpms/openoffice.org/devel openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.14, 1.15

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18772

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
add a little test to the cairo and gdk hintint patch

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	16 Apr 2007 10:06:28 -0000	1.14
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	14 Aug 2007 09:45:18 -0000	1.15
@@ -1098,7 +1098,7 @@
      void FcDefaultSubstitute( FcPattern* pPattern )
      { m_pFcDefaultSubstitute( pPattern ); }
      FcPattern* FcFontSetMatch( FcConfig* pConfig, FcFontSet **ppFontSet, int nset, FcPattern* pPattern, FcResult* pResult )
-@@ -774,14 +777,18 @@
+@@ -774,14 +777,19 @@
      rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
  
      FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
@@ -1106,7 +1106,8 @@
 +    int hintstyle = FC_HINT_FULL, rgba = FC_RGBA_UNKNOWN;
  
      rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchFont );
-+    if (const cairo_font_options_t *pOptions = gdk_screen_get_font_options(gdk_screen_get_default()))
++    GdkScreen *pScreen = gdk_screen_get_default();
++    if (const cairo_font_options_t *pOptions = pScreen ? gdk_screen_get_font_options(pScreen) : 0)
 +	cairo_ft_font_options_substitute(pOptions, pPattern);
      rWrapper.FcDefaultSubstitute( pPattern );
      FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pPattern, FC_EMBEDDED_BITMAP, 0, &embitmap );