--- a/src/drivers/video_gdk.c Mon May 12 10:00:13 2008 +0000 +++ b/src/drivers/video_gdk.c Fri Nov 07 07:53:31 2008 +0000 @@ -63,12 +63,12 @@ { unsigned int i; for( i=0; ibuf_id] ); pixbuf_array[buffer->buf_id] = NULL; if( buffer->buf_id == (pixbuf_max-1) ) { - pixbuf_max--; + pixbuf_max--; } } @@ -123,30 +123,30 @@ if( ah > video_height ) { - int w = (video_height/0.75); - x1 = (video_width - w)/2; - x2 -= x1; - gdk_gc_set_foreground( gc, &black ); - gdk_gc_set_background( gc, &black ); - gdk_draw_rectangle( gtk_video_drawable->window, gc, TRUE, 0, 0, x1, video_height ); - gdk_draw_rectangle( gtk_video_drawable->window, gc, TRUE, x2, 0, video_width, video_height ); + int w = (video_height/0.75); + x1 = (video_width - w)/2; + x2 -= x1; + gdk_gc_set_foreground( gc, &black ); + gdk_gc_set_background( gc, &black ); + gdk_draw_rectangle( gtk_video_drawable->window, gc, TRUE, 0, 0, x1, video_height ); + gdk_draw_rectangle( gtk_video_drawable->window, gc, TRUE, x2, 0, video_width, video_height ); } else if( ah < video_height ) { - y1 = (video_height - ah)/2; - y2 -= y1; - gdk_gc_set_foreground( gc, &black ); - gdk_gc_set_background( gc, &black ); - gdk_draw_rectangle( gtk_video_drawable->window, gc, TRUE, 0, 0, video_width, y1 ); - gdk_draw_rectangle( gtk_video_drawable->window, gc, TRUE, 0, y2, video_width, video_height ); + y1 = (video_height - ah)/2; + y2 -= y1; + gdk_gc_set_foreground( gc, &black ); + gdk_gc_set_background( gc, &black ); + gdk_draw_rectangle( gtk_video_drawable->window, gc, TRUE, 0, 0, video_width, y1 ); + gdk_draw_rectangle( gtk_video_drawable->window, gc, TRUE, 0, y2, video_width, video_height ); } int w = x2-x1; int h = y2-y1; - + if( w != buffer->width || h != buffer->height ) { - gdk_draw_rgb_32_image( gtk_video_drawable->window, gc, x1, y1, buffer->width, buffer->height, GDK_RGB_DITHER_NONE, - pb, buffer->width*4 ); + gdk_draw_rgb_32_image( gtk_video_drawable->window, gc, x1, y1, buffer->width, buffer->height, GDK_RGB_DITHER_NONE, + pb, buffer->width*4 ); } else { - gdk_draw_rgb_32_image( gtk_video_drawable->window, gc, x1, y1, buffer->width, buffer->height, GDK_RGB_DITHER_NONE, - pb, buffer->width*4 ); + gdk_draw_rgb_32_image( gtk_video_drawable->window, gc, x1, y1, buffer->width, buffer->height, GDK_RGB_DITHER_NONE, + pb, buffer->width*4 ); } } @@ -165,7 +165,7 @@ glFinish(); void *pb = pixbuf_array[buffer->buf_id]; OSMesaMakeCurrent( osmesa_context, pb, GL_UNSIGNED_BYTE, - buffer->width, buffer->height ); + buffer->width, buffer->height ); //OSMesaPixelStore( OSMESA_Y_UP, 0 ); glViewport( 0, 0, buffer->width, buffer->height ); glDrawBuffer(GL_FRONT); @@ -177,12 +177,12 @@ glFinish(); void *pb = pixbuf_array[buffer->buf_id]; OSMesaMakeCurrent( osmesa_context, pb, GL_UNSIGNED_BYTE, - buffer->width, buffer->height ); + buffer->width, buffer->height ); GLenum type = colour_formats[frame->colour_format].type; GLenum format = colour_formats[frame->colour_format].format; int bpp = colour_formats[frame->colour_format].bpp; int rowstride = (frame->rowstride / bpp) - frame->width; - + gl_reset_state(); glPixelStorei( GL_UNPACK_ROW_LENGTH, rowstride ); glRasterPos2f(0.375, frame->height-0.375); @@ -196,7 +196,7 @@ glFinish(); void *pb = pixbuf_array[buffer->buf_id]; OSMesaMakeCurrent( osmesa_context, pb, GL_UNSIGNED_BYTE, - buffer->width, buffer->height ); + buffer->width, buffer->height ); glReadBuffer( GL_FRONT ); return gl_read_render_buffer( target, buffer, rowstride, format );