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

Commit 2daaa535 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix google-explict-constructor warnings in img_utils." am: c36d401e 

am: efc2112d

Change-Id: Ia1324682aa827b67f06a52fb1c7743c768b4a910
parents a944197b efc2112d

media/img_utils/include/img_utils/EndianUtils.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ class ANDROID_API EndianOutput : public Output { 
         * Wrap the given Output.  Calling write methods will result in

         * Wrap the given Output.  Calling write methods will result in

         * writes to this output.

         * writes to this output.

         */

         */

        EndianOutput(Output* out, Endianness end=LITTLE);

        explicit EndianOutput(Output* out, Endianness end=LITTLE);





        virtual ~EndianOutput();

        virtual ~EndianOutput();

media/img_utils/include/img_utils/FileInput.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ class ANDROID_API FileInput : public Input { 
        /**

        /**

         * Create a file input for the given path.

         * Create a file input for the given path.

         */

         */

        FileInput(String8 path);

        explicit FileInput(String8 path);





        virtual ~FileInput();

        virtual ~FileInput();

media/img_utils/include/img_utils/FileOutput.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ namespace img_utils { 




class ANDROID_API FileOutput : public Output {

class ANDROID_API FileOutput : public Output {

    public:

    public:

        FileOutput(String8 path);

        explicit FileOutput(String8 path);

        virtual ~FileOutput();

        virtual ~FileOutput();

        virtual status_t open();

        virtual status_t open();

        virtual status_t write(const uint8_t* buf, size_t offset, size_t count);

        virtual status_t write(const uint8_t* buf, size_t offset, size_t count);

media/img_utils/include/img_utils/TiffIfd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ namespace img_utils { 
 */

 */

class ANDROID_API TiffIfd : public TiffWritable {

class ANDROID_API TiffIfd : public TiffWritable {

    public:

    public:

        TiffIfd(uint32_t ifdId);

        explicit TiffIfd(uint32_t ifdId);

        virtual ~TiffIfd();

        virtual ~TiffIfd();





        /**

        /**