| Index: include/images/SkImageDecoder.h
|
| diff --git a/include/images/SkImageDecoder.h b/include/images/SkImageDecoder.h
|
| index ba22652f18392a3315ad0bad002b33b75b43b5a3..967cae6ddfda2142eb7ae314bade7b71ef4b6bb0 100644
|
| --- a/include/images/SkImageDecoder.h
|
| +++ b/include/images/SkImageDecoder.h
|
| @@ -15,6 +15,7 @@
|
| #include "SkImage.h"
|
| #include "SkRect.h"
|
| #include "SkRefCnt.h"
|
| +#include "SkTypes.h"
|
|
|
| class SkStream;
|
|
|
| @@ -22,7 +23,7 @@ class SkStream;
|
|
|
| Base class for decoding compressed images into a SkBitmap
|
| */
|
| -class SkImageDecoder {
|
| +class SkImageDecoder : public SkNoncopyable {
|
| public:
|
| virtual ~SkImageDecoder();
|
|
|
| @@ -433,9 +434,6 @@ private:
|
| mutable bool fShouldCancelDecode;
|
| bool fPreferQualityOverSpeed;
|
|
|
| - // illegal
|
| - SkImageDecoder(const SkImageDecoder&);
|
| - SkImageDecoder& operator=(const SkImageDecoder&);
|
| };
|
|
|
| /** Calling newDecoder with a stream returns a new matching imagedecoder
|
| @@ -483,5 +481,4 @@ DECLARE_DECODER_CREATOR(JPEGImageDecoder);
|
| DECLARE_DECODER_CREATOR(PNGImageDecoder);
|
| DECLARE_DECODER_CREATOR(WBMPImageDecoder);
|
| DECLARE_DECODER_CREATOR(WEBPImageDecoder);
|
| -
|
| #endif
|
|
|