diff options
author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:56 +0200 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:56 +0200 |
commit | 45b970f25634519dac302a5691a7a2d45f8db49f (patch) | |
tree | f4d55bce7b5701a154f4f61d64cbcf461312a357 /nx-X11/programs/Xserver/hw/nxagent/GCOps.c | |
parent | 22914447019845ba3ba238e5814b59939e744f19 (diff) | |
download | nx-libs-45b970f25634519dac302a5691a7a2d45f8db49f.tar.gz nx-libs-45b970f25634519dac302a5691a7a2d45f8db49f.tar.bz2 nx-libs-45b970f25634519dac302a5691a7a2d45f8db49f.zip |
Imported nxagent-3.3.0-6.tar.gznxagent/3.3.0-6
Summary: Imported nxagent-3.3.0-6.tar.gz
Keywords:
Imported nxagent-3.3.0-6.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/GCOps.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/GCOps.c | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index 9afd6e392..83aa04f11 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -594,8 +594,6 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, unsigned int format; unsigned long planeMask = 0xffffffff; - int oldDstxyValue; - RegionPtr pDstRegion; int skip = 0; @@ -607,91 +605,6 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, (void *) pDstDrawable, srcx, srcy, dstx, dsty, width, height); #endif - /* - * Here, before using fbDoCopy() called by fbCopyArea(), - * it should be provided that the cast in fbDoCopy() from - * int to short int would not cut off significative bits. - */ - - if (dstx + pDstDrawable->x + width > 32767) - { - #ifdef WARNING - fprintf(stderr, "nxagentCopyArea: x2 exceeding short int.\n"); - #endif - - width = 32767 - dstx - pDstDrawable->x; - - if (width <= 0) - { - #ifdef TEST - fprintf(stderr, "nxagentCopyArea: Returning null on x2 check.\n"); - #endif - - return NullRegion; - } - } - - if (dstx + pDstDrawable->x < -32768) - { - #ifdef WARNING - fprintf(stderr, "nxagentCopyArea: x1 exceeding short int.\n"); - #endif - - width += pDstDrawable->x + dstx + 32768; - srcx -= pDstDrawable->x + dstx + 32768; - dstx = -32768 - pDstDrawable->x; - - if (width <= 0) - { - #ifdef TEST - fprintf(stderr, "nxagentCopyArea: Returning null on x1 check.\n"); - #endif - - return NullRegion; - } - } - - oldDstxyValue = dsty; - - if (dsty + pDstDrawable->y + height > 32767) - { - #ifdef WARNING - fprintf(stderr, "nxagentCopyArea: y2 exceeding short int.\n"); - #endif - - height = 32767 - dsty - pDstDrawable->y; - - if (height <= 0) - { - #ifdef TEST - fprintf(stderr, "nxagentCopyArea: Returning null on y2 check.\n"); - #endif - - return NullRegion; - } - } - - if (dsty + pDstDrawable->y < -32768) - { - #ifdef WARNING - fprintf(stderr, "nxagentCopyArea: y1 exceeding short int.\n"); - #endif - - height += 32768 + pDstDrawable->y + dsty; - srcy -= 32768 + pDstDrawable->y + dsty; - dsty = -32768 - pDstDrawable->y; - - if (height <= 0) - { - #ifdef TEST - fprintf(stderr, "nxagentCopyArea: Returning null on y1 check.\n"); - #endif - - return NullRegion; - } - } - - if (nxagentGCTrap == 1 || nxagentShmTrap == 1) { if (pSrcDrawable -> type == DRAWABLE_PIXMAP && |