OLD | NEW |
1 Index: jdmarker.c | 1 Index: jdmarker.c |
2 =================================================================== | 2 =================================================================== |
3 --- jdmarker.c (revision 829) | 3 --- jdmarker.c (revision 829) |
4 +++ jdmarker.c (working copy) | 4 +++ jdmarker.c (working copy) |
5 @@ -910,7 +910,7 @@ | 5 @@ -910,7 +910,7 @@ |
6 } | 6 } |
7 | 7 |
8 if (cinfo->marker->discarded_bytes != 0) { | 8 if (cinfo->marker->discarded_bytes != 0) { |
9 - WARNMS2(cinfo, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c); | 9 - WARNMS2(cinfo, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c); |
10 + TRACEMS2(cinfo, 1, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c)
; | 10 + TRACEMS2(cinfo, 1, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c)
; |
(...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1228 push ebp | 1228 push ebp |
1229 @@ -182,7 +182,7 @@ | 1229 @@ -182,7 +182,7 @@ |
1230 %define output_data(b) (b)+28 ; JSAMPARRAY output_data | 1230 %define output_data(b) (b)+28 ; JSAMPARRAY output_data |
1231 | 1231 |
1232 align 16 | 1232 align 16 |
1233 - global EXTN(jsimd_h2v2_downsample_mmx) | 1233 - global EXTN(jsimd_h2v2_downsample_mmx) |
1234 + global EXTN(jsimd_h2v2_downsample_mmx) PRIVATE | 1234 + global EXTN(jsimd_h2v2_downsample_mmx) PRIVATE |
1235 | 1235 |
1236 EXTN(jsimd_h2v2_downsample_mmx): | 1236 EXTN(jsimd_h2v2_downsample_mmx): |
1237 push ebp | 1237 push ebp |
| 1238 Index: simd/jsimd_arm_neon.S |
| 1239 =================================================================== |
| 1240 --- simd/jsimd_arm_neon.S (revision 272637) |
| 1241 +++ simd/jsimd_arm_neon.S (working copy) |
| 1242 @@ -41,11 +41,9 @@ |
| 1243 /* Supplementary macro for setting function attributes */ |
| 1244 .macro asm_function fname |
| 1245 #ifdef __APPLE__ |
| 1246 - .func _\fname |
| 1247 .globl _\fname |
| 1248 _\fname: |
| 1249 #else |
| 1250 - .func \fname |
| 1251 .global \fname |
| 1252 #ifdef __ELF__ |
| 1253 .hidden \fname |
| 1254 @@ -670,7 +668,6 @@ |
| 1255 .unreq ROW6R |
| 1256 .unreq ROW7L |
| 1257 .unreq ROW7R |
| 1258 -.endfunc |
| 1259 |
| 1260 |
| 1261 /*****************************************************************************/ |
| 1262 @@ -895,7 +892,6 @@ |
| 1263 .unreq TMP2 |
| 1264 .unreq TMP3 |
| 1265 .unreq TMP4 |
| 1266 -.endfunc |
| 1267 |
| 1268 |
| 1269 /*****************************************************************************/ |
| 1270 @@ -1108,7 +1104,6 @@ |
| 1271 .unreq TMP2 |
| 1272 .unreq TMP3 |
| 1273 .unreq TMP4 |
| 1274 -.endfunc |
| 1275 |
| 1276 .purgem idct_helper |
| 1277 |
| 1278 @@ -1263,7 +1258,6 @@ |
| 1279 .unreq OUTPUT_COL |
| 1280 .unreq TMP1 |
| 1281 .unreq TMP2 |
| 1282 -.endfunc |
| 1283 |
| 1284 .purgem idct_helper |
| 1285 |
| 1286 @@ -1547,7 +1541,6 @@ |
| 1287 .unreq U |
| 1288 .unreq V |
| 1289 .unreq N |
| 1290 -.endfunc |
| 1291 |
| 1292 .purgem do_yuv_to_rgb |
| 1293 .purgem do_yuv_to_rgb_stage1 |
| 1294 @@ -1858,7 +1851,6 @@ |
| 1295 .unreq U |
| 1296 .unreq V |
| 1297 .unreq N |
| 1298 -.endfunc |
| 1299 |
| 1300 .purgem do_rgb_to_yuv |
| 1301 .purgem do_rgb_to_yuv_stage1 |
| 1302 @@ -1940,7 +1932,6 @@ |
| 1303 .unreq TMP2 |
| 1304 .unreq TMP3 |
| 1305 .unreq TMP4 |
| 1306 -.endfunc |
| 1307 |
| 1308 |
| 1309 /*****************************************************************************/ |
| 1310 @@ -2064,7 +2055,6 @@ |
| 1311 |
| 1312 .unreq DATA |
| 1313 .unreq TMP |
| 1314 -.endfunc |
| 1315 |
| 1316 |
| 1317 /*****************************************************************************/ |
| 1318 @@ -2166,7 +2156,6 @@ |
| 1319 .unreq CORRECTION |
| 1320 .unreq SHIFT |
| 1321 .unreq LOOP_COUNT |
| 1322 -.endfunc |
| 1323 |
| 1324 |
| 1325 /*****************************************************************************/ |
| 1326 @@ -2401,7 +2390,6 @@ |
| 1327 .unreq WIDTH |
| 1328 .unreq TMP |
| 1329 |
| 1330 -.endfunc |
| 1331 |
| 1332 .purgem upsample16 |
| 1333 .purgem upsample32 |
1238 Index: simd/jsimd_i386.c | 1334 Index: simd/jsimd_i386.c |
1239 =================================================================== | 1335 =================================================================== |
1240 --- simd/jsimd_i386.c (revision 829) | 1336 --- simd/jsimd_i386.c (revision 829) |
1241 +++ simd/jsimd_i386.c (working copy) | 1337 +++ simd/jsimd_i386.c (working copy) |
1242 @@ -61,6 +61,7 @@ | 1338 @@ -61,6 +61,7 @@ |
1243 simd_support &= JSIMD_SSE2; | 1339 simd_support &= JSIMD_SSE2; |
1244 } | 1340 } |
1245 | 1341 |
1246 +#ifndef JPEG_DECODE_ONLY | 1342 +#ifndef JPEG_DECODE_ONLY |
1247 GLOBAL(int) | 1343 GLOBAL(int) |
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1835 code = dctbl->ehufco[nbits]; | 1931 code = dctbl->ehufco[nbits]; |
1836 @@ -516,7 +546,7 @@ | 1932 @@ -516,7 +546,7 @@ |
1837 temp ^= temp3; \ | 1933 temp ^= temp3; \ |
1838 temp -= temp3; \ | 1934 temp -= temp3; \ |
1839 temp2 += temp3; \ | 1935 temp2 += temp3; \ |
1840 - nbits = jpeg_nbits_table[temp]; \ | 1936 - nbits = jpeg_nbits_table[temp]; \ |
1841 + nbits = JPEG_NBITS_NONZERO(temp); \ | 1937 + nbits = JPEG_NBITS_NONZERO(temp); \ |
1842 /* if run length > 15, must emit special run-length-16 codes (0xF0) */ \ | 1938 /* if run length > 15, must emit special run-length-16 codes (0xF0) */ \ |
1843 while (r > 15) { \ | 1939 while (r > 15) { \ |
1844 EMIT_BITS(code_0xf0, size_0xf0) \ | 1940 EMIT_BITS(code_0xf0, size_0xf0) \ |
OLD | NEW |