diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-04 13:54:20 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-04 13:54:20 -0800 |
| commit | 030f536009b56dbcc23d284541e51562bd9a6ed3 (patch) | |
| tree | ffa22213bbcf93fa38c4d5741100f82f55236cfa /tools/aapt/Images.cpp | |
| parent | 56fde9e70ef850ca7e3f076e52567f5c75b5e7da (diff) | |
Stop using namespace std.
The pattern of #include and using namespace std here fails to build
with GCC. At first glance it's a GCC bug rather than libc++ doing
something wrong. Regardless, it can be worked around by just
specifying std:: where appropriate.
Bug: 19606303
Change-Id: I5652682eae7ca7559cf2a9307909859013440781
Diffstat (limited to 'tools/aapt/Images.cpp')
| -rw-r--r-- | tools/aapt/Images.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp index 5ab177ba490a..063b4e6801a0 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/Images.cpp @@ -481,8 +481,9 @@ static void get_outline(image_info* image) // assuming the image is a round rect, compute the radius by marching // diagonally from the top left corner towards the center - image->outlineAlpha = max(max_alpha_over_row(image->rows[innerMidY], innerStartX, innerEndX), - max_alpha_over_col(image->rows, innerMidX, innerStartY, innerStartY)); + image->outlineAlpha = std::max( + max_alpha_over_row(image->rows[innerMidY], innerStartX, innerEndX), + max_alpha_over_col(image->rows, innerMidX, innerStartY, innerStartY)); int diagonalInset = 0; find_max_opacity(image->rows, innerStartX, innerStartY, innerMidX, innerMidY, 1, 1, |