diff options
Diffstat (limited to 'kscd/kscdmagic')
| -rw-r--r-- | kscd/kscdmagic/core.cpp | 4 | ||||
| -rw-r--r-- | kscd/kscdmagic/xlib.c | 2 | ||||
| -rw-r--r-- | kscd/kscdmagic/xlibwrap.cpp | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/kscd/kscdmagic/core.cpp b/kscd/kscdmagic/core.cpp index 937ac8b9..1b03534f 100644 --- a/kscd/kscdmagic/core.cpp +++ b/kscd/kscdmagic/core.cpp @@ -116,7 +116,7 @@ inline void addPixelFast(unsigned char *p,int br1,int br2) { } void fadeFade() { - register unsigned long *ptr = (unsigned long*)ucoutput; + unsigned long *ptr = (unsigned long*)ucoutput; int i = outWidth*outHeight*2/4; do { //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4; @@ -322,7 +322,7 @@ int coreGo() { // Asger Alstrupt's optimized 32 bit fade // (alstrup@diku.dk) - /*register unsigned long *ptr = (unsigned long*)output; + /*unsigned long *ptr = (unsigned long*)output; i = outWidth*outHeight*2/4; do { //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4; diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c index b28a0650..115b89ac 100644 --- a/kscd/kscdmagic/xlib.c +++ b/kscd/kscdmagic/xlib.c @@ -141,7 +141,7 @@ void draw_screen(xdisplay * d) #ifdef MITSHM int alloc_shm_image(xdisplay * new) { - register char *ptr; + char *ptr; int temp, size = 0, i; ptr = DisplayString(new->display); if (!ptr || (*ptr == ':') || !strncmp(ptr, "localhost:", 10) || diff --git a/kscd/kscdmagic/xlibwrap.cpp b/kscd/kscdmagic/xlibwrap.cpp index d885c727..e0ff74ba 100644 --- a/kscd/kscdmagic/xlibwrap.cpp +++ b/kscd/kscdmagic/xlibwrap.cpp @@ -138,24 +138,24 @@ void inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit) { } void screenShow(void) { - register unsigned long *ptr2 = (unsigned long*)ucoutput; + unsigned long *ptr2 = (unsigned long*)ucoutput; unsigned long *ptr1 = (unsigned long*)d->back; int i = outWidth*outHeight/4; if (lowColor) do { - register unsigned int const r1 = *(ptr2++); - register unsigned int const r2 = *(ptr2++); + unsigned int const r1 = *(ptr2++); + unsigned int const r2 = *(ptr2++); //if (r1 || r2) { #ifdef LITTLEENDIAN - register unsigned int const v = + unsigned int const v = mapping[((r1&0xe0ul)>>5)|((r1&0xe000ul)>>10)] |mapping[((r1&0xe00000ul)>>21)|((r1&0xe0000000ul)>>26)]*256U; *(ptr1++) = v | mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]*65536U |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*16777216U; #else - register unsigned int const v = + unsigned int const v = mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)] |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*256U; *(ptr1++) = v | @@ -168,12 +168,12 @@ void screenShow(void) { do { // Asger Alstrup Nielsen's (alstrup@diku.dk) // optimized 32 bit screen loop - register unsigned int const r1 = *(ptr2++); - register unsigned int const r2 = *(ptr2++); + unsigned int const r1 = *(ptr2++); + unsigned int const r2 = *(ptr2++); //if (r1 || r2) { #ifdef LITTLEENDIAN - register unsigned int const v = + unsigned int const v = ((r1 & 0x000000f0ul) >> 4) | ((r1 & 0x0000f000ul) >> 8) | ((r1 & 0x00f00000ul) >> 12) @@ -184,7 +184,7 @@ void screenShow(void) { | ((r2 & 0x00f00000ul) << 16 -12) | ((r2 & 0xf0000000ul) << 16 -16); #else - register unsigned int const v = + unsigned int const v = ((r2 & 0x000000f0ul) >> 4) | ((r2 & 0x0000f000ul) >> 8) | ((r2 & 0x00f00000ul) >> 12) |