| Index: src/codec/SkRawCodec.h~
 | 
| diff --git a/src/codec/SkRawCodec.h~ b/src/codec/SkRawCodec.h~
 | 
| new file mode 100644
 | 
| index 0000000000000000000000000000000000000000..45ad9154c5bf329639c1f733c34eb0746a3e592b
 | 
| --- /dev/null
 | 
| +++ b/src/codec/SkRawCodec.h~
 | 
| @@ -0,0 +1,85 @@
 | 
| +/*
 | 
| + * Copyright 2015 Google Inc.
 | 
| + *
 | 
| + * Use of this source code is governed by a BSD-style license that can be
 | 
| + * found in the LICENSE file.
 | 
| + */
 | 
| +
 | 
| +#ifndef SkRawCodec_DEFINED
 | 
| +#define SkRawCodec_DEFINED
 | 
| +
 | 
| +#include "SkCodec.h"
 | 
| +#include "SkImageInfo.h"
 | 
| +#include "SkStream.h"
 | 
| +
 | 
| +#include "dng_host.h"
 | 
| +
 | 
| +/*
 | 
| + *
 | 
| + * This class implements the decoding for jpeg images
 | 
| + *
 | 
| + */
 | 
| +class SkRawCodec : public SkCodec {
 | 
| +public:
 | 
| +
 | 
| +    /*
 | 
| +     * Checks the start of the stream to see if the image is a RAW
 | 
| +     * Does not take ownership of the stream
 | 
| +     */
 | 
| +    static bool IsRaw(SkStream*);
 | 
| +
 | 
| +    /*
 | 
| +     * Assumes IsRaw was called and returned true
 | 
| +     * Creates a RAW decoder
 | 
| +     * Takes ownership of the stream
 | 
| +     */
 | 
| +    static SkCodec* NewFromStream(SkStream*);
 | 
| +
 | 
| +protected:
 | 
| +
 | 
| +    /*
 | 
| +     * Recommend a set of destination dimensions given a requested scale
 | 
| +     */
 | 
| +    //SkISize onGetScaledDimensions(float desiredScale) const override;
 | 
| +
 | 
| +    /*
 | 
| +     * Initiates the RAW decode
 | 
| +     */
 | 
| +    Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options&,
 | 
| +            SkPMColor*, int*, int*) override;
 | 
| +
 | 
| +    SkEncodedFormat onGetEncodedFormat() const override {
 | 
| +        return kRAW_SkEncodedFormat;
 | 
| +    }
 | 
| +
 | 
| +    /*bool onRewind() override;
 | 
| +
 | 
| +    bool onDimensionsSupported(const SkISize&) override;*/
 | 
| +
 | 
| +private:
 | 
| +
 | 
| +    /*
 | 
| +     * Creates an instance of the decoder
 | 
| +     * Called only by NewFromStream
 | 
| +     *
 | 
| +     * @param srcInfo contains the source width and height
 | 
| +     * @param stream the encoded image data
 | 
| +     */
 | 
| +    SkRawCodec(const SkImageInfo& srcInfo, SkStream* stream,
 | 
| +               std::unique_ptr<dng_host>* host,
 | 
| +               std::unique_ptr<dng_negative>* negative);
 | 
| +
 | 
| +    // scanline decoding
 | 
| +    /*void initializeSwizzler(const SkImageInfo& dstInfo, const Options& options);
 | 
| +    SkSampler* getSampler(bool createIfNecessary) override;
 | 
| +    Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& options,
 | 
| +            SkPMColor ctable[], int* ctableCount) override;
 | 
| +    int onGetScanlines(void* dst, int count, size_t rowBytes) override;
 | 
| +    bool onSkipScanlines(int count) override;*/
 | 
| +
 | 
| +    std::unique_ptr<dng_host> host_;
 | 
| +    std::unique_ptr<dng_negative> negative_;
 | 
| +    typedef SkCodec INHERITED;
 | 
| +};
 | 
| +
 | 
| +#endif
 | 
| 
 |