pango 3.0.7-x86-mingw32 → 3.0.8-x86-mingw32

data/vendor/local/include/layout/LETableReference.h

@@ -179,6 +179,18 @@ public:
     return fLength;
   }
 
+  /**
+  * Throw an error if size*count overflows
+  */
+  size_t verifyLength(size_t offset, size_t size, le_uint32 count, LEErrorCode &success) {
+    if(count!=0 && size>LE_UINT32_MAX/count) {
+      LE_DEBUG_TR3("verifyLength failed size=%u, count=%u", size, count);
+      success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
+      return 0;
+    }
+    return verifyLength(offset, size*count, success);
+  }
+
   /**
    * Change parent link to another
    */
@@ -269,7 +281,7 @@ public:
       if(count == LE_UNBOUNDED_ARRAY) { // not a known length
         count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
       }
-      LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
+      LETableReference::verifyLength(0, LETableVarSizer<T>::getSize(), fCount, success);
     }
     if(LE_FAILURE(success)) {
       fCount=0;
@@ -284,7 +296,7 @@ LE_TRACE_TR("INFO: new RTAO")
       if(count == LE_UNBOUNDED_ARRAY) { // not a known length
         count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
       }
-      LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
+      LETableReference::verifyLength(0, LETableVarSizer<T>::getSize(), fCount, success);
     }
     if(LE_FAILURE(success)) clear();
   }
@@ -295,7 +307,7 @@ LE_TRACE_TR("INFO: new RTAO")
       if(count == LE_UNBOUNDED_ARRAY) { // not a known length
         count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
       }
-      LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
+      LETableReference::verifyLength(0, LETableVarSizer<T>::getSize(), fCount, success);
     }
     if(LE_FAILURE(success)) clear();
   }

data/vendor/local/include/pango-1.0/pango/pango-attributes.h

@@ -75,6 +75,7 @@ typedef struct _PangoAttrFloat    PangoAttrFloat;
 typedef struct _PangoAttrColor    PangoAttrColor;
 typedef struct _PangoAttrFontDesc PangoAttrFontDesc;
 typedef struct _PangoAttrShape    PangoAttrShape;
+typedef struct _PangoAttrFontFeatures PangoAttrFontFeatures;
 
 /**
  * PANGO_TYPE_ATTR_LIST:
@@ -135,6 +136,9 @@ typedef struct _PangoAttrIterator PangoAttrIterator;
  * @PANGO_ATTR_ABSOLUTE_SIZE: font size in pixels scaled by %PANGO_SCALE (#PangoAttrInt)
  * @PANGO_ATTR_GRAVITY: base text gravity (#PangoAttrInt)
  * @PANGO_ATTR_GRAVITY_HINT: gravity hint (#PangoAttrInt)
+ * @PANGO_ATTR_FONT_FEATURES: OpenType font features (#PangoAttrString). Since 1.38
+ * @PANGO_ATTR_FOREGROUND_ALPHA: foreground alpha (#PangoAttrInt). Since 1.38
+ * @PANGO_ATTR_BACKGROUND_ALPHA: background alpha (#PangoAttrInt). Since 1.38
  *
  * The #PangoAttrType
  * distinguishes between different types of attributes. Along with the
@@ -167,7 +171,10 @@ typedef enum
   PANGO_ATTR_STRIKETHROUGH_COLOR,/* PangoAttrColor */
   PANGO_ATTR_ABSOLUTE_SIZE,	/* PangoAttrSize */
   PANGO_ATTR_GRAVITY,		/* PangoAttrInt */
-  PANGO_ATTR_GRAVITY_HINT	/* PangoAttrInt */
+  PANGO_ATTR_GRAVITY_HINT,	/* PangoAttrInt */
+  PANGO_ATTR_FONT_FEATURES,	/* PangoAttrString */
+  PANGO_ATTR_FOREGROUND_ALPHA,	/* PangoAttrInt */
+  PANGO_ATTR_BACKGROUND_ALPHA	/* PangoAttrInt */
 } PangoAttrType;
 
 /**
@@ -406,6 +413,22 @@ struct _PangoAttrFontDesc
   PangoFontDescription *desc;
 };
 
+/**
+ * PangoAttrFontFeatures:
+ * @attr: the common portion of the attribute
+ * @features: the featues, as a string in CSS syntax
+ *
+ * The #PangoAttrFontFeatures structure is used to represent OpenType
+ * font features as an attribute.
+ *
+ * Since: 1.38
+ */
+struct _PangoAttrFontFeatures
+{
+  PangoAttribute attr;
+  gchar *features;
+};
+
 PangoAttrType         pango_attr_type_register (const gchar        *name);
 const char *          pango_attr_type_get_name (PangoAttrType       type) G_GNUC_CONST;
 
@@ -456,6 +479,9 @@ PangoAttribute *pango_attr_shape_new_with_data (const PangoRectangle       *ink_
 
 PangoAttribute *pango_attr_gravity_new      (PangoGravity     gravity);
 PangoAttribute *pango_attr_gravity_hint_new (PangoGravityHint hint);
+PangoAttribute *pango_attr_font_features_new (const gchar *features);
+PangoAttribute *pango_attr_foreground_alpha_new (guint16 alpha);
+PangoAttribute *pango_attr_background_alpha_new (guint16 alpha);
 
 GType              pango_attr_list_get_type      (void) G_GNUC_CONST;
 PangoAttrList *    pango_attr_list_new           (void);

data/vendor/local/include/pango-1.0/pango/pango-engine.h

@@ -32,15 +32,13 @@ G_BEGIN_DECLS
 
 #ifdef PANGO_ENABLE_ENGINE
 
-/* Module API */
-
-#include <gmodule.h>
-
 /**
  * PANGO_RENDER_TYPE_NONE:
  *
  * A string constant defining the render type
  * for engines that are not rendering-system specific.
+ *
+ * Deprecated: 1.38
  */
 #define PANGO_RENDER_TYPE_NONE "PangoRenderNone"
 
@@ -59,6 +57,8 @@ typedef struct _PangoEngineClass PangoEngineClass;
  *
  * #PangoEngine is the base class for all types of language and
  * script specific engines. It has no functionality by itself.
+ *
+ * Deprecated: 1.38
  **/
 struct _PangoEngine
 {
@@ -70,6 +70,8 @@ struct _PangoEngine
  * PangoEngineClass:
  *
  * Class structure for #PangoEngine
+ *
+ * Deprecated: 1.38
  **/
 struct _PangoEngineClass
 {
@@ -84,6 +86,8 @@ GType pango_engine_get_type (void) G_GNUC_CONST;
  *
  * A string constant defining the engine type for language engines.
  * These engines derive from #PangoEngineLang.
+ *
+ * Deprecated: 1.38
  */
 #define PANGO_ENGINE_TYPE_LANG "PangoEngineLang"
 
@@ -105,6 +109,8 @@ typedef struct _PangoEngineLangClass PangoEngineLangClass;
  * instance, a custom #PangoEngineLang could be provided for
  * Thai to implement the dictionary-based word boundary
  * lookups needed for that language.
+ *
+ * Deprecated: 1.38
  **/
 struct _PangoEngineLang
 {
@@ -114,14 +120,16 @@ struct _PangoEngineLang
 
 /**
  * PangoEngineLangClass:
- * @script_break: Provides a custom implementation of pango_break().
- * If %NULL, pango_default_break() is used instead. If not %NULL, for
- * Pango versions before 1.16 (module interface version before 1.6.0),
- * this was called instead of pango_default_break(), but in newer versions,
- * pango_default_break() is always called and this is called after that to
- * allow tailoring the breaking results.
+ * @script_break: (nullable): Provides a custom implementation of
+ * pango_break().  If %NULL, pango_default_break() is used instead. If
+ * not %NULL, for Pango versions before 1.16 (module interface version
+ * before 1.6.0), this was called instead of pango_default_break(),
+ * but in newer versions, pango_default_break() is always called and
+ * this is called after that to allow tailoring the breaking results.
  *
  * Class structure for #PangoEngineLang
+ *
+ * Deprecated: 1.38
  **/
 struct _PangoEngineLangClass
 {
@@ -144,6 +152,8 @@ GType pango_engine_lang_get_type (void) G_GNUC_CONST;
  *
  * A string constant defining the engine type for shaping engines.
  * These engines derive from #PangoEngineShape.
+ *
+ * Deprecated: 1.38
  */
 #define PANGO_ENGINE_TYPE_SHAPE "PangoEngineShape"
 
@@ -167,6 +177,8 @@ typedef struct _PangoEngineShapeClass PangoEngineShapeClass;
  * and to a particular script. For instance, there is one
  * #PangoEngineShape implementation to handle shaping Arabic
  * for Fontconfig-based backends.
+ *
+ * Deprecated: 1.38
  **/
 struct _PangoEngineShape
 {
@@ -197,6 +209,8 @@ struct _PangoEngineShape
  *   font itself unmodified.
  *
  * Class structure for #PangoEngineShape
+ *
+ * Deprecated: 1.38
  **/
 struct _PangoEngineShapeClass
 {
@@ -239,6 +253,8 @@ typedef struct _PangoEngineScriptInfo PangoEngineScriptInfo;
  *
  * The #PangoEngineScriptInfo structure contains
  * information about how the shaper covers a particular script.
+ *
+ * Deprecated: 1.38
  */
 struct _PangoEngineScriptInfo
 {
@@ -256,6 +272,8 @@ struct _PangoEngineScriptInfo
  *
  * The #PangoEngineInfo structure contains information about a particular
  * engine. It contains the following fields:
+ *
+ * Deprecated: 1.38
  */
 struct _PangoEngineInfo
 {
@@ -271,14 +289,11 @@ struct _PangoEngineInfo
  * @engines: location to store a pointer to an array of engines.
  * @n_engines: location to store the number of elements in @engines.
  *
- * Function to be provided by a module to list the engines that the
- * module supplies. The function stores a pointer to an array
- * of #PangoEngineInfo structures and the length of that array in
- * the given location.
+ * Do not use.
  *
- * Note that script_engine_init() will not be called before this
- * function.
+ * Deprecated: 1.38
  **/
+G_DEPRECATED
 void script_engine_list (PangoEngineInfo **engines,
 			 int              *n_engines);
 
@@ -287,33 +302,33 @@ void script_engine_list (PangoEngineInfo **engines,
  * @module: a #GTypeModule structure used to associate any
  *  GObject types created in this module with the module.
  *
- * Function to be provided by a module to register any
- * GObject types in the module.
+ * Do not use.
+ *
+ * Deprecated: 1.38
  **/
+G_DEPRECATED
 void script_engine_init (GTypeModule *module);
 
 
 /**
  * script_engine_exit:
  *
- * Function to be provided by the module that is called
- * when the module is unloading. Frequently does nothing.
+ * Do not use.
+ *
+ * Deprecated: 1.38
  **/
+G_DEPRECATED
 void script_engine_exit (void);
 
 /**
  * script_engine_create:
  * @id: the ID of an engine as reported by script_engine_list.
  *
- * Function to be provided by the module to create an instance
- * of one of the engines implemented by the module.
+ * Do not use.
  *
- * Return value: a newly created #PangoEngine of the specified
- *  type, or %NULL if an error occurred. (In normal operation,
- *  a module should not return %NULL. A %NULL return is only
- *  acceptable in the case where system misconfiguration or
- *  bugs in the driver routine are encountered.)
+ * Deprecated: 1.38
  **/
+G_DEPRECATED
 PangoEngine *script_engine_create (const char *id);
 
 /* Utility macro used by PANGO_ENGINE_LANG_DEFINE_TYPE and
@@ -347,8 +362,8 @@ prefix ## _register_type (GTypeModule *module)				  \
  * PANGO_ENGINE_LANG_DEFINE_TYPE:
  * @name: Name of the the type to register (for example:, <literal>ArabicEngineFc</literal>
  * @prefix: Prefix for symbols that will be defined (for example:, <literal>arabic_engine_fc</literal>
- * @class_init: Class initialization function for the new type, or %NULL
- * @instance_init: Instance initialization function for the new type, or %NULL
+ * @class_init: (nullable): Class initialization function for the new type, or %NULL
+ * @instance_init: (nullable): Instance initialization function for the new type, or %NULL
  *
  * Outputs the necessary code for GObject type registration for a
  * #PangoEngineLang class defined in a module. Two static symbols
@@ -367,6 +382,8 @@ prefix ## _register_type (GTypeModule *module)				  \
  * <informalexample><programlisting>
  *  PangoEngine *engine = g_object_new (<replaceable>prefix</replaceable>_type, NULL);
  * </programlisting></informalexample>
+ *
+ * Deprecated: 1.38
  **/
 #define PANGO_ENGINE_LANG_DEFINE_TYPE(name, prefix, class_init, instance_init)	\
   PANGO_ENGINE_DEFINE_TYPE (name, prefix,				\
@@ -377,8 +394,8 @@ prefix ## _register_type (GTypeModule *module)				  \
  * PANGO_ENGINE_SHAPE_DEFINE_TYPE:
  * @name: Name of the the type to register (for example:, <literal>ArabicEngineFc</literal>
  * @prefix: Prefix for symbols that will be defined (for example:, <literal>arabic_engine_fc</literal>
- * @class_init: Class initialization function for the new type, or %NULL
- * @instance_init: Instance initialization function for the new type, or %NULL
+ * @class_init: (nullable): Class initialization function for the new type, or %NULL
+ * @instance_init: (nullable): Instance initialization function for the new type, or %NULL
  *
  * Outputs the necessary code for GObject type registration for a
  * #PangoEngineShape class defined in a module. Two static symbols
@@ -397,6 +414,8 @@ prefix ## _register_type (GTypeModule *module)				  \
  * <informalexample><programlisting>
  *  PangoEngine *engine = g_object_new (<replaceable>prefix</replaceable>_type, NULL);
  * </programlisting></informalexample>
+ *
+ * Deprecated: 1.38
  **/
 #define PANGO_ENGINE_SHAPE_DEFINE_TYPE(name, prefix, class_init, instance_init)	\
   PANGO_ENGINE_DEFINE_TYPE (name, prefix,				\

data/vendor/local/include/pango-1.0/pango/pango-features.h

@@ -3,10 +3,10 @@
 #define PANGO_FEATURES_H
 
 #define PANGO_VERSION_MAJOR 1
-#define PANGO_VERSION_MINOR 36
-#define PANGO_VERSION_MICRO 8
+#define PANGO_VERSION_MINOR 40
+#define PANGO_VERSION_MICRO 0
 
-#define PANGO_VERSION_STRING "1.36.8"
+#define PANGO_VERSION_STRING "1.40.0"
 
 
 #endif

data/vendor/local/include/pango-1.0/pango/pango-font.h

@@ -299,6 +299,7 @@ PangoFontMetrics *pango_font_metrics_new (void);
 
 struct _PangoFontMetrics
 {
+  /* <private> */
   guint ref_count;
 
   int ascent;

data/vendor/local/include/pango-1.0/pango/pango-glyph-item.h

@@ -31,6 +31,8 @@ G_BEGIN_DECLS
 
 /**
  * PangoGlyphItem:
+ * @item: corresponding #PangoItem.
+ * @glyphs: corresponding #PangoGlyphString.
  *
  * A #PangoGlyphItem is a pair of a #PangoItem and the glyphs
  * resulting from shaping the text corresponding to an item.

data/vendor/local/include/pango-1.0/pango/pango-glyph.h

@@ -107,6 +107,11 @@ struct _PangoGlyphInfo
  */
 /**
  * PangoGlyphString:
+ * @num_glyphs: number of the glyphs in this glyph string.
+ * @glyphs: (array length=num_glyphs): array of glyph information
+ *          for the glyph string.
+ * @log_clusters: logical cluster info, indexed by the byte index
+ *                within the text corresponding to the glyph string.
  *
  * The #PangoGlyphString structure is used to store strings
  * of glyphs with geometry and visual attribute information.

data/vendor/local/include/pango-1.0/pango/pango-item.h

@@ -82,6 +82,10 @@ struct _PangoAnalysis
 
 /**
  * PangoItem:
+ * @offset: byte offset of the start of this item in text.
+ * @length: length of this item in bytes.
+ * @num_chars: number of Unicode characters in the item.
+ * @analysis: analysis results for the item.
  *
  * The #PangoItem structure stores information about a segment of text.
  */

data/vendor/local/include/pango-1.0/pango/pango-layout.h

@@ -96,8 +96,11 @@ typedef enum {
 
 /**
  * PangoLayoutLine:
+ * @layout: (allow-none): the layout this line belongs to, might be %NULL
  * @start_index: start of line as byte index into layout->text
  * @length: length of line in bytes
+ * @runs: (allow-none) (element-type: Pango.LayoutRun): list of runs in the
+ *        line, from left to right
  * @is_paragraph_start: #TRUE if this is the first line of the paragraph
  * @resolved_dir: #Resolved PangoDirection of line
  *

data/vendor/local/include/pango-1.0/pango/pango-matrix.h

@@ -110,6 +110,8 @@ void pango_matrix_transform_rectangle (const PangoMatrix *matrix,
 void pango_matrix_transform_pixel_rectangle (const PangoMatrix *matrix,
 					     PangoRectangle    *rect);
 double pango_matrix_get_font_scale_factor (const PangoMatrix *matrix) G_GNUC_PURE;
+void pango_matrix_get_font_scale_factors (const PangoMatrix *matrix,
+					  double *xscale, double *yscale);
 
 
 G_END_DECLS

data/vendor/local/include/pango-1.0/pango/pango-modules.h

@@ -43,6 +43,8 @@ typedef struct _PangoIncludedModule PangoIncludedModule;
  * The #PangoIncludedModule structure for a statically linked module
  * contains the functions that would otherwise be loaded from a dynamically
  * loaded module.
+ *
+ * Deprecated: 1.38
  */
 struct _PangoIncludedModule
 {
@@ -53,15 +55,19 @@ struct _PangoIncludedModule
   PangoEngine *(*create) (const char       *id);
 };
 
+G_DEPRECATED
 PangoMap *     pango_find_map        (PangoLanguage       *language,
 				      guint                engine_type_id,
 				      guint                render_type_id);
+G_DEPRECATED
 PangoEngine *  pango_map_get_engine  (PangoMap            *map,
 				      PangoScript          script);
+G_DEPRECATED
 void           pango_map_get_engines (PangoMap            *map,
 				      PangoScript          script,
 				      GSList             **exact_engines,
 				      GSList             **fallback_engines);
+G_DEPRECATED
 void           pango_module_register (PangoIncludedModule *module);
 
 #endif /* PANGO_ENABLE_BACKEND */

data/vendor/local/include/pango-1.0/pango/pango-ot.h

@@ -212,13 +212,16 @@ struct _PangoOTFeatureMap
  * PangoOTRulesetDescription:
  * @script: a #PangoScript.
  * @language: a #PangoLanguage.
- * @static_gsub_features: static map of GSUB features, or %NULL.
+ * @static_gsub_features: (nullable): static map of GSUB features,
+ * or %NULL.
  * @n_static_gsub_features: length of @static_gsub_features, or 0.
- * @static_gpos_features: static map of GPOS features, or %NULL.
+ * @static_gpos_features: (nullable): static map of GPOS features,
+ * or %NULL.
  * @n_static_gpos_features: length of @static_gpos_features, or 0.
- * @other_features: map of extra features to add to both GSUB and GPOS, or %NULL.
- * Unlike the static maps, this pointer need not live beyond
- * the life of function calls taking this struct.
+ * @other_features: (nullable): map of extra features to add to both
+ * GSUB and GPOS, or %NULL.  Unlike the static maps, this pointer
+ * need not live beyond the life of function calls taking this
+ * struct.
  * @n_other_features: length of @other_features, or 0.
  *
  * The #PangoOTRuleset structure holds all the information needed