Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: src/codec/SkPngCodec.cpp

Issue 1710083007: Update libpng to 1.6.22beta (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Keep the skia.googlesource mirror Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/libpng.gyp ('k') | src/codec/SkPngFilters.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/codec/SkPngCodec.cpp
diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index 974befc86d699be64f81a1bf65f7bf599f7aefa3..e7035c6e8aa426e112ed5a002d606f90575390c6 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -12,30 +12,11 @@
#include "SkMath.h"
#include "SkOpts.h"
#include "SkPngCodec.h"
-#include "SkPngFilters.h"
#include "SkSize.h"
#include "SkStream.h"
#include "SkSwizzler.h"
#include "SkTemplates.h"
-// png_struct::read_filter[] was added in libpng 1.5.7.
-#if defined(__SSE2__) && PNG_LIBPNG_VER >= 10507 && !defined(PNG_SKIP_SKIA_OPTS)
- #include "pngstruct.h"
-
- extern "C" void sk_png_init_filter_functions_sse2(png_structp png, unsigned int bpp) {
- if (bpp == 3) {
- png->read_filter[PNG_FILTER_VALUE_SUB -1] = sk_sub3_sse2;
- png->read_filter[PNG_FILTER_VALUE_AVG -1] = sk_avg3_sse2;
- png->read_filter[PNG_FILTER_VALUE_PAETH-1] = sk_paeth3_sse2;
- }
- if (bpp == 4) {
- png->read_filter[PNG_FILTER_VALUE_SUB -1] = sk_sub4_sse2;
- png->read_filter[PNG_FILTER_VALUE_AVG -1] = sk_avg4_sse2;
- png->read_filter[PNG_FILTER_VALUE_PAETH-1] = sk_paeth4_sse2;
- }
- }
-#endif
-
///////////////////////////////////////////////////////////////////////////////
// Callback functions
///////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « gyp/libpng.gyp ('k') | src/codec/SkPngFilters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698