rpms/openoffice.org/F-9 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.19, 1.20 openoffice.org.spec, 1.1473, 1.1474

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23485

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#443735 weird ass rendering for Sazanami fonts

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/F-9/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	23 Apr 2008 07:22:46 -0000	1.19
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	23 Apr 2008 08:46:47 -0000	1.20
@@ -610,7 +610,7 @@
  public: // TODO: cleanup
 -    std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontconfigNameToLocalized;
 +    FcResult FamilyFromPattern(FcPattern* pPattern, FcChar8 **family);
-+    std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aCanonicalToLocalized;
++    std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized;
 +    std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical;
  };
  
@@ -632,7 +632,7 @@
              m_pFcPatternAddCharSet			&&
              m_pFcPatternAddBool 			&&
              m_pFcPatternAddString
-@@ -512,54 +520,54 @@
+@@ -512,54 +520,53 @@
  
          return candidate;
      }
@@ -693,6 +693,7 @@
 -                    const char *candidate = (const char*)(aIter->second);
 -                    if (rtl_str_compare(candidate, (const char*)(*family)) != 0)
 -                        aFontconfigNameToLocalized[OString(candidate)] = OString((const char*)(*family));
+-                }
 +                ++k;
 +            }
 +            
@@ -707,11 +708,10 @@
 +            {
 +                const char *candidate = (const char*)(aIter->second);
 +                if (rtl_str_compare(candidate, (const char*)(*family)) != 0)
-+				{
-+                    m_aCanonicalToLocalized[OString(candidate)] = OString((const char*)(*family));
-+                    m_aLocalizedToCanonical[OString((const char*)(*family))] = OString(candidate);
-                 }
++                    m_aFontNameToLocalized[OString(candidate)] = OString((const char*)(*family));
              }
++            if (rtl_str_compare((const char*)origfamily, (const char*)(*family)) != 0)
++                m_aLocalizedToCanonical[OString((const char*)(*family))] = OString((const char*)origfamily);
          }
 -        
 -        return eFamilyRes;
@@ -724,7 +724,7 @@
  /*
   * PrintFontManager::initFontconfig
   */
-@@ -594,18 +602,16 @@
+@@ -594,18 +601,16 @@
              int weight = 0;
              int spacing = 0;
              int nCollectionEntry = -1;
@@ -745,7 +745,7 @@
              
              if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
                  continue;
-@@ -745,15 +751,6 @@
+@@ -745,15 +750,6 @@
                  {
                      pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 );
                  }
@@ -761,18 +761,18 @@
                  
                  // update font cache
                  m_pFontCache->updateFontCacheEntry( pUpdate, false );
-@@ -957,8 +954,8 @@
+@@ -957,8 +953,8 @@
              if( eFileRes == FcResultMatch )
              {
                  OString sFamily((sal_Char*)family);
 -                std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontconfigNameToLocalized.find(sFamily);
 -                if (aI != rWrapper.m_aFontconfigNameToLocalized.end())
-+                std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aCanonicalToLocalized.find(sFamily);
-+                if (aI != rWrapper.m_aCanonicalToLocalized.end())
++                std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily);
++                if (aI != rWrapper.m_aFontNameToLocalized.end())
                      sFamily = aI->second;
                  aName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 );
              }
-@@ -989,6 +986,106 @@
+@@ -989,6 +985,106 @@
      return aName;
  }
  
@@ -879,7 +879,7 @@
  bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale )
  {
      FontCfgWrapper& rWrapper = FontCfgWrapper::get();
-@@ -1014,9 +1111,10 @@
+@@ -1014,9 +1110,10 @@
      if( aLangAttrib.getLength() )
          rWrapper.FcPatternAddString( pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr() );
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1473
retrieving revision 1.1474
diff -u -r1.1473 -r1.1474
--- openoffice.org.spec	23 Apr 2008 07:22:46 -0000	1.1473
+++ openoffice.org.spec	23 Apr 2008 08:46:47 -0000	1.1474
@@ -2907,6 +2907,7 @@
 * Wed Apr 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.7
 - Resolves: rhbz#443356 fontconfig gives different results for "canonical"
   font name vs localized font name
+- Resolves: rhbz#443735 weird ass rendering for Sazanami fonts
 
 * Fri Apr 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
 - Resolves: rhbz#439727 find another crasher