Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfc9f5d0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents cff3f700 a6543289
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public:
 */
class JavaPixelAllocator : public SkBRDAllocator {
public:
    JavaPixelAllocator(JNIEnv* env);
    explicit JavaPixelAllocator(JNIEnv* env);
    ~JavaPixelAllocator();

    virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable) override;
@@ -215,7 +215,7 @@ private:

class AshmemPixelAllocator : public SkBitmap::Allocator {
public:
    AshmemPixelAllocator(JNIEnv* env);
    explicit AshmemPixelAllocator(JNIEnv* env);
    ~AshmemPixelAllocator();
    virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable);
    android::Bitmap* getStorageObjAndReset() {
+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ namespace android {

class AssetStreamAdaptor : public SkStreamRewindable {
public:
    AssetStreamAdaptor(Asset*);
    explicit AssetStreamAdaptor(Asset*);

    virtual bool rewind();
    virtual size_t read(void* buffer, size_t size);
@@ -53,7 +53,7 @@ SkMemoryStream* CopyAssetToStream(Asset*);
 */
class AutoFDSeek {
public:
    AutoFDSeek(int fd) : fFD(fd) {
    explicit AutoFDSeek(int fd) : fFD(fd) {
        fCurr = ::lseek(fd, 0, SEEK_CUR);
    }
    ~AutoFDSeek() {
+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ public:
     */
    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.
     *
@@ -47,7 +47,7 @@ protected:

class Yuv420SpToJpegEncoder : public YuvToJpegEncoder {
public:
    Yuv420SpToJpegEncoder(int* strides);
    explicit Yuv420SpToJpegEncoder(int* strides);
    virtual ~Yuv420SpToJpegEncoder() {}

private:
@@ -61,7 +61,7 @@ private:

class Yuv422IToJpegEncoder : public YuvToJpegEncoder {
public:
    Yuv422IToJpegEncoder(int* strides);
    explicit Yuv422IToJpegEncoder(int* strides);
    virtual ~Yuv422IToJpegEncoder() {}

private: