TSRMLS fixes

opencv_capture.cpp

@@ -142,7 +142,7 @@ PHP_METHOD(OpenCV_Capture, grabFrame)
     capture_object = opencv_capture_object_get(getThis() TSRMLS_CC);
     long result = cvGrabFrame(capture_object->cvptr);
 
-    php_opencv_throw_exception();
+    php_opencv_throw_exception(TSRMLS_C);
     RETURN_LONG(result);
 }
 
@@ -162,9 +162,9 @@ PHP_METHOD(OpenCV_Capture, retrieveFrame)
 
     capture_object = opencv_capture_object_get(getThis() TSRMLS_CC);
     temp = cvCloneImage(cvRetrieveFrame(capture_object->cvptr, 0));
-    php_opencv_make_image_zval(temp, return_value);
+    php_opencv_make_image_zval(temp, return_value TSRMLS_CC);
 
-    php_opencv_throw_exception();
+    php_opencv_throw_exception(TSRMLS_C);
 }
 
 PHP_METHOD(OpenCV_Capture, queryFrame)
@@ -183,9 +183,9 @@ PHP_METHOD(OpenCV_Capture, queryFrame)
 
     capture_object = opencv_capture_object_get(getThis() TSRMLS_CC);
     temp = cvCloneImage(cvQueryFrame(capture_object->cvptr));
-    php_opencv_make_image_zval(temp, return_value);
+    php_opencv_make_image_zval(temp, return_value TSRMLS_CC);
 
-    php_opencv_throw_exception();
+    php_opencv_throw_exception(TSRMLS_C);
 }
 
 PHP_METHOD(OpenCV_Capture, getProperty)
@@ -206,7 +206,7 @@ PHP_METHOD(OpenCV_Capture, getProperty)
 
     capture_object = opencv_capture_object_get(getThis() TSRMLS_CC);
     val = cvGetCaptureProperty(capture_object->cvptr, property);
-    php_opencv_throw_exception();
+    php_opencv_throw_exception(TSRMLS_C);
 
     /* FourCC is special */
     if (property == CV_CAP_PROP_FOURCC) {
@@ -234,7 +234,7 @@ PHP_METHOD(OpenCV_Capture, setProperty)
 
     capture_object = opencv_capture_object_get(getThis() TSRMLS_CC);
     val = cvSetCaptureProperty(capture_object->cvptr, property, val);
-    php_opencv_throw_exception();
+    php_opencv_throw_exception(TSRMLS_C);
 }
 
 /* {{{ opencv_capture_methods[] */

opencv_histogram.cpp

@@ -115,7 +115,7 @@ PHP_METHOD(OpenCV_Histogram, calc)
     image_object = opencv_image_object_get(image_zval TSRMLS_CC);
     cvCalcHist(&image_object->cvptr, hist_object->cvptr, accumulate, NULL);
 
-    php_opencv_throw_exception();
+    php_opencv_throw_exception(TSRMLS_C);
 }
 
 /* {{{ opencv_histogram_methods[] */

opencv_image.cpp

@@ -609,7 +609,7 @@ PHP_METHOD(OpenCV_Image, split) {
         MAKE_STD_ZVAL(return_zvals[i]);
         object_init_ex(return_zvals[i], opencv_ce_image);
         temp = cvCreateImage(cvGetSize(image_object->cvptr), IPL_DEPTH_8U, 1);
-        php_opencv_make_image_zval(temp, return_zvals[i]);
+        php_opencv_make_image_zval(temp, return_zvals[i] TSRMLS_CC);
         planes[i] = temp;
     }
 
@@ -649,7 +649,7 @@ PHP_METHOD(OpenCV_Image, convertColor) {
 
     temp = cvCreateImage(cvGetSize(image_object->cvptr), image_object->cvptr->depth, channels);
     cvCvtColor(image_object->cvptr, temp, code);
-    php_opencv_make_image_zval(temp, return_value);
+    php_opencv_make_image_zval(temp, return_value TSRMLS_CC);
 
     php_opencv_throw_exception(TSRMLS_C);
 }
@@ -675,7 +675,7 @@ PHP_METHOD(OpenCV_Image, backProject)
 
     temp = cvCloneImage(image_object->cvptr);
     cvCalcBackProject(&image_object->cvptr, temp, hist_object->cvptr);
-    php_opencv_make_image_zval(temp, return_value);
+    php_opencv_make_image_zval(temp, return_value TSRMLS_CC);
 
     php_opencv_throw_exception(TSRMLS_C);
 }
@@ -704,7 +704,7 @@ PHP_METHOD(OpenCV_Image, matchTemplate)
             IPL_DEPTH_32F, 1);
 
     cvMatchTemplate(image_object->cvptr, template_object->cvptr, temp, mode);
-    php_opencv_make_image_zval(temp, return_value);
+    php_opencv_make_image_zval(temp, return_value TSRMLS_CC);
     php_opencv_throw_exception(TSRMLS_C);
 }
 /* }}} */
@@ -781,7 +781,7 @@ PHP_METHOD(OpenCV_Image, haarDetectObjects)
     }
 
 	//cvReleaseImage(grey_image);
-	php_opencv_throw_exception();
+	php_opencv_throw_exception(TSRMLS_C);
 }
 /* }}} */
 

opencv_mat.cpp

@@ -131,7 +131,7 @@ PHP_METHOD(OpenCV_Mat, __construct)
     object = (opencv_mat_object *) zend_object_store_get_object(getThis() TSRMLS_CC);
     object->cvptr = new Mat(rows, cols, type);
 	opencv_mat_object_assign_properties(getThis() TSRMLS_CC);
-    php_opencv_throw_exception();
+    php_opencv_throw_exception(TSRMLS_C);
 }
 /* }}} */
 

php_opencv.h

@@ -105,7 +105,7 @@ typedef struct _opencv_capture_object {
 } opencv_capture_object;
 
 
-PHP_OPENCV_API extern void php_opencv_throw_exception();
+PHP_OPENCV_API extern void php_opencv_throw_exception(TSRMLS_D);
 PHP_OPENCV_API void php_opencv_basedir_check(const char *filename TSRMLS_DC);
 PHP_OPENCV_API extern opencv_image_object* opencv_image_object_get(zval *zobj TSRMLS_DC);
 PHP_OPENCV_API extern opencv_histogram_object* opencv_histogram_object_get(zval *zobj TSRMLS_DC);