Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

function signature of libeio's eio_custom has changed - build fails #8

Merged
merged 6 commits into from Dec 15, 2011
Merged

function signature of libeio's eio_custom has changed - build fails #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a73ef5
adapt to change in `eio_custom` signature
snd Dec 13, 2011
0035251
point main in package json to right location of compiled module
snd Dec 14, 2011
d561a09
BufferData -> Buffer::Data
snd Dec 14, 2011
af82a61
make Jpeg compatible to node 6
snd Dec 14, 2011
c561def
fix conflicting declaration
snd Dec 14, 2011
a75bfe0
add cast to unsigned char*
snd Dec 14, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{ {
"name": "jpeg", "name": "jpeg",
"version": "1.0.0", "version": "1.0.0",
"main": "jpeg", "main": "build/Release/jpeg",
"description": "A C++ module for node-js that converts RGB and RGBA buffers to a JPEG images (in memory).", "description": "A C++ module for node-js that converts RGB and RGBA buffers to a JPEG images (in memory).",
"keywords": [ "keywords": [
"jpg", "jpg",
Expand Down
6 changes: 2 additions & 4 deletions src/dynamic_jpeg_stack.cpp
View file
Open in desktop
Expand Up @@ -377,7 +377,7 @@ DynamicJpegStack::SetQuality(const Arguments &args)
return Undefined(); return Undefined();
} }


int void
DynamicJpegStack::EIO_JpegEncode(eio_req *req) DynamicJpegStack::EIO_JpegEncode(eio_req *req)
{ {
encode_request *enc_req = (encode_request *)req->data; encode_request *enc_req = (encode_request *)req->data;
Expand All @@ -392,7 +392,7 @@ DynamicJpegStack::EIO_JpegEncode(eio_req *req)
enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len); enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len);
if (!enc_req->jpeg) { if (!enc_req->jpeg) {
enc_req->error = strdup("malloc in DynamicJpegStack::EIO_JpegEncode failed."); enc_req->error = strdup("malloc in DynamicJpegStack::EIO_JpegEncode failed.");
return 0; return;
} }
else { else {
memcpy(enc_req->jpeg, encoder.get_jpeg(), enc_req->jpeg_len); memcpy(enc_req->jpeg, encoder.get_jpeg(), enc_req->jpeg_len);
Expand All @@ -401,8 +401,6 @@ DynamicJpegStack::EIO_JpegEncode(eio_req *req)
catch (const char *err) { catch (const char *err) {
enc_req->error = strdup(err); enc_req->error = strdup(err);
} }

return 0;
} }


int int
Expand Down
2 changes: 1 addition & 1 deletion src/dynamic_jpeg_stack.h
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ class DynamicJpegStack : public node::ObjectWrap {


void update_optimal_dimension(int x, int y, int w, int h); void update_optimal_dimension(int x, int y, int w, int h);


static int EIO_JpegEncode(eio_req *req); static void EIO_JpegEncode(eio_req *req);
static int EIO_JpegEncodeAfter(eio_req *req); static int EIO_JpegEncodeAfter(eio_req *req);
public: public:
DynamicJpegStack(buffer_type bbuf_type); DynamicJpegStack(buffer_type bbuf_type);
Expand Down
6 changes: 2 additions & 4 deletions src/fixed_jpeg_stack.cpp
View file
Open in desktop
Expand Up @@ -247,7 +247,7 @@ FixedJpegStack::SetQuality(const Arguments &args)
return Undefined(); return Undefined();
} }


int void
FixedJpegStack::EIO_JpegEncode(eio_req *req) FixedJpegStack::EIO_JpegEncode(eio_req *req)
{ {
encode_request *enc_req = (encode_request *)req->data; encode_request *enc_req = (encode_request *)req->data;
Expand All @@ -260,7 +260,7 @@ FixedJpegStack::EIO_JpegEncode(eio_req *req)
enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len); enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len);
if (!enc_req->jpeg) { if (!enc_req->jpeg) {
enc_req->error = strdup("malloc in FixedJpegStack::EIO_JpegEncode failed."); enc_req->error = strdup("malloc in FixedJpegStack::EIO_JpegEncode failed.");
return 0; return;
} }
else { else {
memcpy(enc_req->jpeg, encoder.get_jpeg(), enc_req->jpeg_len); memcpy(enc_req->jpeg, encoder.get_jpeg(), enc_req->jpeg_len);
Expand All @@ -269,8 +269,6 @@ FixedJpegStack::EIO_JpegEncode(eio_req *req)
catch (const char *err) { catch (const char *err) {
enc_req->error = strdup(err); enc_req->error = strdup(err);
} }

return 0;
} }


int int
Expand Down
2 changes: 1 addition & 1 deletion src/fixed_jpeg_stack.h
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ class FixedJpegStack : public node::ObjectWrap {


unsigned char *data; unsigned char *data;


static int EIO_JpegEncode(eio_req *req); static void EIO_JpegEncode(eio_req *req);
static int EIO_JpegEncodeAfter(eio_req *req); static int EIO_JpegEncodeAfter(eio_req *req);


public: public:
Expand Down
18 changes: 8 additions & 10 deletions src/jpeg.cpp
View file
Open in desktop
Expand Up @@ -25,8 +25,8 @@ Jpeg::Initialize(v8::Handle<v8::Object> target)
target->Set(String::NewSymbol("Jpeg"), t->GetFunction()); target->Set(String::NewSymbol("Jpeg"), t->GetFunction());
} }


Jpeg::Jpeg(Buffer *ddata, int wwidth, int hheight, buffer_type bbuf_type) : Jpeg::Jpeg(unsigned char *ddata, int wwidth, int hheight, buffer_type bbuf_type) :
jpeg_encoder((unsigned char *)BufferData(ddata), wwidth, hheight, 60, bbuf_type) {} jpeg_encoder(ddata, wwidth, hheight, 60, bbuf_type) {}


Handle<Value> Handle<Value>
Jpeg::JpegEncodeSync() Jpeg::JpegEncodeSync()
Expand All @@ -42,7 +42,7 @@ Jpeg::JpegEncodeSync()


int jpeg_len = jpeg_encoder.get_jpeg_len(); int jpeg_len = jpeg_encoder.get_jpeg_len();
Buffer *retbuf = Buffer::New(jpeg_len); Buffer *retbuf = Buffer::New(jpeg_len);
memcpy(BufferData(retbuf), jpeg_encoder.get_jpeg(), jpeg_len); memcpy(Buffer::Data(retbuf), jpeg_encoder.get_jpeg(), jpeg_len);
return scope.Close(retbuf->handle_); return scope.Close(retbuf->handle_);
} }


Expand Down Expand Up @@ -98,8 +98,8 @@ Jpeg::New(const Arguments &args)
return VException("Buffer type wasn't 'rgb', 'bgr', 'rgba' or 'bgra'."); return VException("Buffer type wasn't 'rgb', 'bgr', 'rgba' or 'bgra'.");
} }


Buffer *data_buf = ObjectWrap::Unwrap<Buffer>(args[0]->ToObject()); Local<Object> buffer = args[0]->ToObject();
Jpeg *jpeg = new Jpeg(data_buf, w, h, buf_type); Jpeg *jpeg = new Jpeg((unsigned char*) Buffer::Data(buffer), w, h, buf_type);
jpeg->Wrap(args.This()); jpeg->Wrap(args.This());
return args.This(); return args.This();
} }
Expand Down Expand Up @@ -137,7 +137,7 @@ Jpeg::SetQuality(const Arguments &args)
return Undefined(); return Undefined();
} }


int void
Jpeg::EIO_JpegEncode(eio_req *req) Jpeg::EIO_JpegEncode(eio_req *req)
{ {
encode_request *enc_req = (encode_request *)req->data; encode_request *enc_req = (encode_request *)req->data;
Expand All @@ -149,7 +149,7 @@ Jpeg::EIO_JpegEncode(eio_req *req)
enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len); enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len);
if (!enc_req->jpeg) { if (!enc_req->jpeg) {
enc_req->error = strdup("malloc in Jpeg::EIO_JpegEncode failed."); enc_req->error = strdup("malloc in Jpeg::EIO_JpegEncode failed.");
return 0; return;
} }
else { else {
memcpy(enc_req->jpeg, jpeg->jpeg_encoder.get_jpeg(), enc_req->jpeg_len); memcpy(enc_req->jpeg, jpeg->jpeg_encoder.get_jpeg(), enc_req->jpeg_len);
Expand All @@ -158,8 +158,6 @@ Jpeg::EIO_JpegEncode(eio_req *req)
catch (const char *err) { catch (const char *err) {
enc_req->error = strdup(err); enc_req->error = strdup(err);
} }

return 0;
} }


int int
Expand All @@ -178,7 +176,7 @@ Jpeg::EIO_JpegEncodeAfter(eio_req *req)
} }
else { else {
Buffer *buf = Buffer::New(enc_req->jpeg_len); Buffer *buf = Buffer::New(enc_req->jpeg_len);
memcpy(BufferData(buf), enc_req->jpeg, enc_req->jpeg_len); memcpy(Buffer::Data(buf), enc_req->jpeg, enc_req->jpeg_len);
argv[0] = buf->handle_; argv[0] = buf->handle_;
argv[1] = Undefined(); argv[1] = Undefined();
} }
Expand Down
4 changes: 2 additions & 2 deletions src/jpeg.h
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@
class Jpeg : public node::ObjectWrap { class Jpeg : public node::ObjectWrap {
JpegEncoder jpeg_encoder; JpegEncoder jpeg_encoder;


static int EIO_JpegEncode(eio_req *req); static void EIO_JpegEncode(eio_req *req);
static int EIO_JpegEncodeAfter(eio_req *req); static int EIO_JpegEncodeAfter(eio_req *req);
public: public:
static void Initialize(v8::Handle<v8::Object> target); static void Initialize(v8::Handle<v8::Object> target);
Jpeg(node::Buffer *ddata, int wwidth, int hheight, buffer_type bbuf_type); Jpeg(unsigned char *ddata, int wwidth, int hheight, buffer_type bbuf_type);
v8::Handle<v8::Value> JpegEncodeSync(); v8::Handle<v8::Value> JpegEncodeSync();
void SetQuality(int q); void SetQuality(int q);


Expand Down