flutter_package / dart_pdf

Go to a project
Toggle navigation Toggle navigation pinning
Eduardo Vital Alencar Cunha
Committed by David PHAM-VAN
4c45977d 1 parent f3314485

Fix raster crash on iOS and MacOS 

- use guard let to prevent crashes when CGDataProvider cannot be instantiated
Inline Side-by-side
Showing 2 changed files with 10 additions and 8 deletions
... ... @@ -312,18 +312,19 @@ public class PrintJob: UIPrintPageRenderer, UIPrintInteractionControllerDelegate
}
public func rasterPdf(data: Data, pages: [Int]?, scale: CGFloat) {
let provider = CGDataProvider(data: data as CFData)!
guard
let provider = CGDataProvider(data: data as CFData),
let document = CGPDFDocument(provider)
if document == nil {
else {
printing.onPageRasterEnd(printJob: self, error: "Cannot raster a malformed PDF file")
return
}
DispatchQueue.global().async {
let pageCount = document!.numberOfPages
let pageCount = document.numberOfPages
for pageNum in pages ?? Array(0 ... pageCount - 1) {
guard let page = document!.page(at: pageNum + 1) else { continue }
guard let page = document.page(at: pageNum + 1) else { continue }
let angle = CGFloat(page.rotationAngle) * CGFloat.pi / -180
let rect = page.getBoxRect(.mediaBox)
let width = Int(abs((cos(angle) * rect.width + sin(angle) * rect.height) * scale))
... ...
... ... @@ -252,18 +252,19 @@ public class PrintJob: NSView, NSSharingServicePickerDelegate {
}
public func rasterPdf(data: Data, pages: [Int]?, scale: CGFloat) {
let provider = CGDataProvider(data: data as CFData)!
guard
let provider = CGDataProvider(data: data as CFData),
let document = CGPDFDocument(provider)
if document == nil {
else {
printing.onPageRasterEnd(printJob: self, error: "Cannot raster a malformed PDF file")
return
}
DispatchQueue.global().async {
let pageCount = document!.numberOfPages
let pageCount = document.numberOfPages
for pageNum in pages ?? Array(0 ... pageCount - 1) {
guard let page = document!.page(at: pageNum + 1) else { continue }
guard let page = document.page(at: pageNum + 1) else { continue }
let angle = CGFloat(page.rotationAngle) * CGFloat.pi / -180
let rect = page.getBoxRect(.mediaBox)
let width = Int(abs((cos(angle) * rect.width + sin(angle) * rect.height) * scale))
... ...