Commit 24697b9c authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

Bug 21907: Fix runtime error on CentOS 6 

In Mozilla bug 1324780, support for building with glib 2.28 (the version
available in CentOS 6) was added. However we are building on Debian
Wheezy which has glib 2.32. We fix that by backing out all glib > 2.28
code paths.
parent 10f693ae

gfx/harfbuzz/src/hb-glib.cc

+0 −41
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "hb-unicode-private.hh"





#if !GLIB_CHECK_VERSION(2,29,14)

static const hb_script_t

glib_script_to_script[] =

{
@@ -155,14 +154,10 @@ glib_script_to_script[] = 
  HB_SCRIPT_SORA_SOMPENG,

  HB_SCRIPT_TAKRI

};

#endif



hb_script_t

hb_glib_script_to_script (GUnicodeScript script)

{

#if GLIB_CHECK_VERSION(2,29,14)

  return (hb_script_t) g_unicode_script_to_iso15924 (script);

#else

  if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script)))

    return glib_script_to_script[script];
@@ -170,15 +165,11 @@ hb_glib_script_to_script (GUnicodeScript script) 
    return HB_SCRIPT_INVALID;



  return HB_SCRIPT_UNKNOWN;

#endif

}



GUnicodeScript

hb_glib_script_from_script (hb_script_t script)

{

#if GLIB_CHECK_VERSION(2,29,14)

  return g_unicode_script_from_iso15924 (script);

#else

  unsigned int count = ARRAY_LENGTH (glib_script_to_script);

  for (unsigned int i = 0; i < count; i++)

    if (glib_script_to_script[i] == script)
@@ -188,7 +179,6 @@ hb_glib_script_from_script (hb_script_t script) 
    return G_UNICODE_SCRIPT_INVALID_CODE;



  return G_UNICODE_SCRIPT_UNKNOWN;

#endif

}
@@ -243,10 +233,6 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, 
			 hb_codepoint_t     *ab,

			 void               *user_data HB_UNUSED)

{

#if GLIB_CHECK_VERSION(2,29,12)

  return g_unichar_compose (a, b, ab);

#endif



  /* We don't ifdef-out the fallback code such that compiler always

   * sees it and makes sure it's compilable. */
@@ -280,10 +266,6 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, 
			   hb_codepoint_t     *b,

			   void               *user_data HB_UNUSED)

{

#if GLIB_CHECK_VERSION(2,29,12)

  return g_unichar_decompose (ab, a, b);

#endif



  /* We don't ifdef-out the fallback code such that compiler always

   * sees it and makes sure it's compilable. */
@@ -339,10 +321,6 @@ hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, 
					 hb_codepoint_t     *decomposed,

					 void               *user_data HB_UNUSED)

{

#if GLIB_CHECK_VERSION(2,29,12)

  return g_unichar_fully_decompose (u, true, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN);

#endif



  /* If the user doesn't have GLib >= 2.29.12 we have to perform

   * a round trip to UTF-8 and the associated memory management dance. */

  gchar utf8[6];
@@ -381,22 +359,3 @@ hb_glib_get_unicode_funcs (void) 


  return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs);

}
 


#if GLIB_CHECK_VERSION(2,31,10)

/**

 * hb_glib_blob_create:

 *

 * Since: 0.9.38

 **/

hb_blob_t *

hb_glib_blob_create (GBytes *gbytes)

{

  gsize size = 0;

  gconstpointer data = g_bytes_get_data (gbytes, &size);

  return hb_blob_create ((const char *) data,

			 size,

			 HB_MEMORY_MODE_READONLY,

			 g_bytes_ref (gbytes),

			 (hb_destroy_func_t) g_bytes_unref);

}

#endif

gfx/harfbuzz/src/hb-glib.h

+0 −5
Original line number Diff line number Diff line
@@ -46,11 +46,6 @@ hb_glib_script_from_script (hb_script_t script); 
HB_EXTERN hb_unicode_funcs_t *

hb_glib_get_unicode_funcs (void);



#if GLIB_CHECK_VERSION(2,31,10)

HB_EXTERN hb_blob_t *

hb_glib_blob_create (GBytes *gbytes);

#endif



HB_END_DECLS



#endif /* HB_GLIB_H */