Remove Arr object

beluvd · Jan 2, 2013 · 895f43a · 895f43a
1 parent 8847e8f
commit 895f43a
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 70 deletions.
diff --git a/config.m4 b/config.m4
@@ -27,7 +27,7 @@ if test "$PHP_OPENCV" != "no"; then
 
   PHP_NEW_EXTENSION(
 	opencv, 
-	opencv.cpp opencv_error.cpp opencv_mat.cpp opencv_arr.cpp opencv_image.cpp opencv_histogram.cpp opencv_capture.cpp, 
+	opencv.cpp opencv_error.cpp opencv_mat.cpp opencv_image.cpp opencv_histogram.cpp opencv_capture.cpp, 
 	$ext_shared,
 	,
 	,

diff --git a/opencv.cpp b/opencv.cpp
@@ -107,7 +107,6 @@ PHP_MINIT_FUNCTION(opencv)
 	*/
 
 	PHP_MINIT(opencv_error)(INIT_FUNC_ARGS_PASSTHRU);
-	PHP_MINIT(opencv_arr)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(opencv_mat)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(opencv_image)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(opencv_histogram)(INIT_FUNC_ARGS_PASSTHRU);

diff --git a/opencv_arr.cpp b/opencv_arr.cpp
diff --git a/opencv_image.cpp b/opencv_image.cpp
@@ -823,7 +823,7 @@ PHP_MINIT_FUNCTION(opencv_image)
 	zend_class_entry ce;
 
 	INIT_NS_CLASS_ENTRY(ce, "OpenCV", "Image", opencv_image_methods);
-	opencv_ce_image = zend_register_internal_class_ex(&ce, opencv_ce_cvarr, NULL TSRMLS_CC);
+	opencv_ce_image = zend_register_internal_class_ex(&ce, opencv_ce_cvmat, NULL TSRMLS_CC);
     opencv_ce_image->create_object = opencv_image_object_new;
 
 	#define REGISTER_IMAGE_LONG_CONST(const_name, value) \

diff --git a/opencv_mat.cpp b/opencv_mat.cpp
@@ -104,7 +104,7 @@ PHP_MINIT_FUNCTION(opencv_mat)
 	zend_class_entry ce;
 
     INIT_NS_CLASS_ENTRY(ce, "OpenCV", "Mat", opencv_mat_methods);
-	opencv_ce_cvarr = zend_register_internal_class_ex(&ce, opencv_ce_cvarr, NULL TSRMLS_CC);
+	opencv_ce_cvmat = zend_register_internal_class(&ce TSRMLS_CC);
 
 	return SUCCESS;
 }

diff --git a/php_opencv.h b/php_opencv.h
@@ -66,7 +66,6 @@ using namespace cv;
 PHP_MINIT_FUNCTION(opencv);
 PHP_MINIT_FUNCTION(opencv_error);
 PHP_MINIT_FUNCTION(opencv_mat);
-PHP_MINIT_FUNCTION(opencv_arr);
 PHP_MINIT_FUNCTION(opencv_image);
 PHP_MINIT_FUNCTION(opencv_histogram);
 PHP_MINIT_FUNCTION(opencv_capture);
@@ -77,17 +76,10 @@ PHP_RINIT_FUNCTION(opencv);
 extern zend_object_handlers opencv_std_object_handlers;
 extern zend_class_entry *opencv_ce_cvexception;
 extern zend_class_entry *opencv_ce_cvmat;
-extern zend_class_entry *opencv_ce_cvarr;
 extern zend_class_entry *opencv_ce_image;
 extern zend_class_entry *opencv_ce_histogram;
 
 
-typedef struct _opencv_arr_object {
-	zend_object std;
-	zend_bool constructed;
-	CvArr *cvptr;
-} opencv_arr_object;
-
 typedef struct _opencv_mat_object {
 	zend_object std;
 	zend_bool constructed;