frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Fixed two unintialized warnings. 

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Zhigang Gong 2011-07-07 14:47:51 +08:00
parent d49d482579
commit 477a54bc9e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glamor/glamor_copyarea.c
View File

@ -309,7 +309,7 @@ glamor_copy_n_to_n(DrawablePtr src,
void *closure) void *closure)
{ {
glamor_access_t dst_access; glamor_access_t dst_access;
PixmapPtr dst_pixmap, src_pixmap, temp_pixmap; PixmapPtr dst_pixmap, src_pixmap, temp_pixmap = NULL;
DrawablePtr temp_src = src; DrawablePtr temp_src = src;
glamor_pixmap_private *dst_pixmap_priv, *src_pixmap_priv; glamor_pixmap_private *dst_pixmap_priv, *src_pixmap_priv;
BoxRec bound; BoxRec bound;
@ -361,6 +361,11 @@ glamor_copy_n_to_n(DrawablePtr src,
temp_dy = -bound.y1; temp_dy = -bound.y1;
temp_src = &temp_pixmap->drawable; temp_src = &temp_pixmap->drawable;
} }
else {
temp_dx = dx;
temp_dy = dy;
temp_src = src;
}
if (glamor_copy_n_to_n_textured(temp_src, dst, gc, box, nbox, temp_dx, temp_dy)) { if (glamor_copy_n_to_n_textured(temp_src, dst, gc, box, nbox, temp_dx, temp_dy)) {
goto done; goto done;

2
glamor/glamor_polylines.c
View File

@ -55,7 +55,7 @@ glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
int y_max = MINSHORT; int y_max = MINSHORT;
DrawablePtr temp_dest; DrawablePtr temp_dest;
PixmapPtr temp_pixmap; PixmapPtr temp_pixmap;
GCPtr temp_gc; GCPtr temp_gc = NULL;
/* Don't try to do wide lines or non-solid fill style. */ /* Don't try to do wide lines or non-solid fill style. */
if (gc->lineWidth != 0) { if (gc->lineWidth != 0) {
/* This ends up in miSetSpans, which is accelerated as well as we /* This ends up in miSetSpans, which is accelerated as well as we