Skip to content

Commit

Permalink
Fixed the error that was causing the Travis builds to fail
Browse files Browse the repository at this point in the history
The issue was: since CocoaPods 0.38.0, the way pod headers are created on disk changed (see for example core-plot/core-plot#204). This caused the webp/decode.h file to be unaccessible from CocoaPods installations. We could not change the import to libwebp/webp/decode.h since our git clone installation would then fail (as the path for that is Vendors/libwebp/src/webp). The solution was to rely on the COCOAPODS macro to make 2 different imports for Cocoapods and the other installation type.
  • Loading branch information
bpoplauschi committed Oct 13, 2015
1 parent c1f6aec commit bf899e2
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions SDWebImage/UIImage+WebP.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@

#ifdef SD_WEBP
#import "UIImage+WebP.h"

#if !COCOAPODS
#import "webp/decode.h"
#else
#import "libwebp/webp/decode.h"
#endif

// Callback for CGDataProviderRelease
static void FreeImageData(void *info, const void *data, size_t size)
Expand Down

0 comments on commit bf899e2

Please sign in to comment.