aboutsummaryrefslogtreecommitdiff
path: root/src/decoder/test/image_utils.h
diff options
context:
space:
mode:
authorGravatar Jeff McGlynn <jwmcglynn@google.com>2018-08-07 19:03:06 -0700
committerGravatar Jeff McGlynn <jwmcglynn@google.com>2018-08-07 19:17:01 -0700
commitd16f2f6c3c7c2f899fde35782e1ee978877bb14b (patch)
tree877265e53f23c6898638daeb36bb4c41e2a05847 /src/decoder/test/image_utils.h
parent6b50058889099e4287f683b97a86ca74607172c4 (diff)
Fix build errors when used by the Android Emulator
In the Android Emulator, there are two main differences: 1) googletest is the shared version 1.8.0, instead of the later commit used by astc-codec (to get bazel support). 2) Unit tests are all linked together into one binary, so one function needs to be marked "static".
Diffstat (limited to 'src/decoder/test/image_utils.h')
-rw-r--r--src/decoder/test/image_utils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/decoder/test/image_utils.h b/src/decoder/test/image_utils.h
index 718696e..adfded5 100644
--- a/src/decoder/test/image_utils.h
+++ b/src/decoder/test/image_utils.h
@@ -116,7 +116,7 @@ static std::string LoadASTCFile(const std::string& basename) {
}
}
-void LoadGoldenBmp(const std::string& path, ImageBuffer* result) {
+static void LoadGoldenBmp(const std::string& path, ImageBuffer* result) {
constexpr size_t kBmpHeaderSize = 54;
SCOPED_TRACE(testing::Message() << "LoadGoldenBmp " << path);