mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

251 lines
9.7 KiB

  1. this fixes double use of asm labels:
  2. {standard input}: Assembler messages:
  3. {standard input}:4361: Error: symbol `.L1010' is already defined
  4. diff -dur SDL_gfx-2.0.13/SDL_imageFilter.c src.libsdl_gfx.1130183692.7713.3446622608/SDL_gfx-2.0.13/SDL_imageFilter.c
  5. --- SDL_gfx-2.0.13/SDL_imageFilter.c 2004-11-29 20:53:35.000000000 +0100
  6. +++ src.libsdl_gfx.1130183692.7713.3446622608/SDL_gfx-2.0.13/SDL_imageFilter.c 2005-10-25 00:21:23.000000000 +0200
  7. @@ -71,7 +71,7 @@
  8. // ------------------------------------------------------------------------------------
  9. // SDL_imageFilterAdd: D = saturation255(S1 + S2)
  10. -int SDL_imageFilterAddMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  11. +static int SDL_imageFilterAddMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  12. {
  13. #ifdef USE_MMX
  14. asm volatile
  15. @@ -145,7 +145,7 @@
  16. }
  17. // SDL_imageFilterMean: D = S1/2 + S2/2
  18. -int SDL_imageFilterMeanMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length,
  19. +static int SDL_imageFilterMeanMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length,
  20. unsigned char *Mask)
  21. {
  22. #ifdef USE_MMX
  23. @@ -231,7 +234,7 @@
  24. }
  25. // SDL_imageFilterSub: D = saturation0(S1 - S2)
  26. -int SDL_imageFilterSubMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  27. +static int SDL_imageFilterSubMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  28. {
  29. #ifdef USE_MMX
  30. asm volatile
  31. @@ -303,7 +306,7 @@
  32. }
  33. // SDL_imageFilterAbsDiff: D = | S1 - S2 |
  34. -int SDL_imageFilterAbsDiffMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  35. +static int SDL_imageFilterAbsDiffMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  36. {
  37. #ifdef USE_MMX
  38. asm volatile
  39. @@ -377,7 +380,7 @@
  40. }
  41. // SDL_imageFilterMult: D = saturation255(S1 * S2)
  42. -int SDL_imageFilterMultMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  43. +static int SDL_imageFilterMultMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  44. {
  45. #ifdef USE_MMX
  46. asm volatile
  47. @@ -472,7 +475,7 @@
  48. }
  49. // SDL_imageFilterMultNor: D = S1 * S2 (non-MMX)
  50. -int SDL_imageFilterMultNorASM(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  51. +static int SDL_imageFilterMultNorASM(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  52. {
  53. #ifdef USE_MMX
  54. asm volatile
  55. @@ -538,7 +541,7 @@
  56. }
  57. // SDL_imageFilterMultDivby2: D = saturation255(S1/2 * S2)
  58. -int SDL_imageFilterMultDivby2MMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  59. +static int SDL_imageFilterMultDivby2MMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  60. {
  61. #ifdef USE_MMX
  62. asm volatile
  63. @@ -623,7 +626,7 @@
  64. }
  65. // SDL_imageFilterMultDivby4: D = saturation255(S1/2 * S2/2)
  66. -int SDL_imageFilterMultDivby4MMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  67. +static int SDL_imageFilterMultDivby4MMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  68. {
  69. #ifdef USE_MMX
  70. asm volatile
  71. @@ -710,7 +713,7 @@
  72. }
  73. // SDL_imageFilterBitAnd: D = S1 & S2
  74. -int SDL_imageFilterBitAndMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  75. +static int SDL_imageFilterBitAndMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  76. {
  77. #ifdef USE_MMX
  78. asm volatile
  79. @@ -782,7 +785,7 @@
  80. }
  81. // SDL_imageFilterBitOr: D = S1 | S2
  82. -int SDL_imageFilterBitOrMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  83. +static int SDL_imageFilterBitOrMMX(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  84. {
  85. #ifdef USE_MMX
  86. asm volatile
  87. @@ -851,7 +854,7 @@
  88. }
  89. // SDL_imageFilterDiv: D = S1 / S2 (non-MMX)
  90. -int SDL_imageFilterDivASM(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  91. +static int SDL_imageFilterDivASM(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, int length)
  92. {
  93. #ifdef USE_MMX
  94. asm volatile
  95. @@ -897,7 +900,7 @@
  96. // ------------------------------------------------------------------------------------
  97. // SDL_imageFilterBitNegation: D = !S
  98. -int SDL_imageFilterBitNegationMMX(unsigned char *Src1, unsigned char *Dest, int length)
  99. +static int SDL_imageFilterBitNegationMMX(unsigned char *Src1, unsigned char *Dest, int length)
  100. {
  101. #ifdef USE_MMX
  102. asm volatile
  103. @@ -961,7 +964,7 @@
  104. }
  105. // SDL_imageFilterAddByteMMX: D = saturation255(S + C)
  106. -int SDL_imageFilterAddByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char C)
  107. +static int SDL_imageFilterAddByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char C)
  108. {
  109. #ifdef USE_MMX
  110. asm volatile
  111. @@ -1043,7 +1046,7 @@
  112. }
  113. // SDL_imageFilterAddUintMMX: D = saturation255((S + (uint)C), Cs=swap_32(C)
  114. -int SDL_imageFilterAddUintMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned int C, unsigned int Cs)
  115. +static int SDL_imageFilterAddUintMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned int C, unsigned int Cs)
  116. {
  117. #ifdef USE_MMX
  118. asm volatile
  119. @@ -1132,7 +1135,7 @@
  120. // SDL_imageFilterAddByteToHalfMMX: D = saturation255(S/2 + C)
  121. -int SDL_imageFilterAddByteToHalfMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char C,
  122. +static int SDL_imageFilterAddByteToHalfMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char C,
  123. unsigned char *Mask)
  124. {
  125. #ifdef USE_MMX
  126. @@ -1224,7 +1227,7 @@
  127. }
  128. // SDL_imageFilterSubByteMMX: D = saturation0(S - C)
  129. -int SDL_imageFilterSubByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char C)
  130. +static int SDL_imageFilterSubByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char C)
  131. {
  132. #ifdef USE_MMX
  133. asm volatile
  134. @@ -1306,7 +1309,7 @@
  135. }
  136. // SDL_imageFilterSubUintMMX: D = saturation0(S - (uint)C), Cs=swap_32(C)
  137. -int SDL_imageFilterSubUintMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned int C, unsigned int Cs)
  138. +static int SDL_imageFilterSubUintMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned int C, unsigned int Cs)
  139. {
  140. #ifdef USE_MMX
  141. asm volatile
  142. @@ -1394,7 +1397,7 @@
  143. // SDL_imageFilterShiftRightMMX: D = saturation0(S >> N)
  144. -int SDL_imageFilterShiftRightMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N,
  145. +static int SDL_imageFilterShiftRightMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N,
  146. unsigned char *Mask)
  147. {
  148. #ifdef USE_MMX
  149. @@ -1485,7 +1488,7 @@
  150. }
  151. // SDL_imageFilterShiftRightUintMMX: D = Saturation0(S >> N)
  152. -int SDL_imageFilterShiftRightUintMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N)
  153. +static int SDL_imageFilterShiftRightUintMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N)
  154. {
  155. #ifdef USE_MMX
  156. asm volatile
  157. @@ -1561,7 +1564,7 @@
  158. }
  159. // SDL_imageFilterMultByByteMMX: D = saturation255(S * C)
  160. -int SDL_imageFilterMultByByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char C)
  161. +static int SDL_imageFilterMultByByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char C)
  162. {
  163. #ifdef USE_MMX
  164. asm volatile
  165. @@ -1672,7 +1675,7 @@
  166. }
  167. // SDL_imageFilterShiftRightAndMultByByteMMX: D = saturation255((S >> N) * C)
  168. -int SDL_imageFilterShiftRightAndMultByByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N,
  169. +static int SDL_imageFilterShiftRightAndMultByByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N,
  170. unsigned char C)
  171. {
  172. #ifdef USE_MMX
  173. @@ -1773,7 +1776,7 @@
  174. }
  175. // SDL_imageFilterShiftLeftByteMMX: D = (S << N)
  176. -int SDL_imageFilterShiftLeftByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N,
  177. +static int SDL_imageFilterShiftLeftByteMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N,
  178. unsigned char *Mask)
  179. {
  180. #ifdef USE_MMX
  181. @@ -1860,7 +1863,7 @@
  182. }
  183. // SDL_imageFilterShiftLeftUintMMX: D = (S << N)
  184. -int SDL_imageFilterShiftLeftUintMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N)
  185. +static int SDL_imageFilterShiftLeftUintMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N)
  186. {
  187. #ifdef USE_MMX
  188. asm volatile
  189. @@ -1936,7 +1939,7 @@
  190. }
  191. // SDL_imageFilterShiftLeftMMX: D = saturation255(S << N)
  192. -int SDL_imageFilterShiftLeftMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N)
  193. +static int SDL_imageFilterShiftLeftMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char N)
  194. {
  195. #ifdef USE_MMX
  196. asm volatile
  197. @@ -2041,7 +2044,7 @@
  198. }
  199. // SDL_imageFilterBinarizeUsingThresholdMMX: D = (S >= T) ? 255:0
  200. -int SDL_imageFilterBinarizeUsingThresholdMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char T)
  201. +static int SDL_imageFilterBinarizeUsingThresholdMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char T)
  202. {
  203. #ifdef USE_MMX
  204. asm volatile
  205. @@ -2122,7 +2125,7 @@
  206. }
  207. // SDL_imageFilterClipToRangeMMX: D = (S >= Tmin) & (S <= Tmax) S:Tmin | Tmax
  208. -int SDL_imageFilterClipToRangeMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char Tmin,
  209. +static int SDL_imageFilterClipToRangeMMX(unsigned char *Src1, unsigned char *Dest, int length, unsigned char Tmin,
  210. unsigned char Tmax)
  211. {
  212. #ifdef USE_MMX
  213. @@ -2222,7 +2225,7 @@
  214. }
  215. // SDL_imageFilterNormalizeLinearMMX: D = saturation255((Nmax - Nmin)/(Cmax - Cmin)*(S - Cmin) + Nmin)
  216. -int SDL_imageFilterNormalizeLinearMMX(unsigned char *Src1, unsigned char *Dest, int length, int Cmin, int Cmax,
  217. +static int SDL_imageFilterNormalizeLinearMMX(unsigned char *Src1, unsigned char *Dest, int length, int Cmin, int Cmax,
  218. int Nmin, int Nmax)
  219. {
  220. #ifdef USE_MMX