| Index: include/core/SkImageDecoder.h
|
| diff --git a/include/images/SkImageDecoder.h b/include/core/SkImageDecoder.h
|
| similarity index 99%
|
| rename from include/images/SkImageDecoder.h
|
| rename to include/core/SkImageDecoder.h
|
| index ba22652f18392a3315ad0bad002b33b75b43b5a3..5ef569047b81087ccc728ef8c486d51e648593d5 100644
|
| --- a/include/images/SkImageDecoder.h
|
| +++ b/include/core/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();
|
|
|
| @@ -432,10 +433,6 @@ private:
|
| bool fUsePrefTable;
|
| mutable bool fShouldCancelDecode;
|
| bool fPreferQualityOverSpeed;
|
| -
|
| - // illegal
|
| - SkImageDecoder(const SkImageDecoder&);
|
| - SkImageDecoder& operator=(const SkImageDecoder&);
|
| };
|
|
|
| /** Calling newDecoder with a stream returns a new matching imagedecoder
|
|
|