Enable both static and dynamically linked libpng

src/codec/SkCodec_libpng.h

 /*
  * 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 "SkCodec.h"
 #include "SkColorTable.h"
 #include "SkEncodedFormat.h"
 #include "SkImageInfo.h"
 #include "SkRefCnt.h"
 #include "SkSwizzler.h"
 
 extern "C" {
-    #include "png.h"
+  #ifdef SKIA_PNG_PREFIXED

[scroggo, 2015/04/01 15:40:20]

nit: four space indents?

[djsollen, 2015/04/01 17:19:01]

Done.

+    // this must proceed png.h
+    #include "pngprefix.h"
+  #endif
+  #include "png.h"
 }
 
 class SkScanlineDecoder;
 class SkStream;
 
 class SkPngCodec : public SkCodec {
 public:
     // Assumes IsPng was called and returned true.
     static SkCodec* NewFromStream(SkStream*);
     static bool IsPng(SkStream*);
@@ skipping 21 matching lines @@
     // Helper to set up swizzler and color table. Also calls png_read_update_info.
     Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst,
                               size_t rowBytes, const Options&);
     bool decodePalette(bool premultiply);
     void finish();
 
     friend class SkPngScanlineDecoder;
 
     typedef SkCodec INHERITED;
 };