Individually enable and disable SkCodecs

src/codec/SkCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBmpCodec.h"
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
 #include "SkData.h"
 #include "SkGifCodec.h"
 #include "SkIcoCodec.h"
+#ifdef SK_CODEC_DECODES_JPEG
 #include "SkJpegCodec.h"

[msarett, 2016/02/17 14:34:54]

Don't think I can get rid of this ifdef.  SkJpegUtility_codec.h needs to extend
a few structs that are defined in libjpeg.

[mtklein, 2016/02/17 14:57:31]

Are you sure SkJpegCodec.h needs to include SkJpegUtility_codec.h?

[msarett, 2016/02/17 15:13:47]

Ahh thanks!  Removing this.

+#endif
+#ifdef SK_CODEC_DECODES_PNG

[msarett, 2016/02/17 14:34:54]

Was almost able to get rid of this ifdef by forward declaring png_structs.  The
problem is that the names have changed in different versions of libpng (though
they are always typedefed to png_structp).

[mtklein, 2016/02/17 14:57:31]

:/  Sure can't forward declare typedefs.

You can, however, do something like this:

SkPngCodec.h
---------------

class SkPngCodec {
public:
     static bool IsPng(const char*, size_t);
     static SkCodec* NewFromStream(SkStream*, SkPngChunkReader* = nullptr);
};

SkPngCodec.cpp
-----------------

namespace {
class PngCodec : public SkCodec {
     ....
};
}  // namespace

SkCodec* SkPngCodec::NewFromStream(...) { return new PngCodec(...); }

[msarett, 2016/02/17 15:13:47]

Gotcha that's cool.  I think I prefer this as is though - just to stay
consistent with the rest of the codecs.

 #include "SkPngCodec.h"
-#ifdef SK_CODEC_DECODES_RAW
+#endif
 #include "SkRawCodec.h"
-#endif
 #include "SkStream.h"
 #include "SkWbmpCodec.h"
 #include "SkWebpCodec.h"
 
 struct DecoderProc {
     bool (*IsFormat)(const void*, size_t);
     SkCodec* (*NewFromStream)(SkStream*);
 };
 
 static const DecoderProc gDecoderProcs[] = {
+#ifdef SK_CODEC_DECODES_JPEG
     { SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream },
+#endif
+#ifdef SK_CODEC_DECODES_WEBP
     { SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream },
+#endif
+#ifdef SK_CODEC_DECODES_GIF
     { SkGifCodec::IsGif, SkGifCodec::NewFromStream },
+#endif
+#ifdef SK_CODEC_DECODES_PNG
     { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },
+#endif
     { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream },
     { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewFromStream }
 };
 
 size_t SkCodec::MinBufferedBytesNeeded() {
     return WEBP_VP8_HEADER_SIZE;
 }
 
 SkCodec* SkCodec::NewFromStream(SkStream* stream,
                                 SkPngChunkReader* chunkReader) {
@@ skipping 27 matching lines @@
         // Attempt to read() and pass the actual amount read to the decoder.
         bytesRead = stream->read(buffer, bytesToRead);
         if (!stream->rewind()) {
             SkCodecPrintf("Encoded image data could not peek or rewind to determine format!\n");
             return nullptr;
         }
     }
 
     // PNG is special, since we want to be able to supply an SkPngChunkReader.
     // But this code follows the same pattern as the loop.
+#ifdef SK_CODEC_DECODES_PNG
     if (SkPngCodec::IsPng(buffer, bytesRead)) {
         return SkPngCodec::NewFromStream(streamDeleter.detach(), chunkReader);
-    } else {
+    } else
+#endif
+    {
         for (DecoderProc proc : gDecoderProcs) {
             if (proc.IsFormat(buffer, bytesRead)) {
                 return proc.NewFromStream(streamDeleter.detach());
             }
         }
 
 #ifdef SK_CODEC_DECODES_RAW
         // Try to treat the input as RAW if all the other checks failed.
         return SkRawCodec::NewFromStream(streamDeleter.detach());
 #endif
@@ skipping 268 matching lines @@
             SkASSERT(1 == linesRequested || this->getInfo().height() == linesRequested);
             const SkImageInfo fillInfo = info.makeWH(info.width(), 1);
             for (int srcY = linesDecoded; srcY < linesRequested; srcY++) {
                 fillDst = SkTAddOffset<void>(dst, this->outputScanline(srcY) * rowBytes);
                 fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, sampler);
             }
             break;
         }
     }
 }