# HG changeset patch # User Sunny Sachanandani # Date 1279361494 -19800 # Node ID f28c23cc1a08f320b2ac233ce9bdaa355335bf9a # Parent 3892fe2f65374ab36e223836ced26328ae389eac Remove some redundant code. diff -r 3892fe2f6537 -r f28c23cc1a08 src/video/x11/SDL_x11render.c --- a/src/video/x11/SDL_x11render.c Sat Jul 17 15:38:24 2010 +0530 +++ b/src/video/x11/SDL_x11render.c Sat Jul 17 15:41:34 2010 +0530 @@ -1443,24 +1443,6 @@ srcrect->x, srcrect->y, dstrect->x, dstrect->y, srcrect->w, srcrect->h); } else { - /*Pixmap scaling_pixmap = - XCreatePixmap(data->display, texturedata->pixmap, dstrect->w, dstrect->h, - data->depth); - if (!scaling_pixmap) { - SDL_SetError("XCreatePixmap() failed"); - return -1; - } - Picture scaling_picture = - XRenderCreatePicture(data->display, scaling_pixmap, texturedata->picture_fmt, - 0, NULL); - if (!scaling_picture) { - SDL_SetError("XRenderCreatePicture() failed"); - return -1; - } - XRenderComposite(data->display, PictOpClear, scaling_picture, None, scaling_picture, - 0, 0, 0, 0, 0, 0, dstrect->w, dstrect->h); - XRenderComposite(data->display, PictOpSrc, texturedata->picture, pict, scaling_picture, - srcrect->x, srcrect->y, 0, 0, 0, 0, srcrect->w, srcrect->h);*/ double xscale = ((double) dstrect->w) / srcrect->w; double yscale = ((double) dstrect->h) / srcrect->h; XTransform xform = {{ @@ -1479,9 +1461,6 @@ {XDoubleToFixed(0), XDoubleToFixed(1), XDoubleToFixed(0)}, {XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1)}}}; XRenderSetPictureTransform(data->display, texturedata->picture, &identity); - - /*XRenderFreePicture(data->display, scaling_picture); - XFreePixmap(data->display, scaling_pixmap);*/ } } else