Merge "Fix google-explicit-constructor warnings in media utils."

am: 5e91082b3c

Change-Id: I4bb1f347db727e86c1255ccbb0e15dc9cc00169f
This commit is contained in:
Chih-hung Hsieh
2016-09-10 17:15:05 +00:00
committed by android-build-merger

View File

@@ -37,7 +37,7 @@ private:
size_t mPosition;
public:
AssetStream(SkStream* stream);
explicit AssetStream(SkStream* stream);
~AssetStream();
// Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer
@@ -60,7 +60,7 @@ private:
const size_t kMinSizeToRead = 8192;
public:
BufferedStream(SkStream* stream);
explicit BufferedStream(SkStream* stream);
~BufferedStream();
// Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer
@@ -79,8 +79,8 @@ private:
size_t mPosition;
public:
FileStream(const int fd);
FileStream(const String8 filename);
explicit FileStream(const int fd);
explicit FileStream(const String8 filename);
~FileStream();
// Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer