summaryrefslogtreecommitdiff
path: root/cogl-pango
diff options
context:
space:
mode:
Diffstat (limited to 'cogl-pango')
-rw-r--r--cogl-pango/cogl-pango-glyph-cache.c6
-rw-r--r--cogl-pango/cogl-pango-pipeline-cache.c6
-rw-r--r--cogl-pango/cogl-pango-pipeline-cache.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/cogl-pango/cogl-pango-glyph-cache.c b/cogl-pango/cogl-pango-glyph-cache.c
index 5ddb4acd..b7fb5b04 100644
--- a/cogl-pango/cogl-pango-glyph-cache.c
+++ b/cogl-pango/cogl-pango-glyph-cache.c
@@ -173,7 +173,7 @@ cogl_pango_glyph_cache_free (CoglPangoGlyphCache *cache)
static void
cogl_pango_glyph_cache_update_position_cb (void *user_data,
- CoglHandle new_texture,
+ CoglTexture *new_texture,
const CoglRectangleMapEntry *rect)
{
CoglPangoGlyphCacheValue *value = user_data;
@@ -204,7 +204,7 @@ cogl_pango_glyph_cache_add_to_global_atlas (CoglPangoGlyphCache *cache,
PangoGlyph glyph,
CoglPangoGlyphCacheValue *value)
{
- CoglTexture *texture;
+ CoglAtlasTexture *texture;
if (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_SHARED_ATLAS))
return FALSE;
@@ -222,7 +222,7 @@ cogl_pango_glyph_cache_add_to_global_atlas (CoglPangoGlyphCache *cache,
if (texture == NULL)
return FALSE;
- value->texture = texture;
+ value->texture = COGL_TEXTURE (texture);
value->tx1 = 0;
value->ty1 = 0;
value->tx2 = 1;
diff --git a/cogl-pango/cogl-pango-pipeline-cache.c b/cogl-pango/cogl-pango-pipeline-cache.c
index 5a2e2ecd..e07d6468 100644
--- a/cogl-pango/cogl-pango-pipeline-cache.c
+++ b/cogl-pango/cogl-pango-pipeline-cache.c
@@ -54,7 +54,7 @@ struct _CoglPangoPipelineCacheEntry
CoglTexture *texture;
/* This will only take a weak reference */
- CoglHandle pipeline;
+ CoglPipeline *pipeline;
};
static void
@@ -173,7 +173,7 @@ pipeline_destroy_notify_cb (void *user_data)
CoglPipeline *
_cogl_pango_pipeline_cache_get (CoglPangoPipelineCache *cache,
- CoglHandle texture)
+ CoglTexture *texture)
{
CoglPangoPipelineCacheEntry *entry;
PipelineDestroyNotifyData *destroy_data;
@@ -216,7 +216,7 @@ _cogl_pango_pipeline_cache_get (CoglPangoPipelineCache *cache,
destroy_data = g_slice_new (PipelineDestroyNotifyData);
destroy_data->cache = cache;
destroy_data->texture = texture;
- cogl_object_set_user_data (entry->pipeline,
+ cogl_object_set_user_data (COGL_OBJECT (entry->pipeline),
&pipeline_destroy_notify_key,
destroy_data,
pipeline_destroy_notify_cb);
diff --git a/cogl-pango/cogl-pango-pipeline-cache.h b/cogl-pango/cogl-pango-pipeline-cache.h
index d095c584..1ebfb67a 100644
--- a/cogl-pango/cogl-pango-pipeline-cache.h
+++ b/cogl-pango/cogl-pango-pipeline-cache.h
@@ -43,7 +43,7 @@ _cogl_pango_pipeline_cache_new (gboolean use_mipmapping);
to unref it */
CoglPipeline *
_cogl_pango_pipeline_cache_get (CoglPangoPipelineCache *cache,
- CoglHandle texture);
+ CoglTexture *texture);
void
_cogl_pango_pipeline_cache_free (CoglPangoPipelineCache *cache);