From f8f81eae405e196fd7979d441964c13cf76c542d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 18 Aug 2008 17:19:06 +0200 Subject: [PATCH] [189/906] update vs8 build and fix some warnings that comes from vc8 --- gst/gl/effects/gstgleffectbulge.c | 4 ++-- gst/gl/effects/gstgleffectfisheye.c | 4 ++-- gst/gl/effects/gstgleffectglow.c | 16 ++++++++-------- gst/gl/effects/gstgleffectmirror.c | 4 ++-- gst/gl/effects/gstgleffectsquare.c | 4 ++-- gst/gl/effects/gstgleffectsqueeze.c | 4 ++-- gst/gl/effects/gstgleffectstretch.c | 4 ++-- gst/gl/effects/gstgleffecttunnel.c | 4 ++-- gst/gl/effects/gstgleffecttwirl.c | 4 ++-- gst/gl/gstgleffects.c | 6 +++--- gst/gl/gstglfilterblur.c | 26 +++++++++++++------------- gst/gl/gstglpixbufoverlay.c | 6 +++--- 12 files changed, 43 insertions(+), 43 deletions(-) diff --git a/gst/gl/effects/gstgleffectbulge.c b/gst/gl/effects/gstgleffectbulge.c index 5fe06fc..1a29352 100644 --- a/gst/gl/effects/gstgleffectbulge.c +++ b/gst/gl/effects/gstgleffectbulge.c @@ -49,8 +49,8 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); - gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); + gst_gl_shader_set_uniform_1f (shader, "width", (gfloat) width / 2.0f); + gst_gl_shader_set_uniform_1f (shader, "height", (gfloat) height / 2.0f); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectfisheye.c b/gst/gl/effects/gstgleffectfisheye.c index dee444a..a61c94b 100644 --- a/gst/gl/effects/gstgleffectfisheye.c +++ b/gst/gl/effects/gstgleffectfisheye.c @@ -49,8 +49,8 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture, gpointe gst_gl_shader_set_uniform_1i (shader, "tex", 0); - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); - gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); + gst_gl_shader_set_uniform_1f (shader, "width", (gfloat) width / 2.0f); + gst_gl_shader_set_uniform_1f (shader, "height", (gfloat) height / 2.0f); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectglow.c b/gst/gl/effects/gstgleffectglow.c index 460e64e..ba4a6e1 100644 --- a/gst/gl/effects/gstgleffectglow.c +++ b/gst/gl/effects/gstgleffectglow.c @@ -20,9 +20,9 @@ #include -static gfloat gauss_kernel[9] = { 0.060493, 0.075284, 0.088016, - 0.096667, 0.099736, 0.096667, - 0.088016, 0.075284, 0.060493 }; +static gfloat gauss_kernel[9] = { 0.060493f, 0.075284f, 0.088016f, + 0.096667f, 0.099736f, 0.096667f, + 0.088016f, 0.075284f, 0.060493f }; static void gst_gl_effects_glow_step_one (gint width, gint height, guint texture, gpointer data) @@ -89,8 +89,8 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture, gpointer s gst_gl_shader_set_uniform_1i (shader, "tex", 1); gst_gl_shader_set_uniform_1fv (shader, "kernel", 9, gauss_kernel); - gst_gl_shader_set_uniform_1f (shader, "norm_const", 0.740656); - gst_gl_shader_set_uniform_1f (shader, "norm_offset", 0.0); + gst_gl_shader_set_uniform_1f (shader, "norm_const", 0.740656f); + gst_gl_shader_set_uniform_1f (shader, "norm_offset", 0.0f); gst_gl_effects_draw_texture (effects, texture); } @@ -125,8 +125,8 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 1); gst_gl_shader_set_uniform_1fv (shader, "kernel", 9, gauss_kernel); - gst_gl_shader_set_uniform_1f (shader, "norm_const", 0.740656); - gst_gl_shader_set_uniform_1f (shader, "norm_offset", 0.0); + gst_gl_shader_set_uniform_1f (shader, "norm_const", 0.740656f); + gst_gl_shader_set_uniform_1f (shader, "norm_offset", 0.0f); gst_gl_effects_draw_texture (effects, texture); } @@ -166,7 +166,7 @@ gst_gl_effects_glow_step_four (gint width, gint height, guint texture, gpointer glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); glDisable(GL_TEXTURE_RECTANGLE_ARB); - gst_gl_shader_set_uniform_1f (shader, "beta", 1/3.5); + gst_gl_shader_set_uniform_1f (shader, "beta", (gfloat) 1/3.5f); gst_gl_shader_set_uniform_1i (shader, "blend", 1); gst_gl_effects_draw_texture (effects, texture); diff --git a/gst/gl/effects/gstgleffectmirror.c b/gst/gl/effects/gstgleffectmirror.c index dbaf67f..f5e98d1 100644 --- a/gst/gl/effects/gstgleffectmirror.c +++ b/gst/gl/effects/gstgleffectmirror.c @@ -49,8 +49,8 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); - gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); + gst_gl_shader_set_uniform_1f (shader, "width", (gfloat) width / 2.0f); + gst_gl_shader_set_uniform_1f (shader, "height", (gfloat) height / 2.0f); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectsquare.c b/gst/gl/effects/gstgleffectsquare.c index f06faba..0535949 100644 --- a/gst/gl/effects/gstgleffectsquare.c +++ b/gst/gl/effects/gstgleffectsquare.c @@ -49,8 +49,8 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); - gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); + gst_gl_shader_set_uniform_1f (shader, "width", (gfloat) width / 2.0f); + gst_gl_shader_set_uniform_1f (shader, "height", (gfloat) height / 2.0f); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectsqueeze.c b/gst/gl/effects/gstgleffectsqueeze.c index ebedcde..a5dad2c 100644 --- a/gst/gl/effects/gstgleffectsqueeze.c +++ b/gst/gl/effects/gstgleffectsqueeze.c @@ -49,8 +49,8 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture, gpointe gst_gl_shader_set_uniform_1i (shader, "tex", 0); - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); - gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); + gst_gl_shader_set_uniform_1f (shader, "width", (gfloat) width / 2.0f); + gst_gl_shader_set_uniform_1f (shader, "height", (gfloat) height / 2.0f); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectstretch.c b/gst/gl/effects/gstgleffectstretch.c index 7c9be7f..f1d9ec1 100644 --- a/gst/gl/effects/gstgleffectstretch.c +++ b/gst/gl/effects/gstgleffectstretch.c @@ -49,8 +49,8 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture, gpointe gst_gl_shader_set_uniform_1i (shader, "tex", 0); - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); - gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); + gst_gl_shader_set_uniform_1f (shader, "width", (gfloat) width / 2.0f); + gst_gl_shader_set_uniform_1f (shader, "height", (gfloat) height / 2.0f); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffecttunnel.c b/gst/gl/effects/gstgleffecttunnel.c index dc81ef8..0a72b8b 100644 --- a/gst/gl/effects/gstgleffecttunnel.c +++ b/gst/gl/effects/gstgleffecttunnel.c @@ -49,8 +49,8 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); - gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); + gst_gl_shader_set_uniform_1f (shader, "width", (gfloat) width / 2.0f); + gst_gl_shader_set_uniform_1f (shader, "height", (gfloat) height / 2.0f); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffecttwirl.c b/gst/gl/effects/gstgleffecttwirl.c index 79b854c..76416e6 100644 --- a/gst/gl/effects/gstgleffecttwirl.c +++ b/gst/gl/effects/gstgleffecttwirl.c @@ -49,8 +49,8 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); - gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); + gst_gl_shader_set_uniform_1f (shader, "width", (gfloat) width / 2.0f); + gst_gl_shader_set_uniform_1f (shader, "height", (gfloat) height / 2.0f); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/gstgleffects.c b/gst/gl/gstgleffects.c index 3f846bb..14688f1 100644 --- a/gst/gl/gstgleffects.c +++ b/gst/gl/gstgleffects.c @@ -250,11 +250,11 @@ gst_gl_effects_draw_texture (GstGLEffects * effects, GLuint tex) glTexCoord2f (0.0, 0.0); glVertex2f (-1.0, -1.0); - glTexCoord2f (filter->width, 0.0); + glTexCoord2f ((gfloat)filter->width, 0.0); glVertex2f (1.0, -1.0); - glTexCoord2f (filter->width, filter->height); + glTexCoord2f ((gfloat)filter->width, (gfloat)filter->height); glVertex2f (1.0, 1.0); - glTexCoord2f (0.0, filter->height); + glTexCoord2f (0.0, (gfloat)filter->height); glVertex2f (-1.0, 1.0); glEnd (); diff --git a/gst/gl/gstglfilterblur.c b/gst/gl/gstglfilterblur.c index 5b3ea30..a3fcbbd 100644 --- a/gst/gl/gstglfilterblur.c +++ b/gst/gl/gstglfilterblur.c @@ -239,11 +239,11 @@ gst_gl_filterblur_draw_texture (GstGLFilterBlur * filterblur, GLuint tex) glTexCoord2f (0.0, 0.0); glVertex2f (-1.0, -1.0); - glTexCoord2f (filter->width, 0.0); + glTexCoord2f ((gfloat)filter->width, 0.0); glVertex2f (1.0, -1.0); - glTexCoord2f (filter->width, filter->height); + glTexCoord2f ((gfloat)filter->width, (gfloat)filter->height); glVertex2f (1.0, 1.0); - glTexCoord2f (0.0, filter->height); + glTexCoord2f (0.0, (gfloat)filter->height); glVertex2f (-1.0, 1.0); glEnd (); @@ -290,9 +290,9 @@ gst_gl_filterblur_hcallback (gint width, gint height, guint texture, gpointer st /* hard coded kernel, it could be easily generated at runtime with a * property to change standard deviation */ gfloat gauss_kernel[9] = { - 0.026995, 0.064759, 0.120985, - 0.176033, 0.199471, 0.176033, - 0.120985, 0.064759, 0.026995 }; + 0.026995f, 0.064759f, 0.120985f, + 0.176033f, 0.199471f, 0.176033f, + 0.120985f, 0.064759f, 0.026995f }; glMatrixMode (GL_PROJECTION); glLoadIdentity (); @@ -307,8 +307,8 @@ gst_gl_filterblur_hcallback (gint width, gint height, guint texture, gpointer st gst_gl_shader_set_uniform_1i (filterblur->shader0, "tex", 1); gst_gl_shader_set_uniform_1fv (filterblur->shader0, "kernel", 9, gauss_kernel); - gst_gl_shader_set_uniform_1f (filterblur->shader0, "norm_const", 0.977016); - gst_gl_shader_set_uniform_1f (filterblur->shader0, "norm_offset", 0.0); + gst_gl_shader_set_uniform_1f (filterblur->shader0, "norm_const", 0.977016f); + gst_gl_shader_set_uniform_1f (filterblur->shader0, "norm_offset", 0.0f); gst_gl_filterblur_draw_texture (filterblur, texture); } @@ -322,9 +322,9 @@ gst_gl_filterblur_vcallback (gint width, gint height, guint texture, gpointer st /* hard coded kernel, it could be easily generated at runtime with a * property to change standard deviation */ gfloat gauss_kernel[9] = { - 0.026995, 0.064759, 0.120985, - 0.176033, 0.199471, 0.176033, - 0.120985, 0.064759, 0.026995 }; + 0.026995f, 0.064759f, 0.120985f, + 0.176033f, 0.199471f, 0.176033f, + 0.120985f, 0.064759f, 0.026995f }; glMatrixMode (GL_PROJECTION); glLoadIdentity (); @@ -339,8 +339,8 @@ gst_gl_filterblur_vcallback (gint width, gint height, guint texture, gpointer st gst_gl_shader_set_uniform_1i (filterblur->shader1, "tex", 1); gst_gl_shader_set_uniform_1fv (filterblur->shader1, "kernel", 9, gauss_kernel); - gst_gl_shader_set_uniform_1f (filterblur->shader1, "norm_const", 0.977016); - gst_gl_shader_set_uniform_1f (filterblur->shader1, "norm_offset", 0.0); + gst_gl_shader_set_uniform_1f (filterblur->shader1, "norm_const", 0.977016f); + gst_gl_shader_set_uniform_1f (filterblur->shader1, "norm_offset", 0.0f); gst_gl_filterblur_draw_texture (filterblur, texture); } diff --git a/gst/gl/gstglpixbufoverlay.c b/gst/gl/gstglpixbufoverlay.c index 62b085b..1d47040 100644 --- a/gst/gl/gstglpixbufoverlay.c +++ b/gst/gl/gstglpixbufoverlay.c @@ -170,11 +170,11 @@ gst_gl_pixbufoverlay_draw_texture (GstGLPixbufOverlay * pixbufoverlay, GLuint te glTexCoord2f (0.0, 0.0); glVertex2f (-1.0, -1.0); - glTexCoord2f (filter->width, 0.0); + glTexCoord2f ((gfloat)filter->width, 0.0); glVertex2f (1.0, -1.0); - glTexCoord2f (filter->width, filter->height); + glTexCoord2f ((gfloat)filter->width, (gfloat)filter->height); glVertex2f (1.0, 1.0); - glTexCoord2f (0.0, filter->height); + glTexCoord2f (0.0, (gfloat)filter->height); glVertex2f (-1.0, 1.0); glEnd (); -- 2.7.4