dnrops
/
libraw-swift
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pointer points to imagedata - which is black?

This commit is contained in:
Thorsten Claus 2021-01-12 08:31:27 +01:00
parent bee1e7b0d5
commit 1160524f44
2 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Sources/SwiftLibRaw/ImageProcessing.swift
View File

@ -12,11 +12,11 @@ import CoreLocation
class ImageProcessing { class ImageProcessing {
// TODO: get Thumbnail
// Get an Image from RAW file // Get an Image from RAW file
public static func getImageFromData(_ rawdata: UnsafeMutablePointer<libraw_data_t>) -> String? { public static func getImageFromData(_ rawdata: UnsafeMutablePointer<libraw_data_t>) -> CGImage? {
guard unpackFile(rawdata) == LIBRAW_SUCCESS else { guard unpackFile(rawdata) == LIBRAW_SUCCESS else {
return nil return nil
@ -26,15 +26,7 @@ class ImageProcessing {
return nil return nil
} }
guard imageToMemory(rawdata) == LIBRAW_SUCCESS else { return imageToCGImage(rawdata)
return nil
}
defer {
libraw_recycle(rawdata);
libraw_close(rawdata);
}
return "OK"
} }
/// Unpacks the RAW files of the image, calculates the black level (not for all formats). The results are placed in imgdata.image. /// Unpacks the RAW files of the image, calculates the black level (not for all formats). The results are placed in imgdata.image.
@ -84,14 +76,9 @@ class ImageProcessing {
return LibRaw_errors.init(result) return LibRaw_errors.init(result)
} }
static func imageToMemory(_ rawdata : UnsafeMutablePointer<libraw_data_t>) -> LibRaw_errors { static func imageToCGImage(_ rawdata : UnsafeMutablePointer<libraw_data_t>) -> CGImage? {
var result : Int32 = 0 var result : Int32 = 0
let imageData = rawdata.pointee.image let processedImage = libraw_dcraw_make_mem_image(rawdata, &result)
let imageDataPointee1 = imageData?.pointee
let processedImage = libraw_dcraw_make_mem_image(rawdata, &result);
let imageDataPointee2 = imageData?.pointee
if (processedImage == nil) { if (processedImage == nil) {
if #available(OSX 11.0, *) { if #available(OSX 11.0, *) {
@ -102,24 +89,26 @@ class ImageProcessing {
libraw_recycle(rawdata); libraw_recycle(rawdata);
libraw_close(rawdata); libraw_close(rawdata);
return nil
} }
if let data = processedImage?.pointee { if let data = processedImage?.pointee {
let heigth = Int(data.height) let heigth = Int(data.height)
let width = Int(data.width) let width = Int(data.width)
let numberOfComponents = 3 let numberOfComponents = 3
let numBytes = heigth * width * numberOfComponents
let colorSpace = CGColorSpace(name: CGColorSpace.sRGB)! let colorSpace = CGColorSpace(name: CGColorSpace.sRGB)!
let dataPointer = withUnsafePointer(to: data.data) { let totalSize : Int = MemoryLayout.size(ofValue: processedImage) + Int(data.data_size)
$0.withMemoryRebound(to: UInt8.self, capacity: Int(data.data_size)){
return UnsafePointer($0) // TODO: Image bytes start at processedImage.data - pointer needs to be moved a bit
} let rgbData = (processedImage?.withMemoryRebound(to: UInt8.self, capacity: totalSize) {
} return CFDataCreate(nil, $0, Int(data.data_size))!
})!
let rgbData = CFDataCreate(nil, dataPointer, Int(data.data_size))!
let provider = CGDataProvider(data: rgbData)! let provider = CGDataProvider(data: rgbData)!
// TODO: Image seems to be perfectly black - why?
let rgbImageRef = CGImage(width: width, let rgbImageRef = CGImage(width: width,
height: heigth, height: heigth,
bitsPerComponent: Int(data.bits), bitsPerComponent: Int(data.bits),
@ -132,14 +121,13 @@ class ImageProcessing {
shouldInterpolate: true, shouldInterpolate: true,
intent: CGColorRenderingIntent.defaultIntent) intent: CGColorRenderingIntent.defaultIntent)
if (rgbImageRef == nil) { return rgbImageRef
return LIBRAW_DATA_ERROR
}
} }
libraw_recycle(rawdata);
return LibRaw_errors.init(result) libraw_close(rawdata);
return nil
} }
} }

5
Tests/SwiftLibRawTests/TestImageProcessing.swift
View File

@ -16,7 +16,8 @@ class TestImageProcessing : XCTestCase {
let fileOpenresult = FileHandling.openFile(fileUrl: testfilePath,rawdata: rawdata) let fileOpenresult = FileHandling.openFile(fileUrl: testfilePath,rawdata: rawdata)
XCTAssertEqual(fileOpenresult, LIBRAW_SUCCESS) XCTAssertEqual(fileOpenresult, LIBRAW_SUCCESS)
let unpackResult = ImageProcessing.getImageFromData(rawdata) let cgImage = ImageProcessing.getImageFromData(rawdata)
XCTAssertNotNil(unpackResult) XCTAssertNotNil(cgImage)
} }
} }