Mirrors/libjpeg-turbo
0
0
Fork 0
mirror of https://github.com/libjpeg-turbo/libjpeg-turbo.git synced 2026-01-18 13:31:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

AltiVec: Fix -Wshadow warnings

Browse Source
This commit is contained in:
DRC
2025-09-25 16:34:20 -04:00
parent 7fbdfd60f0
commit c2f81b6d79
1 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
simd/powerpc/jsimd_altivec.h
View File

@@ -1,7 +1,7 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
* Copyright (C) 2014-2015, 2024, D. R. Commander. All Rights Reserved.
* Copyright (C) 2014-2015, 2024-2025, D. R. Commander. All Rights Reserved.
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -38,40 +38,38 @@
#define __16X(a) __8X(a), __8X(a)
#define TRANSPOSE(row, col) { \
__vector short row04l, row04h, row15l, row15h, \
row26l, row26h, row37l, row37h; \
__vector short col01e, col01o, col23e, col23o, \
col45e, col45o, col67e, col67o; \
__vector short r04l, r04h, r15l, r15h, r26l, r26h, r37l, r37h; \
__vector short c01e, c01o, c23e, c23o, c45e, c45o, c67e, c67o; \
\
/* transpose coefficients (phase 1) */ \
row04l = vec_mergeh(row##0, row##4); /* row04l=(00 40 01 41 02 42 03 43) */ \
row04h = vec_mergel(row##0, row##4); /* row04h=(04 44 05 45 06 46 07 47) */ \
row15l = vec_mergeh(row##1, row##5); /* row15l=(10 50 11 51 12 52 13 53) */ \
row15h = vec_mergel(row##1, row##5); /* row15h=(14 54 15 55 16 56 17 57) */ \
row26l = vec_mergeh(row##2, row##6); /* row26l=(20 60 21 61 22 62 23 63) */ \
row26h = vec_mergel(row##2, row##6); /* row26h=(24 64 25 65 26 66 27 67) */ \
row37l = vec_mergeh(row##3, row##7); /* row37l=(30 70 31 71 32 72 33 73) */ \
row37h = vec_mergel(row##3, row##7); /* row37h=(34 74 35 75 36 76 37 77) */ \
/* transpose coefficients (phase 1) */ \
r04l = vec_mergeh(row##0, row##4); /* r04l = (00 40 01 41 02 42 03 43) */ \
r04h = vec_mergel(row##0, row##4); /* r04h = (04 44 05 45 06 46 07 47) */ \
r15l = vec_mergeh(row##1, row##5); /* r15l = (10 50 11 51 12 52 13 53) */ \
r15h = vec_mergel(row##1, row##5); /* r15h = (14 54 15 55 16 56 17 57) */ \
r26l = vec_mergeh(row##2, row##6); /* r26l = (20 60 21 61 22 62 23 63) */ \
r26h = vec_mergel(row##2, row##6); /* r26h = (24 64 25 65 26 66 27 67) */ \
r37l = vec_mergeh(row##3, row##7); /* r37l = (30 70 31 71 32 72 33 73) */ \
r37h = vec_mergel(row##3, row##7); /* r37h = (34 74 35 75 36 76 37 77) */ \
\
/* transpose coefficients (phase 2) */ \
col01e = vec_mergeh(row04l, row26l); /* col01e=(00 20 40 60 01 21 41 61) */ \
col23e = vec_mergel(row04l, row26l); /* col23e=(02 22 42 62 03 23 43 63) */ \
col45e = vec_mergeh(row04h, row26h); /* col45e=(04 24 44 64 05 25 45 65) */ \
col67e = vec_mergel(row04h, row26h); /* col67e=(06 26 46 66 07 27 47 67) */ \
col01o = vec_mergeh(row15l, row37l); /* col01o=(10 30 50 70 11 31 51 71) */ \
col23o = vec_mergel(row15l, row37l); /* col23o=(12 32 52 72 13 33 53 73) */ \
col45o = vec_mergeh(row15h, row37h); /* col45o=(14 34 54 74 15 35 55 75) */ \
col67o = vec_mergel(row15h, row37h); /* col67o=(16 36 56 76 17 37 57 77) */ \
/* transpose coefficients (phase 2) */ \
c01e = vec_mergeh(r04l, r26l); /* c01e = (00 20 40 60 01 21 41 61) */ \
c23e = vec_mergel(r04l, r26l); /* c23e = (02 22 42 62 03 23 43 63) */ \
c45e = vec_mergeh(r04h, r26h); /* c45e = (04 24 44 64 05 25 45 65) */ \
c67e = vec_mergel(r04h, r26h); /* c67e = (06 26 46 66 07 27 47 67) */ \
c01o = vec_mergeh(r15l, r37l); /* c01o = (10 30 50 70 11 31 51 71) */ \
c23o = vec_mergel(r15l, r37l); /* c23o = (12 32 52 72 13 33 53 73) */ \
c45o = vec_mergeh(r15h, r37h); /* c45o = (14 34 54 74 15 35 55 75) */ \
c67o = vec_mergel(r15h, r37h); /* c67o = (16 36 56 76 17 37 57 77) */ \
\
/* transpose coefficients (phase 3) */ \
col##0 = vec_mergeh(col01e, col01o); /* col0=(00 10 20 30 40 50 60 70) */ \
col##1 = vec_mergel(col01e, col01o); /* col1=(01 11 21 31 41 51 61 71) */ \
col##2 = vec_mergeh(col23e, col23o); /* col2=(02 12 22 32 42 52 62 72) */ \
col##3 = vec_mergel(col23e, col23o); /* col3=(03 13 23 33 43 53 63 73) */ \
col##4 = vec_mergeh(col45e, col45o); /* col4=(04 14 24 34 44 54 64 74) */ \
col##5 = vec_mergel(col45e, col45o); /* col5=(05 15 25 35 45 55 65 75) */ \
col##6 = vec_mergeh(col67e, col67o); /* col6=(06 16 26 36 46 56 66 76) */ \
col##7 = vec_mergel(col67e, col67o); /* col7=(07 17 27 37 47 57 67 77) */ \
/* transpose coefficients (phase 3) */ \
col##0 = vec_mergeh(c01e, c01o); /* col0 = (00 10 20 30 40 50 60 70) */ \
col##1 = vec_mergel(c01e, c01o); /* col1 = (01 11 21 31 41 51 61 71) */ \
col##2 = vec_mergeh(c23e, c23o); /* col2 = (02 12 22 32 42 52 62 72) */ \
col##3 = vec_mergel(c23e, c23o); /* col3 = (03 13 23 33 43 53 63 73) */ \
col##4 = vec_mergeh(c45e, c45o); /* col4 = (04 14 24 34 44 54 64 74) */ \
col##5 = vec_mergel(c45e, c45o); /* col5 = (05 15 25 35 45 55 65 75) */ \
col##6 = vec_mergeh(c67e, c67o); /* col6 = (06 16 26 36 46 56 66 76) */ \
col##7 = vec_mergel(c67e, c67o); /* col7 = (07 17 27 37 47 57 67 77) */ \
}
#ifndef min
@@ -100,8 +98,6 @@
#if defined(__clang__)
#pragma clang diagnostic ignored "-Wc99-extensions"
#pragma clang diagnostic ignored "-Wshadow"
#elif defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wpedantic"
#pragma GCC diagnostic ignored "-Wshadow"
#endif