xf86-video-intel: src/sna/gen3_render.c src/sna/sna_accel.c src/sna/sna_video.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Jun 1 08:55:44 PDT 2012
src/sna/gen3_render.c | 1 -
src/sna/sna_accel.c | 8 ++++----
src/sna/sna_video.c | 13 ++++++-------
3 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit dc0fe44bebfdee63bcda4d185b85fe9e1cb16a71
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jun 1 16:54:41 2012 +0100
sna: Fix a smattering of static analysis warnings
Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index ee18ebe..8cafeb8 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -2477,7 +2477,6 @@ gen3_composite_set_target(struct sna *sna,
op->dst.format = dst->format;
op->dst.width = op->dst.pixmap->drawable.width;
op->dst.height = op->dst.pixmap->drawable.height;
- priv = sna_pixmap(op->dst.pixmap);
op->dst.bo = NULL;
priv = sna_pixmap(op->dst.pixmap);
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 0090639..7eeb7af 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3277,10 +3277,10 @@ sna_put_image(DrawablePtr drawable, GCPtr gc, int depth,
if (priv == NULL) {
DBG(("%s: fbPutImage, unattached(%d, %d, %d, %d)\n",
__FUNCTION__, x, y, w, h));
- if (!sna_gc_move_to_cpu(gc, drawable))
- goto out;
-
- fbPutImage(drawable, gc, depth, x, y, w, h, left, format, bits);
+ if (sna_gc_move_to_cpu(gc, drawable))
+ fbPutImage(drawable, gc, depth,
+ x, y, w, h, left,
+ format, bits);
return;
}
diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c
index ce1e284..6999548 100644
--- a/src/sna/sna_video.c
+++ b/src/sna/sna_video.c
@@ -174,7 +174,7 @@ sna_video_clip_helper(ScrnInfoPtr scrn,
ret = xf86XVClipVideoHelper(dst, &x1, &x2, &y1, &y2,
crtc_region, frame->width, frame->height);
if (crtc_region != reg)
- RegionUninit(&crtc_region_local);
+ RegionUninit(crtc_region);
frame->top = y1 >> 16;
frame->left = (x1 >> 16) & ~1;
@@ -539,13 +539,12 @@ void sna_video_init(struct sna *sna, ScreenPtr screen)
return;
num_adaptors = xf86XVListGenericAdaptors(sna->scrn, &adaptors);
- newAdaptors =
- malloc((num_adaptors + 2) * sizeof(XF86VideoAdaptorPtr *));
- if (newAdaptors == NULL)
+ newAdaptors = realloc(adaptors,
+ (num_adaptors + 2) * sizeof(XF86VideoAdaptorPtr));
+ if (newAdaptors == NULL) {
+ free(adaptors);
return;
-
- memcpy(newAdaptors, adaptors,
- num_adaptors * sizeof(XF86VideoAdaptorPtr));
+ }
adaptors = newAdaptors;
/* Set up textured video if we can do it at this depth and we are on
More information about the xorg-commit
mailing list