← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xserver-xorg-video-intel/utopic

« back to all changes in this revision

Viewing changes to src/sna/fb/fbblt.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-09-12 07:43:59 UTC
  • mfrom: (1.4.22)
  • Revision ID: package-import@ubuntu.com-20120912074359-i3h8ol6hoghbemoq
Tags: 2:2.20.7-0ubuntu1
Merge from unreleased debian git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sna/fb/fbblt.c
287
287
 
288
288
                DBG(("%s fast blt, src_stride=%d, dst_stride=%d, width=%d (offset=%d)\n",
289
289
                     __FUNCTION__,
290
 
                     srcStride, dstStride, width,
291
 
                     srcLine - dstLine));
292
 
 
293
 
                if ((srcLine < dstLine && srcLine + width > dstLine) ||
294
 
                    (dstLine < srcLine && dstLine + width > srcLine))
 
290
                     srcStride, dstStride, width, s - d));
 
291
 
 
292
                if (width == srcStride && width == dstStride) {
 
293
                        width *= height;
 
294
                        height = 1;
 
295
                }
 
296
 
 
297
                if ((s < d && s + width > d) || (d < s && d + width > s))
295
298
                        func = memmove;
296
299
                else
297
300
                        func = memcpy;
298
301
                if (!upsidedown) {
299
 
                        if (srcStride == dstStride && srcStride == width) {
300
 
                                width *= height;
301
 
                                height = 1;
302
 
                        }
303
302
                        for (i = 0; i < height; i++)
304
303
                                func(d + i * dstStride,
305
304
                                     s + i * srcStride,