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

Unified Diff: src/codec/SkPngCodec.cpp

Issue 2268953005: We can't infer the right type for voidp for old png_jmpbuf() (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | no next file » | 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 a708f2a1a0ffc485da99f4b8b37cfe0c77d2162f..2c13b12c7e75ffa00a3e04da067def657fa35141 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -420,7 +420,7 @@ public:
// Assume that an error in libpng indicates an incomplete input.
int y = 0;
- if (setjmp(png_jmpbuf(fPng_ptr))) {
+ if (setjmp(png_jmpbuf((png_struct*)fPng_ptr))) {
SkCodecPrintf("Failed to read row.\n");
return y;
}
@@ -458,7 +458,7 @@ public:
}
bool onSkipScanlines(int count) override {
- if (setjmp(png_jmpbuf(fPng_ptr))) {
+ if (setjmp(png_jmpbuf((png_struct*)fPng_ptr))) {
SkCodecPrintf("Failed to skip row.\n");
return false;
}
@@ -499,7 +499,7 @@ public:
int readRows(const SkImageInfo& dstInfo, void* dst, size_t rowBytes, int count, int startRow)
override {
- if (setjmp(png_jmpbuf(fPng_ptr))) {
+ if (setjmp(png_jmpbuf((png_struct*)fPng_ptr))) {
SkCodecPrintf("Failed to get scanlines.\n");
// FIXME (msarett): Returning 0 is pessimistic. If we can complete a single pass,
// we may be able to report that all of the memory has been initialized. Even if we
@@ -810,7 +810,7 @@ void SkPngCodec::destroyReadStruct() {
bool SkPngCodec::initializeXforms(const SkImageInfo& dstInfo, const Options& options,
SkPMColor ctable[], int* ctableCount) {
- if (setjmp(png_jmpbuf(fPng_ptr))) {
+ if (setjmp(png_jmpbuf((png_struct*)fPng_ptr))) {
SkCodecPrintf("Failed on png_read_update_info.\n");
return false;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698