Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix google-explicit-constructor warnings in core/jni."

Browse Source 
am: cfc9f5d03d

Change-Id: Ia0378869ca5896734d5dfbdddf937b2b6dc25dbf
This commit is contained in:
Chih-Hung Hsieh
2016-08-30 20:37:41 +00:00
committed by android-build-merger
parent 033101bb99 cfc9f5d03d
commit ed4b31f9e1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/GraphicsJNI.h
View File

@@ -127,7 +127,7 @@ public:
*/ */
class JavaPixelAllocator : public SkBRDAllocator { class JavaPixelAllocator : public SkBRDAllocator {
public: public:
JavaPixelAllocator(JNIEnv* env); explicit JavaPixelAllocator(JNIEnv* env);
~JavaPixelAllocator(); ~JavaPixelAllocator();
virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable) override; virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable) override;
@@ -215,7 +215,7 @@ private:
class AshmemPixelAllocator : public SkBitmap::Allocator { class AshmemPixelAllocator : public SkBitmap::Allocator {
public: public:
AshmemPixelAllocator(JNIEnv* env); explicit AshmemPixelAllocator(JNIEnv* env);
~AshmemPixelAllocator(); ~AshmemPixelAllocator();
virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable); virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable);
android::Bitmap* getStorageObjAndReset() { android::Bitmap* getStorageObjAndReset() {

4
core/jni/android/graphics/Utils.h
View File

@@ -28,7 +28,7 @@ namespace android {
class AssetStreamAdaptor : public SkStreamRewindable { class AssetStreamAdaptor : public SkStreamRewindable {
public: public:
AssetStreamAdaptor(Asset*); explicit AssetStreamAdaptor(Asset*);
virtual bool rewind(); virtual bool rewind();
virtual size_t read(void* buffer, size_t size); virtual size_t read(void* buffer, size_t size);
@@ -53,7 +53,7 @@ SkMemoryStream* CopyAssetToStream(Asset*);
*/ */
class AutoFDSeek { class AutoFDSeek {
public: public:
AutoFDSeek(int fd) : fFD(fd) { explicit AutoFDSeek(int fd) : fFD(fd) {
fCurr = ::lseek(fd, 0, SEEK_CUR); fCurr = ::lseek(fd, 0, SEEK_CUR);
} }
~AutoFDSeek() { ~AutoFDSeek() {

6
core/jni/android/graphics/YuvToJpegEncoder.h
View File

@@ -18,7 +18,7 @@ public:
*/ */
static YuvToJpegEncoder* create(int pixelFormat, int* strides); static YuvToJpegEncoder* create(int pixelFormat, int* strides);
YuvToJpegEncoder(int* strides); explicit YuvToJpegEncoder(int* strides);
/** Encode YUV data to jpeg, which is output to a stream. /** Encode YUV data to jpeg, which is output to a stream.
* *
@@ -47,7 +47,7 @@ protected:
class Yuv420SpToJpegEncoder : public YuvToJpegEncoder { class Yuv420SpToJpegEncoder : public YuvToJpegEncoder {
public: public:
Yuv420SpToJpegEncoder(int* strides); explicit Yuv420SpToJpegEncoder(int* strides);
virtual ~Yuv420SpToJpegEncoder() {} virtual ~Yuv420SpToJpegEncoder() {}
private: private:
@@ -61,7 +61,7 @@ private:
class Yuv422IToJpegEncoder : public YuvToJpegEncoder { class Yuv422IToJpegEncoder : public YuvToJpegEncoder {
public: public:
Yuv422IToJpegEncoder(int* strides); explicit Yuv422IToJpegEncoder(int* strides);
virtual ~Yuv422IToJpegEncoder() {} virtual ~Yuv422IToJpegEncoder() {}
private: private: