Merge branch 'master' into dev

Author: hihozhou

opencv.cc

@@ -189,6 +189,7 @@ const zend_function_entry opencv_functions[] = {
     ZEND_NS_NAMED_FE(OPENCV_NS, imwrite, ZEND_FN(opencv_imwrite), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, imshow, ZEND_FN(opencv_imshow), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, waitKey, ZEND_FN(opencv_wait_key), NULL)
+    ZEND_NS_NAMED_FE(OPENCV_NS, moveWindow, ZEND_FN(opencv_move_window), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, namedWindow, ZEND_FN(opencv_named_window), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, cvtColor, ZEND_FN(opencv_cv_t_color), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, ellipse, ZEND_FN(opencv_ellipse), NULL)

source/opencv2/opencv_highgui.cc

@@ -85,6 +85,25 @@ int php_window_flags_to_c_flags(int flags){
     return WINDOW_AUTOSIZE;
 }
 
+/**
+ * CV\moveWindow
+ * @param window_name
+ * @param x
+ * @param y
+ */
+PHP_FUNCTION(opencv_move_window){
+    char *window_name;
+    long window_name_len;
+    long x;
+    long y;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "sll", &window_name, &window_name_len, &x, &y) == FAILURE) {
+        RETURN_NULL();
+    }
+    moveWindow(window_name,(int)x,(int)y);
+    RETURN_NULL();
+}
+
 /**
  * CV\namedWindow
  * @param window_name

source/opencv2/opencv_highgui.h

@@ -22,6 +22,7 @@ extern void opencv_highgui_init(int module_number);
 
 PHP_FUNCTION(opencv_imshow);
 PHP_FUNCTION(opencv_wait_key);
+PHP_FUNCTION(opencv_move_window);
 PHP_FUNCTION(opencv_named_window);
 PHP_FUNCTION(opencv_create_trackbar);
 PHP_FUNCTION(opencv_destroy_window);