[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/video sprite.c
|
From: |
address@hidden |
|
Subject: |
[Stratagus-CVS] stratagus/src/video sprite.c |
|
Date: |
20 Dec 2003 18:22:31 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 03/12/20 18:22:30
Modified files:
src/video : sprite.c
Log message:
Fix gcc compiler warnings.
Patches:
Index: stratagus/src/video/sprite.c
diff -u stratagus/src/video/sprite.c:1.58 stratagus/src/video/sprite.c:1.59
--- stratagus/src/video/sprite.c:1.58 Sat Dec 20 16:33:50 2003
+++ stratagus/src/video/sprite.c Sat Dec 20 18:22:30 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: sprite.c,v 1.58 2003/12/20 05:33:50 jsalmon3 Exp $
+// $Id: sprite.c,v 1.59 2003/12/20 07:22:30 wizzard Exp $
//@{
@@ -2118,13 +2118,18 @@
dp += *sp++; //
transparent
pp = dp - 1 + *sp++;
// opaque
while (dp < pp) { // unroll
- *dp++ = ((*dp >> 1) & 0x7BEF)
+((pixels[*sp++] >> 1) & 0x7BEF);
- *dp++ = ((*dp >> 1) & 0x7BEF)
+((pixels[*sp++] >> 1) & 0x7BEF);
- //*dp++ = ((*dp >> 2) &
0x79E7) + ((pixels[*sp] >> 2) & 0x79E7) +((pixels[*sp++] >> 1) & 0x7BEF);
- //*dp++ = ((*dp >> 2) & 0x79E7) +
((pixels[*sp] >> 2) & 0x79E7) +((pixels[*sp++] >> 1) & 0x7BEF);
+ *dp = ((*dp >> 1) & 0x7BEF)
+((pixels[*sp++] >> 1) & 0x7BEF);
+ ++dp;
+ *dp = ((*dp >> 1) & 0x7BEF)
+((pixels[*sp++] >> 1) & 0x7BEF);
+ ++dp;
+#if 0
+ *dp++ = ((*dp >> 2) & 0x79E7) +
((pixels[*sp] >> 2) & 0x79E7) +((pixels[*sp++] >> 1) & 0x7BEF);
+ *dp++ = ((*dp >> 2) & 0x79E7) +
((pixels[*sp] >> 2) & 0x79E7) +((pixels[*sp++] >> 1) & 0x7BEF);
+#endif
}
if (dp <= pp) {
- *dp++ = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ *dp = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ ++dp;
}
} while (dp < lp);
dp += da;
@@ -2167,12 +2172,14 @@
middle_pixel:
if (pp < lp) {
while (dp < pp) {
- *dp++ = ((*dp >> 1) & 0x7BEF)
+ ((pixels[*sp++] >> 1) & 0x7BEF);
+ *dp = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ ++dp;
}
continue;
}
while (dp < lp) {
- *dp++ = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ *dp = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ ++dp;
}
sp += pp - dp;
dp = pp;
@@ -2392,11 +2399,14 @@
dp += *sp++; //
transparent
pp = dp - 1 + *sp++;
// opaque
while (dp < pp) { // unroll
- *dp++ = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F) ;
- *dp++ = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F) ;
+ *dp = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ ++dp;
+ *dp = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ ++dp;
}
if (dp <= pp) {
- *dp++ = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ *dp = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ ++dp;
}
} while (dp < lp);
dp += da;
@@ -2439,12 +2449,14 @@
middle_pixel:
if (pp < lp) {
while (dp < pp) {
- *dp++ = ((*dp >> 1) &
0x7F7F7F7F) + ((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ *dp = ((*dp >> 1) & 0x7F7F7F7F)
+ ((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ ++dp;
}
continue;
}
while (dp < lp) {
- *dp++ = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ *dp = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ ++dp;
}
sp += pp - dp;
dp = pp;
@@ -2668,11 +2680,14 @@
dp -= *sp++; //
transparent
pp = dp + 1 - *sp++;
// opaque
while (dp > pp) {
- *dp-- = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
- *dp-- = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ *dp = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ --dp;
+ *dp = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ --dp;
}
if (dp >= pp) {
- *dp-- = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ *dp = ((*dp >> 1) & 0x7BEF) +
((pixels[*sp++] >> 1) & 0x7BEF);
+ --dp;
}
} while (dp > lp);
dp += da;
@@ -2944,8 +2959,10 @@
dp -= *sp++; //
transparent
pp = dp + 1 - *sp++;
// opaque
while (dp > pp) {
- *dp-- = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
- *dp-- = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ *dp = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ --dp;
+ *dp = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ --dp;
}
if (dp >= pp) {
*dp-- = pixels[*sp++];
@@ -2991,12 +3008,14 @@
middle_pixel:
if (pp > lp) {
while (dp > pp) {
- *dp-- = ((*dp >> 1) &
0x7F7F7F7F) + ((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ *dp = ((*dp >> 1) & 0x7F7F7F7F)
+ ((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ --dp;
}
continue;
}
while (dp > lp) {
- *dp-- = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ *dp = ((*dp >> 1) & 0x7F7F7F7F) +
((pixels[*sp++] >> 1) & 0x7F7F7F7F);
+ --dp;
}
sp += dp - pp;
dp = pp;