From a14dd69430a328933d62f709115ff7c23fcee584 Mon Sep 17 00:00:00 2001 From: rhysd Date: Sun, 2 Oct 2016 19:57:50 +0900 Subject: [PATCH] Remove unused fields in Pattern class --- src/CanvasPattern.cc | 11 ++--------- src/CanvasPattern.h | 3 +-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/CanvasPattern.cc b/src/CanvasPattern.cc index 4c54633..ed64f9a 100644 --- a/src/CanvasPattern.cc +++ b/src/CanvasPattern.cc @@ -41,8 +41,6 @@ NAN_METHOD(Pattern::New) { return Nan::ThrowTypeError("Class constructors cannot be invoked without 'new'"); } - int w = 0 - , h = 0; cairo_surface_t *surface; Local obj = info[0]->ToObject(); @@ -53,15 +51,11 @@ NAN_METHOD(Pattern::New) { if (!img->isComplete()) { return Nan::ThrowError("Image given has not completed loading"); } - w = img->width; - h = img->height; surface = img->surface(); // Canvas } else if (Nan::New(Canvas::constructor)->HasInstance(obj)) { Canvas *canvas = Nan::ObjectWrap::Unwrap(obj); - w = canvas->width; - h = canvas->height; surface = canvas->surface(); // Invalid @@ -69,7 +63,7 @@ NAN_METHOD(Pattern::New) { return Nan::ThrowTypeError("Image or Canvas expected"); } - Pattern *pattern = new Pattern(surface,w,h); + Pattern *pattern = new Pattern(surface); pattern->Wrap(info.This()); info.GetReturnValue().Set(info.This()); } @@ -79,8 +73,7 @@ NAN_METHOD(Pattern::New) { * Initialize linear gradient. */ -Pattern::Pattern(cairo_surface_t *surface, int w, int h): - _width(w), _height(h) { +Pattern::Pattern(cairo_surface_t *surface) { _pattern = cairo_pattern_create_for_surface(surface); } diff --git a/src/CanvasPattern.h b/src/CanvasPattern.h index ffdbba6..102c74f 100644 --- a/src/CanvasPattern.h +++ b/src/CanvasPattern.h @@ -15,12 +15,11 @@ class Pattern: public Nan::ObjectWrap { static Nan::Persistent constructor; static void Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target); static NAN_METHOD(New); - Pattern(cairo_surface_t *surface, int w, int h); + Pattern(cairo_surface_t *surface); inline cairo_pattern_t *pattern(){ return _pattern; } private: ~Pattern(); - int _width, _height; // TODO REPEAT/REPEAT_X/REPEAT_Y cairo_pattern_t *_pattern; };