Merge branch 'dev'

Author: hihozhou

opencv.cc

@@ -230,6 +230,7 @@ const zend_function_entry opencv_functions[] = {
 	ZEND_NS_NAMED_FE(OPENCV_NS, getStructuringElement, ZEND_FN(opencv_get_structuring_element), opencv_get_structuring_element_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, threshold, ZEND_FN(opencv_threshold), opencv_threshold_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, morphologyEx, ZEND_FN(opencv_morphology_ex), opencv_morphology_ex_arginfo)
+    ZEND_NS_NAMED_FE(OPENCV_NS, LUT, ZEND_FN(opencv_lut), opencv_lut_arginfo)
 	PHP_FE_END	/* Must be the last line in opencv_functions[] */
 };
 /* }}} */

source/opencv2/core/opencv_mat.cc

@@ -381,12 +381,45 @@ PHP_METHOD(opencv_mat, at)
     opencv_mat_object *this_object = Z_PHP_MAT_OBJ_P(getThis());
     if(value_zval == NULL){
         //get px value
-        RETURN_LONG(this_object->mat->at<Vec3b>((int)row,(int)col)[channel]/1);
+        switch (this_object->mat->channels()){
+            case 1:
+                this_object->mat->at<uchar>((int)row,(int)col);
+                break;
+            case 2:
+                RETURN_LONG(this_object->mat->at<Vec2b>((int)row,(int)col)[channel]);
+                break;
+            case 3:
+                RETURN_LONG(this_object->mat->at<Vec3b>((int)row,(int)col)[channel]);
+                break;
+            case 4:
+            RETURN_LONG(this_object->mat->at<Vec4b>((int)row,(int)col)[channel]);
+                break;
+            default:
+                opencv_throw_exception("Get Mat px only channel in 1,2,3,4.");
+                break;
+        }
+
     }else{
         //set px value
         convert_to_long(value_zval);
         zend_long value = Z_LVAL_P(value_zval);
-        this_object->mat->at<Vec3b>((int)row,(int)col)[channel]=saturate_cast<uchar>(value);
+        switch (this_object->mat->channels()){
+            case 1:
+                this_object->mat->at<uchar>((int)row,(int)col) = saturate_cast<uchar>(value);
+                break;
+            case 2:
+                this_object->mat->at<Vec2b>((int)row,(int)col)[channel]=saturate_cast<uchar>(value);
+                break;
+            case 3:
+                this_object->mat->at<Vec3b>((int)row,(int)col)[channel]=saturate_cast<uchar>(value);
+                break;
+            case 4:
+                this_object->mat->at<Vec4b>((int)row,(int)col)[channel]=saturate_cast<uchar>(value);
+                break;
+            default:
+                opencv_throw_exception("Get Mat px only channel in 1,2,3,4.");
+                break;
+        }
     }
     RETURN_NULL();
 }

source/opencv2/core/opencv_mat.h

@@ -19,6 +19,8 @@
 
 #include "../../../php_opencv.h"
 
+//todo Mat object noly unchar,need to support double,int,float
+
 extern void opencv_mat_init(void);
 
 extern zend_class_entry *opencv_mat_ce;

source/opencv2/opencv_core.cc

@@ -632,7 +632,7 @@ PHP_FUNCTION(opencv_log){
 
 /**
  * //todo mask parameter
- * CV\log
+ * CV\nromalize
  * @param execute_data
  * @param return_value
  */
@@ -665,3 +665,39 @@ PHP_FUNCTION(opencv_normalize){
     RETURN_NULL();
 
 }
+
+
+/**
+ *
+ * CV\LUT
+ * @param execute_data
+ * @param return_value
+ */
+PHP_FUNCTION(opencv_lut){
+    zval *src_zval, *lut_zval, *dst_zval;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OOz",
+                              &src_zval, opencv_mat_ce,
+                              &lut_zval, opencv_mat_ce,
+                              &dst_zval) == FAILURE) {
+        RETURN_NULL();
+    }
+    opencv_mat_object *src_object = Z_PHP_MAT_OBJ_P(src_zval);
+    opencv_mat_object *lut_object = Z_PHP_MAT_OBJ_P(lut_zval);
+    zval *dst_real_zval = Z_REFVAL_P(dst_zval);
+    opencv_mat_object *dst_object;
+    if(Z_TYPE_P(dst_real_zval) == IS_OBJECT && Z_OBJCE_P(dst_real_zval)==opencv_mat_ce){
+        dst_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
+    } else{
+        zval_ptr_dtor(dst_real_zval);
+        zval instance;
+        Mat dst;
+        object_init_ex(&instance,opencv_mat_ce);
+        ZVAL_COPY_VALUE(dst_real_zval, &instance);
+        dst_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
+        dst_object->mat = new Mat(dst);
+    }
+    LUT(*src_object->mat, *lut_object->mat, *dst_object->mat);
+    opencv_mat_update_property_by_c_mat(dst_real_zval, dst_object->mat);
+    RETURN_NULL();
+
+}

source/opencv2/opencv_core.h

@@ -99,4 +99,11 @@ ZEND_BEGIN_ARG_INFO_EX(opencv_absdiff_arginfo, 0, 0, 3)
 ZEND_END_ARG_INFO()
 PHP_FUNCTION(opencv_absdiff);
 
+ZEND_BEGIN_ARG_INFO_EX(opencv_lut_arginfo, 0, 0, 3)
+                ZEND_ARG_INFO(0, src)
+                ZEND_ARG_INFO(0, lut)
+                ZEND_ARG_INFO(1, dst)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_lut);
+
 #endif //OPENCV_CORE_H