[221/906] fix g_int_hash -> g_direct_hash

This commit is contained in:
Julien 2008-09-13 19:47:44 +02:00 committed by Tim-Philipp Müller
parent bb8ba84647
commit 5759b60ba3

View file

@ -133,7 +133,7 @@ gst_gl_display_init (GstGLDisplay *display, GstGLDisplayClass *klass)
display->win_ypos = 0; display->win_ypos = 0;
display->visible = FALSE; display->visible = FALSE;
display->isAlive = TRUE; display->isAlive = TRUE;
display->texture_pool = g_hash_table_new (g_int_hash, g_int_equal); display->texture_pool = g_hash_table_new (g_direct_hash, g_direct_equal);
//conditions //conditions
display->cond_create_context = g_cond_new (); display->cond_create_context = g_cond_new ();
@ -1859,9 +1859,9 @@ gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
//make a unique key from w and h //make a unique key from w and h
//the key cannot be w*h because (4*6 = 6*4 = 2*12 = 12*2) //the key cannot be w*h because (4*6 = 6*4 = 2*12 = 12*2)
guint key = width; guint key = (gint)width;
key <<= 16; key <<= 16;
key |= height; key |= (gint)height;
sub_texture_pool = g_hash_table_lookup (display->texture_pool, GUINT_TO_POINTER(key)); sub_texture_pool = g_hash_table_lookup (display->texture_pool, GUINT_TO_POINTER(key));
//if there is a sub texture pool associated to th given key //if there is a sub texture pool associated to th given key
@ -1908,9 +1908,9 @@ gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
//make a unique key from w and h //make a unique key from w and h
//the key cannot be w*h because (4*6 = 6*4 = 2*12 = 12*2) //the key cannot be w*h because (4*6 = 6*4 = 2*12 = 12*2)
guint key = width; guint key = (gint)width;
key <<= 16; key <<= 16;
key |= height; key |= (gint)height;
sub_texture_pool = g_hash_table_lookup (display->texture_pool, GUINT_TO_POINTER(key)); sub_texture_pool = g_hash_table_lookup (display->texture_pool, GUINT_TO_POINTER(key));
//if the size is known //if the size is known