Remove the SDImageCoderDecodePDFPrefersBitmap, for bitmap representation, use thumbnailPixelSize value instead

Author: dreampiggy

Example/SDWebImagePDFCoder/SDViewController.m

@@ -25,6 +25,7 @@ - (void)viewDidLoad
     [[SDImageCodersManager sharedManager] addCoder:PDFCoder];
     NSURL *pdfURL = [NSURL URLWithString:@"https://raw.githubusercontent.com/icons8/flat-color-icons/master/pdf/about.pdf"];
     NSURL *pdfURL2 = [NSURL URLWithString:@"https://raw.githubusercontent.com/icons8/flat-color-icons/master/pdf/webcam.pdf"];
+    NSURL *pdfURL3 = [NSURL URLWithString:@"https://raw.githubusercontent.com/icons8/flat-color-icons/master/pdf/like.pdf"];
 
     CGSize screenSize = self.view.bounds.size;
 
@@ -36,8 +37,13 @@ - (void)viewDidLoad
     imageView2.contentMode = UIViewContentModeScaleAspectFit;
     imageView2.clipsToBounds = YES;
 
+    UIImageView *imageView3 = [[UIImageView alloc] init];
+    imageView3.frame = CGRectMake(screenSize.width - 100, screenSize.height - 100, 100, 100);
+    imageView3.contentMode = UIViewContentModeScaleToFill;
+    
     [self.view addSubview:imageView1];
     [self.view addSubview:imageView2];
+    [self.view addSubview:imageView3];
 
     [imageView1 sd_setImageWithURL:pdfURL placeholderImage:nil options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
         if (image) {
@@ -46,7 +52,7 @@ - (void)viewDidLoad
             NSAssert(pdfData.length > 0, @"PDF Data export failed");
         }
     }];
-    [imageView2 sd_setImageWithURL:pdfURL2 placeholderImage:nil options:SDWebImageRetryFailed context:@{SDWebImageContextImageThumbnailPixelSize : @(imageView2.bounds.size)} progress:nil completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+    [imageView2 sd_setImageWithURL:pdfURL2 placeholderImage:nil options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
         if (image) {
             NSLog(@"PDF load animation success");
             [UIView animateWithDuration:2 animations:^{
@@ -58,6 +64,13 @@ - (void)viewDidLoad
             }];
         }
     }];
+    [imageView3 sd_setImageWithURL:pdfURL3 placeholderImage:nil options:SDWebImageRetryFailed context:@{SDWebImageContextImageThumbnailPixelSize: @(CGSizeMake(100, 100))} progress:nil completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+        if (image) {
+            NSLog(@"PDF bitmap load success.");
+            NSData *svgData = [image sd_imageDataAsFormat:SDImageFormatPDF];
+            NSAssert(!svgData, @"SVG Data should not exist");
+        }
+    }];
 }
 
 - (void)didReceiveMemoryWarning

SDWebImagePDFCoder/Classes/SDImagePDFCoder.m

@@ -65,25 +65,24 @@ - (UIImage *)decodedImageWithData:(NSData *)data options:(SDImageCoderOptions *)
     } else if (options[SDImageCoderDecodePDFPageNumber]) {
         pageNumber = [options[SDImageCoderDecodePDFPageNumber] unsignedIntegerValue];
     }
-    if (context[SDWebImageContextPDFPrefersBitmap]) {
-        prefersBitmap = [context[SDWebImageContextPDFPrefersBitmap] boolValue];
-    } else if (options[SDImageCoderDecodePDFPrefersBitmap]) {
-        prefersBitmap = [options[SDImageCoderDecodePDFPrefersBitmap] boolValue];
-    }
     if (context[SDWebImageContextPDFImageSize]) {
+        prefersBitmap = YES;
         NSValue *sizeValue = context[SDWebImageContextPDFImageSize];
 #if SD_MAC
         imageSize = sizeValue.sizeValue;
 #else
         imageSize = sizeValue.CGSizeValue;
 #endif
     } else if (options[SDImageCoderDecodeThumbnailPixelSize]) {
+        prefersBitmap = YES;
         NSValue *sizeValue = options[SDImageCoderDecodeThumbnailPixelSize];
 #if SD_MAC
         imageSize = sizeValue.sizeValue;
 #else
         imageSize = sizeValue.CGSizeValue;
 #endif
+    } else if (context[SDWebImageContextPDFPrefersBitmap]) {
+        prefersBitmap = [context[SDWebImageContextPDFPrefersBitmap] boolValue];
     }
     if (context[SDWebImageContextPDFImagePreserveAspectRatio]) {
         preserveAspectRatio = [context[SDWebImageContextPDFImagePreserveAspectRatio] boolValue];

SDWebImagePDFCoder/Classes/SDWebImagePDFCoderDefine.h

@@ -23,7 +23,7 @@ FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextPDFPag
  A BOOL value which specify whether we prefer the actual bitmap representation instead of vector representation for PDF image. This is because the UIImage on iOS 11+ (NSImgae on macOS) can use the vector image format, which support dynamic scale without losing any detail. However, for some image processing logic, user may need the actual bitmap representation to manage pixels. Also, for lower firmware on iOS, the `UIImage` does not support vector rendering, user may want to handle them using the same code. (NSNumber)
  If you don't provide this value, use NO for default value and prefer the vector format when possible.
  */
-FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextPDFPrefersBitmap;
+FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextPDFPrefersBitmap __attribute__((deprecated("Use the new context option (for WebCache category), or coder option (for SDImageCoder protocol) instead. Pass CGSize.zero means the box size of PDF", "SDWebImageContextImageThumbnailPixelSize")));
 
 #pragma mark - Bitmap Representation Options
 /**
@@ -50,13 +50,6 @@ FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextPDFIma
  */
 FOUNDATION_EXPORT SDImageCoderOption _Nonnull const SDImageCoderDecodePDFPageNumber;
 
-/**
- A BOOL value which specify whether we prefer the actual bitmap representation instead of vector representation for PDF image. This is because the UIImage on iOS 11+ (NSImgae on macOS) can use the vector image format, which support dynamic scale without losing any detail. However, for some image processing logic, user may need the actual bitmap representation to manage pixels. Also, for lower firmware on iOS, the `UIImage` does not support vector rendering, user may want to handle them using the same code. (NSNumber)
- If you don't provide this value, use NO for default value and prefer the vector format when possible.
- @note works for `SDImageCoder`
- */
-FOUNDATION_EXPORT SDImageCoderOption _Nonnull const SDImageCoderDecodePDFPrefersBitmap;
-
 /**
  `SDImageCoderDecodeThumnailPixelSize`: The same as context option `SDWebImageContextImageThumbnailPixelSize`
  `SDImageCoderDecodePreserveAspectRatio`: The same as context option `SDWebImageContextImagePreserveAspectRatio`