buffers somehow not working correctly and crashing findCode, removed

creatale · Aug 10, 2018 · b9b5548 · b9b5548
1 parent 64e6ce0
commit b9b5548
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/image.cc b/src/image.cc
@@ -197,6 +197,7 @@ NAN_MODULE_INIT(Image::Init)
     Nan::SetAccessor(ctorInst, Nan::New("width").ToLocalChecked(), GetWidth);
     Nan::SetAccessor(ctorInst, Nan::New("height").ToLocalChecked(), GetHeight);
     Nan::SetAccessor(ctorInst, Nan::New("depth").ToLocalChecked(), GetDepth);
+    Nan::SetAccessor(ctorInst, Nan::New("resolution").ToLocalChecked(), GetResolution, SetResolution);
 
     Nan::SetPrototypeMethod(ctor, "invert", Invert);
     Nan::SetPrototypeMethod(ctor, "or", Or);

diff --git a/src/zxing.cc b/src/zxing.cc
@@ -44,7 +44,7 @@ class PixSource : public zxing::LuminanceSource
 };
 
 PixSource::PixSource(Pix* pix, bool take)
-    : LuminanceSource(pix ? pix->w : 0, pix ? pix->h : 0)
+    : LuminanceSource(pix != NULL ? pix->w : 0, pix != NULL ? pix->h : 0)
 {
     if (take) {
         assert(pix->d == 8);
@@ -187,11 +187,10 @@ NAN_SETTER(ZXing::SetImage)
 {
     ZXing* obj = Nan::ObjectWrap::Unwrap<ZXing>(info.This());
     if (Image::HasInstance(value) || value->IsNull()) {
-        if (!obj->image_.IsEmpty()) {
-            obj->image_.Reset();
-        }
         if (!value->IsNull()) {
             obj->image_.Reset(value->ToObject());
+        } else if (!obj->image_.IsEmpty()) {
+            obj->image_.Reset();
         }
     } else {
         Nan::ThrowTypeError("value must be of type Image");
@@ -261,15 +260,7 @@ NAN_METHOD(ZXing::FindCode)
         object->Set(Nan::New("type").ToLocalChecked(),
                 Nan::New<String>(zxing::BarcodeFormat::barcodeFormatNames[result->getBarcodeFormat()]).ToLocalChecked());
         object->Set(Nan::New("data").ToLocalChecked(),
-                Nan::New<String>(resultStr.c_str()).ToLocalChecked());
-        if (result->getRawBytes() != NULL) {
-            std::vector<char> resultRawBytes = (*(result->getRawBytes())).values();
-            object->Set(Nan::New("buffer").ToLocalChecked(),
-                    Nan::NewBuffer((char*)resultRawBytes.data(), resultRawBytes.size()).ToLocalChecked());
-        } else {
-            object->Set(Nan::New("buffer").ToLocalChecked(),
-                    Nan::NewBuffer(0).ToLocalChecked());
-        }
+                Nan::New<String>(resultStr).ToLocalChecked());
         Local<Array> points = Nan::New<Array>();
         auto strX = Nan::New("x").ToLocalChecked();
         auto strY = Nan::New("y").ToLocalChecked();