Merge branch 'master' into dev

.travis.yml

@@ -11,6 +11,7 @@ os:
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 notifications:
   email: hihozhou@gmail.com
@@ -20,6 +21,7 @@ before_install:
   - sudo apt-get -qq update
   - sudo apt-get install gcc-4.8 -y -qq
   - sudo apt-get install g++-4.8 -y -qq
+  - sudo apt-get install python3-numpy
 
 install:
   # OpenCV dependencies - Details available at: http://docs.opencv.org/trunk/doc/tutorials/introduction/linux_install/linux_install.html

opencv.cc

@@ -244,6 +244,9 @@ const zend_function_entry opencv_functions[] = {
     ZEND_NS_NAMED_FE(OPENCV_NS, findContoursWithoutHierarchy, ZEND_FN(opencv_find_contours_without_hierarchy), opencv_find_contours_without_hierarchy_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, drawContours, ZEND_FN(opencv_draw_contours), opencv_draw_contours_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, boundingRect, ZEND_FN(opencv_bounding_rect), NULL)
+    ZEND_NS_NAMED_FE(OPENCV_NS, getRotationMatrix2D, ZEND_FN(opencv_get_rotation_matrix2D), NULL)
+    ZEND_NS_NAMED_FE(OPENCV_NS, warpAffine, ZEND_FN(opencv_warp_affine), opencv_warp_affine_arginfo)
+    ZEND_NS_NAMED_FE(OPENCV_NS, getRectSubPix, ZEND_FN(opencv_get_rect_sub_pix), opencv_get_rect_sub_pix_arginfo)
 	PHP_FE_END	/* Must be the last line in opencv_functions[] */
 };
 /* }}} */

source/opencv2/core/opencv_type.cc

@@ -18,6 +18,8 @@
 #include "../../../php_opencv.h"
 #include "../../../opencv_exception.h"
 #include "opencv_type.h"
+#include <algorithm>
+#include <iostream>
 
 zend_class_entry *opencv_point_ce;
 zend_class_entry *opencv_scalar_ce;
@@ -686,11 +688,33 @@ PHP_METHOD(opencv_rotated_rect, __construct)
     opencv_rotated_rect_update_property_by_c_rotated_rect(getThis(), obj->rotatedRect);
 }
 
+
+PHP_METHOD(opencv_rotated_rect, points)
+{
+    opencv_rotated_rect_object *this_object = Z_PHP_ROTATED_RECT_OBJ_P(getThis());
+
+    cv::Point2f pts[4];
+    this_object->rotatedRect->points(pts);
+    zval instance;
+
+    array_init(&instance);
+    for (int i = 0; i < 4; i++) {
+        zval OPENCV_CONNECT(point_zval,i);
+        object_init_ex(&OPENCV_CONNECT(point_zval,i), opencv_point_ce);
+        Z_PHP_POINT_OBJ_P(&OPENCV_CONNECT(point_zval,i))->point = new Point(pts[i]);
+        opencv_point_update_property_by_c_point(&OPENCV_CONNECT(point_zval,i), Z_PHP_POINT_OBJ_P(&OPENCV_CONNECT(point_zval,i))->point);
+        add_next_index_zval(&instance,&OPENCV_CONNECT(point_zval,i));
+    }
+    RETURN_ZVAL(&instance,0,0);
+
+}
+
 /**
  * opencv_rect_methods[]
  */
 const zend_function_entry opencv_rotated_rect_methods[] = {
         PHP_ME(opencv_rotated_rect, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+        PHP_ME(opencv_rotated_rect, points, NULL, ZEND_ACC_PUBLIC)
         PHP_FE_END
 };
 /* }}} */

source/opencv2/opencv_imgproc.h

@@ -247,6 +247,25 @@ ZEND_BEGIN_ARG_INFO_EX(opencv_draw_contours_arginfo, 0, 0, 9)
 ZEND_END_ARG_INFO()
 PHP_FUNCTION(opencv_draw_contours);
 PHP_FUNCTION(opencv_bounding_rect);
+PHP_FUNCTION(opencv_get_rotation_matrix2D);
+ZEND_BEGIN_ARG_INFO_EX(opencv_warp_affine_arginfo, 0, 0, 7)
+                ZEND_ARG_INFO(0, src)
+                ZEND_ARG_INFO(1, dst)
+                ZEND_ARG_INFO(0, M)
+                ZEND_ARG_INFO(0, dsize)
+                ZEND_ARG_INFO(0, flags)
+                ZEND_ARG_INFO(0, borderMode)
+                ZEND_ARG_INFO(0, borderValue)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_warp_affine);
+ZEND_BEGIN_ARG_INFO_EX(opencv_get_rect_sub_pix_arginfo, 0, 0, 5)
+                ZEND_ARG_INFO(0, image)
+                ZEND_ARG_INFO(0, patchSize)
+                ZEND_ARG_INFO(0, center)
+                ZEND_ARG_INFO(1, patch)
+                ZEND_ARG_INFO(0, patchType)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_get_rect_sub_pix);
 
 
 #endif //OPENCV_OPENCV_IMGPROC_H