Fix warnings reported by -Wshadow: Part1b: scan_order struct and variable

- Change struct name to all caps SCAN_ORDER to be locally consistent.
- Rename struct pointers to 'scan_order' instead of hard to read short
  names 'so' and 'sc'.

Cherry-picked from aomedia/master: 30abc082

Change-Id: Ib9f0eefe28fa97d23d642b77d7dc8e5f8613177d
This commit is contained in:
Urvang Joshi
2016-10-14 15:53:39 -07:00
parent fdb60962f4
commit 03f6fdcfca
11 changed files with 75 additions and 71 deletions

View File

@@ -70,7 +70,7 @@ class AV1QuantizeTest : public ::testing::TestWithParam<QuantizeFuncParams> {
QuantizeFpFunc quanFunc = params_.qFunc;
QuantizeFpFunc quanFuncRef = params_.qFuncRef;
const scan_order scanOrder = av1_default_scan_orders[txSize];
const SCAN_ORDER scanOrder = av1_default_scan_orders[txSize];
for (int i = 0; i < numTests; i++) {
int err_count = 0;
ref_eob = eob = -1;
@@ -137,7 +137,7 @@ class AV1QuantizeTest : public ::testing::TestWithParam<QuantizeFuncParams> {
int log_scale = (txSize == TX_32X32);
QuantizeFpFunc quanFunc = params_.qFunc;
QuantizeFpFunc quanFuncRef = params_.qFuncRef;
const scan_order scanOrder = av1_default_scan_orders[txSize];
const SCAN_ORDER scanOrder = av1_default_scan_orders[txSize];
for (int i = 0; i < numTests; i++) {
ref_eob = eob = -1;