Merge pull request peterbraden#2 from jhurliman/master

Fix Matrix::Row() and Matrix::Col() to return proper BGR pixel values for images
jhurliman · May 5, 2012 · c13aa6a · c13aa6a
2 parents 118da26 + 765ee8d
commit c13aa6a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/Matrix.cc b/src/Matrix.cc
@@ -117,11 +117,15 @@ Matrix::Row(const Arguments& args){
   SETUP_FUNCTION(Matrix)
 
   int width = self->mat.size().width;
-  int j = args[0]->IntegerValue();
-  v8::Local<v8::Array> arr = v8::Array::New(width);
-
-  for (int i=0; i<width; i++){
-    arr->Set(i, Number::New(self->mat.at<double>(i, j)));
+  int y = args[0]->IntegerValue();
+  v8::Local<v8::Array> arr = v8::Array::New(width * 3);
+
+  for (int x=0; x<width; x++){
+    cv::Vec3b pixel = self->mat.at<cv::Vec3b>(y, x);
+    int offset = x * 3;
+    arr->Set(offset    , Number::New((double)pixel.val[0]));
+    arr->Set(offset + 1, Number::New((double)pixel.val[1]));
+    arr->Set(offset + 2, Number::New((double)pixel.val[2]));
   }
   return scope.Close(arr);
 }
@@ -130,12 +134,16 @@ Handle<Value>
 Matrix::Col(const Arguments& args){
   SETUP_FUNCTION(Matrix)
 
-  int width = self->mat.size().width;
-  int j = args[0]->IntegerValue();
-  v8::Local<v8::Array> arr = v8::Array::New(width);
+  int height = self->mat.size().height;
+  int x = args[0]->IntegerValue();
+  v8::Local<v8::Array> arr = v8::Array::New(height * 3);
 
-  for (int i=0; i<width; i++){
-    arr->Set(i, Number::New(self->mat.at<double>(j, i)));
+  for (int y=0; y<height; y++){
+    cv::Vec3b pixel = self->mat.at<cv::Vec3b>(y, x);
+    int offset = y * 3;
+    arr->Set(offset    , Number::New((double)pixel.val[0]));
+    arr->Set(offset + 1, Number::New((double)pixel.val[1]));
+    arr->Set(offset + 2, Number::New((double)pixel.val[2]));
   }
   return scope.Close(arr);
 }

diff --git a/src/OpenCV.cc b/src/OpenCV.cc
@@ -39,7 +39,7 @@ OpenCV::ReadImage(const Arguments &args) {
     } else if (args[0]->IsString()) {
 
       std::string filename = std::string(*v8::String::AsciiValue(args[0]->ToString()));
-      mat = cv::imread(filename, -1);
+      mat = cv::imread(filename);
 
     } else if (Buffer::HasInstance(args[0])){
      	uint8_t *buf = (uint8_t *) Buffer::Data(args[0]->ToObject());