summaryrefslogtreecommitdiff
path: root/media-sound/synaesthesia/files/synaesthesia-2.4-dropping-register.patch
blob: b45e168e1ab4a92463c426fecbdd5360d732d946 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
# The register keyword has been deprecated since c++14 and completely removed since c++17
# Hence dropping the keyword
# Bug: https://bugs.gentoo.org/897798
--- a/core.cc
+++ b/core.cc
@@ -117,7 +117,7 @@ inline void addPixelFast(unsigned char *p,int br1,int br2) {
 }
 
 void fadeFade() {
-  register uint32_t *ptr = (uint32_t*)output;
+  uint32_t *ptr = (uint32_t*)output;
   int i = outWidth*outHeight*2/sizeof(uint32_t);
   do {
     //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4;
--- a/sdlwrap.cc
+++ b/sdlwrap.cc
@@ -171,19 +171,19 @@ void SdlScreen::show(void) {
   attempt(SDL_LockSurface(surface),"locking screen for output.");
 
   if (scaling == 1) {
-    register uint32_t *ptr2 = (uint32_t*)output;
+    uint32_t *ptr2 = (uint32_t*)output;
     uint32_t *ptr1 = (uint32_t*)( surface->pixels );
     int i = outWidth*outHeight/sizeof(*ptr2);
 
     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)
@@ -194,7 +194,7 @@ void SdlScreen::show(void) {
           | ((r2 & 0x00f00000ul) << 4)
           | ((r2 & 0xf0000000ul)));
   #else
-        register unsigned int const v = 
+        unsigned int const v = 
             ((r2 & 0x000000f0ul) >> 4)
           | ((r2 & 0x0000f000ul) >> 8)
           | ((r2 & 0x00f00000ul) >> 12)
--- a/svgawrap.cc
+++ b/svgawrap.cc
@@ -120,7 +120,7 @@ void SvgaScreen::inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &key
 }
 
 void SvgaScreen::show(void) {
-  register uint32_t *ptr2 = (uint32_t*)output;
+  uint32_t *ptr2 = (uint32_t*)output;
   uint32_t *ptr1 = (uint32_t*)scr;
   int i = 320*200/sizeof(uint32_t);
   // Asger Alstrup Nielsen's (alstrup@diku.dk)
@@ -129,15 +129,15 @@ void SvgaScreen::show(void) {
     //Original bytewize version:
     //unsigned char v = (*(ptr2++)&15*16);
     //*(ptr1++) = v|(*(ptr2++)>>4);
-    register uint32_t const r1 = *(ptr2++);
-    register uint32_t const r2 = *(ptr2++);
+    uint32_t const r1 = *(ptr2++);
+    uint32_t const r2 = *(ptr2++);
 
     //Fade will continue even after value > 16
     //thus black pixel will be written when values just > 0
     //thus no need to write true black
     //if (r1 || r2) {
 #ifdef LITTLEENDIAN
-      register uint32_t const v = 
+      uint32_t const v = 
           ((r1 & 0x000000f0ul) >> 4)
         | ((r1 & 0x0000f000ul) >> 8)
         | ((r1 & 0x00f00000ul) >> 12)
@@ -148,7 +148,7 @@ void SvgaScreen::show(void) {
         | ((r2 & 0x00f00000ul) << 4)
         | ((r2 & 0xf0000000ul)));
 #else
-      register uint32_t const v = 
+      uint32_t const v = 
           ((r2 & 0x000000f0ul) >> 4)
         | ((r2 & 0x0000f000ul) >> 8)
         | ((r2 & 0x00f00000ul) >> 12)
--- a/xlibwrap.cc
+++ b/xlibwrap.cc
@@ -119,24 +119,24 @@ void XScreen::inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit
 }
  
 void XScreen::show(void) { 
-  register uint32_t *ptr2 = (uint32_t*)output;
+  uint32_t *ptr2 = (uint32_t*)output;
   uint32_t *ptr1 = (uint32_t*)d->back;
   int i = outWidth*outHeight/sizeof(uint32_t);
   if (lowColor)
     do {
-      register uint32_t const r1 = *(ptr2++);
-      register uint32_t const r2 = *(ptr2++);
+      uint32_t const r1 = *(ptr2++);
+      uint32_t const r2 = *(ptr2++);
     
       //if (r1 || r2) {
 #ifdef LITTLEENDIAN
-        register uint32_t const v = 
+        uint32_t 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 uint32_t const v = 
+        uint32_t const v = 
              mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]
             |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*256U; 
         *(ptr1++) = v | 
@@ -149,12 +149,12 @@ void XScreen::show(void) {
     do {
       // Asger Alstrup Nielsen's (alstrup@diku.dk)
       // optimized 32 bit screen loop
-      register uint32_t const r1 = *(ptr2++);
-      register uint32_t const r2 = *(ptr2++);
+      uint32_t const r1 = *(ptr2++);
+      uint32_t const r2 = *(ptr2++);
     
       //if (r1 || r2) {
 #ifdef LITTLEENDIAN
-        register uint32_t const v = 
+        uint32_t const v = 
             ((r1 & 0x000000f0ul) >> 4)
           | ((r1 & 0x0000f000ul) >> 8)
           | ((r1 & 0x00f00000ul) >> 12)
@@ -165,7 +165,7 @@ void XScreen::show(void) {
           | ((r2 & 0x00f00000ul) << 16 -12)
           | ((r2 & 0xf0000000ul) << 16 -16);
 #else
-        register uint32_t const v = 
+        uint32_t const v = 
             ((r2 & 0x000000f0ul) >> 4)
           | ((r2 & 0x0000f000ul) >> 8)
           | ((r2 & 0x00f00000ul) >> 12)