summaryrefslogtreecommitdiff
path: root/tools/aapt/Images.cpp
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2015-04-09 01:23:28 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-09 01:23:28 +0000
commit106f83ee9cc145a6421d21067c44b513cc148e80 (patch)
tree2b9cef955eef793ca9f0ee231330dd7830ca78fb /tools/aapt/Images.cpp
parent33a68a521f77a2070832ece271d1047ecf56de7e (diff)
parent4cead39a178dd8c4d7c1397e6ad5b861b08125b7 (diff)
am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge"
* commit '4cead39a178dd8c4d7c1397e6ad5b861b08125b7': Re-enable -Wall and -Werror that were lost in a merge
Diffstat (limited to 'tools/aapt/Images.cpp')
-rw-r--r--tools/aapt/Images.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index 063b4e6801a0..e4738f5eda7d 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -412,7 +412,6 @@ static void find_max_opacity(png_byte** rows,
int startX, int startY, int endX, int endY, int dX, int dY,
int* out_inset)
{
- bool opaque_within_inset = true;
uint8_t max_opacity = 0;
int inset = 0;
*out_inset = 0;