Skip to content

Commit

Permalink
Split off Objective-C runtime wrappers
Browse files Browse the repository at this point in the history
  • Loading branch information
@fish2000
fish2000 committed May 24, 2015
1 parent ff92ed2 commit 69240c5
Show file tree
Hide file tree
Showing 8 changed files with 249 additions and 263 deletions.
1 change: 1 addition & 0 deletions fileList.cmake
View file
Expand Up @@ -124,6 +124,7 @@ set(hdrs
${hdrs_dir}/image.hh
${hdrs_dir}/imageformat.hh
${hdrs_dir}/memory.hh
${hdrs_dir}/objc-rt.hh
${hdrs_dir}/options.hh
${hdrs_dir}/pixels.hh
${hdrs_dir}/seekable.hh
Expand Down
11 changes: 2 additions & 9 deletions include/libimread/IO/apple.hh
View file
Expand Up @@ -22,10 +22,8 @@ namespace im {
#ifdef __OBJC__
namespace cf {

// using Releaser = std::function<void(CFTypeRef)>;
// Releaser basic = [](CFTypeRef cf) { CFRelease(cf); };
// Releaser image = [](CGImageRef cg) { CFRelease(cf); };
// Releaser context = [](CGContextRef cgc) { CGContextRelease(cgc); };
/// NOTE TO SELF:
/// replace this with CF++ and the like

template <typename C = CFTypeRef>
struct unref {
Expand All @@ -37,11 +35,6 @@ namespace im {
template <typename Ref>
using REF = std::unique_ptr<typename std::decay<Ref>::type, unref<Ref>>;

/// cf::REF<CGColorSpaceRef> colorSpace(CGColorSpaceCreateDeviceRGB());
/// cf::REF<CGContextRef> ctx(CGBitmapContextCreate((NULL, width * imageScale, height * imageScale,
/// 8, 0, colorSpace, kCGImageAlphaPremultipliedLast))
/// cf::REF<CGImageRef> image(CGBitmapContextCreateImage(ctx));

}
#endif

Expand Down
215 changes: 0 additions & 215 deletions include/libimread/coregraphics.hh
View file
Expand Up @@ -4,233 +4,18 @@
#ifndef LIBIMREAD_COREGRAPHICS_H_
#define LIBIMREAD_COREGRAPHICS_H_

#include <tuple>

#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
#import <CoreFoundation/CoreFoundation.h>
// #import <libimread/ext/UTI.h>
#endif

#include <libimread/libimread.hpp>
#include <libimread/halide.hh>
#include <libimread/IO/apple.hh>


namespace im {

/*
CGImageRef CreateScaledImageAtFactor(CGImageRef sourceImage, CGFloat scaleFactor) {
size_t sourceWidth = CGImageGetWidth(sourceImage);
size_t sourceHeight = CGImageGetHeight(sourceImage);
size_t scaledWidth = floorf(sourceWidth * scaleFactor);
size_t scaledHeight = floorf(sourceHeight * scaleFactor);
size_t bytesPerRow = scaledWidth * 4;
if (bytesPerRow % 16) {
bytesPerRow = ((bytesPerRow / 16) + 1) * 16;
}
CGContextRef bitmapContext = CGBitmapContextCreate(NULL, scaledWidth, scaledHeight, 8, bytesPerRow, CGImageGetColorSpace(sourceImage), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
if (!bitmapContext) {
NSLog(@"ERROR - failed to create bitmap context to rescale image");
return NULL;
}
CGContextScaleCTM(bitmapContext, scaleFactor, scaleFactor);
CGRect bounds = CGRectMake(0.0, 0.0, sourceWidth, sourceHeight);
CGContextClearRect(bitmapContext, bounds);
CGContextDrawImage(bitmapContext, bounds, sourceImage);
CGImageRef scaledImage = CGBitmapContextCreateImage(bitmapContext);
CGContextRelease(bitmapContext);
return scaledImage;
}
CFDataRef CreateCompressedJPEGDataFromImage(CGImageRef image, CGFloat compressionFactor) {
CFMutableDataRef imageData = CFDataCreateMutable(kCFAllocatorDefault, 0);
CGImageDestinationRef destination = CGImageDestinationCreateWithData(imageData, kUTTypeJPEG, 1, NULL);
if (!destination) {
NSLog(@"ERROR - failed to create in-memory image destination");
CFRelease(imageData);
return NULL;
}
// set JPEG compression
NSDictionary* properties = @{(id)kCGImageDestinationLossyCompressionQuality: @(compressionFactor)};
CGImageDestinationAddImage(destination, image, (__bridge CFDictionaryRef)properties);
BOOL status = CGImageDestinationFinalize(destination);
if (!status) {
NSLog(@"ERROR - failed to write scaled image to in-memory buffer");
CFRelease(imageData);
CFRelease(destination);
return NULL;
}
CFRelease(destination);
return (CFDataRef)imageData;
}
void saveJPG(std::vector<byte> data, ImageFactory *factory) {
@autoreleasepool {
@autoreleasepool {
NSData *datum;
@autoreleasepool {
datum = [[NSData alloc] initWithBytes:(const void *)&data[0]
length:(NSInteger)data.size()];
cf::REF<CGImageSourceRef> source(
CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL));
};
[datum release];
cf::REF<CGImageRef> image(GImageSourceCreateImageAtIndex(source, 0, NULL));
if (!image.get()) {} /// throw something
CGFloat scaleFactor = MAX(
(CGFloat)outputWidth/CGImageGetWidth(image),
(CGFloat)outputHeight/CGImageGetHeight(image));
cf::REF<CGImageRef> scaled(CreateScaledImageAtFactor(image, scaleFactor));
cf::REF<CFDataRef> compressed(CreateCompressedJPEGDataFromImage(scaled, compressionQuality));
datum = (__bridge_transfer NSData*)compressed;
//BOOL status = [datum writeToURL:outputFileURL atomically:YES];
};
}
*/

namespace objc {

struct id {

::id iid;

explicit id(::id ii)
:iid(ii)
{}

operator ::id() { return iid; }

struct cls {
std::string name() {
return std::string(::object_getClassName(iid));
}
::Class lookup() {
return ::objc_lookUpClass(::object_getClassName(iid));
}
};

};

struct selector {

::SEL sel;

explicit selector(::SEL s)
:sel(s)
{}
explicit selector(const std::string &name)
:sel(::sel_registerName(name.c_str()))
{}
explicit selector(const char *name)
:sel(::sel_registerName(name))
{}

operator ::SEL() { return sel; }

bool operator==(const objc::selector &s) {
return ::sel_isEqual(sel, s.sel) == YES;
}
bool operator!=(const objc::selector &s) {
return ::sel_isEqual(sel, s.sel) == NO;
}

std::string name() {
return std::string(::sel_getName(sel));
}

static objc::selector register(const std::string &name) {
return objc::selector(::sel_registerName(name.c_str()));
}
static objc::selector register(const char *name) {
return objc::selector(::sel_registerName(name));
}

};

objc::selector operator"" _SEL(const char *name) {
return objc::selector(name);
}


template <typename ...Args>
struct arguments {
using N = sizeof...(Args);
using make_index = std::index_sequence_for<Args...>;
using index_type = std::index_sequence<I...>;
using tuple_type = std::tuple<Args&&...>;

const std::size_t argc;
tuple_type args;

explicit arguments(Args&&... a)
:args(std::forward_as_tuple(a...))
,argc(N)
{}

private:
template <std::size_t ...I>
::id send_impl(::id self, ::SEL op, index_type idx) {
return ::objc_msgSend(self, op,
std::get<I>(std::forward<Args>(args))...);
}

public:
::id send(::id self, ::SEL op) {
return send_impl(self, op, index_type());
}

private:
arguments(const arguments&);
arguments(arguments&&);
arguments &operator=(const arguments&);
arguments &operator=(arguments&&);
};

struct msg {

::id self;
::SEL op;

explicit msg(::id s, ::SEL o)
:self(s), op(o)
{}

template <typename ...Args>
::id send(Args&& ...args) {
objc::arguments ARGS(args...);
return ARGS.send(self, op);
}

template <typename ...Args>
static ::id send(::id self, ::SEL op, Args&& ...args) {
objc::arguments ARGS(args...);
return ARGS.send(self, op);
}

private:
msg(const msg&);
msg(msg&&);
msg &operator=(const msg&);
msg &operator=(msg&&);

};

}

namespace apple {

template <typename T>
Expand Down

0 comments on commit 69240c5

Please sign in to comment.