summaryrefslogtreecommitdiff
path: root/multimedia/php-pHash/files/patch-pHash.cpp
blob: ac8f638e011055f49c453c97b1e1f29f56c93981 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
--- pHash.cpp.orig	2013-04-23 18:54:02 UTC
+++ pHash.cpp
@@ -36,17 +36,23 @@ struct ph_text_hash
 
 /* {{{ phpinfo logo definitions */
 
+#if PHP_VERSION_ID < 50500
 #include "php_logos.h"
 
 
 static unsigned char pHash_logo[] = {
 #include "pHash_logos.h"
 }; 
+#endif
 /* }}} */
 
 /* {{{ Resource destructors */
 int le_ph_video_hash;
+#if PHP_VERSION_ID >= 70000
+extern "C" void ph_video_hash_dtor(zend_resource *rsrc TSRMLS_DC)
+#else
 extern "C" void ph_video_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+#endif
 {
 	ph_video_hash * resource = (ph_video_hash *)(rsrc->ptr);
 
@@ -58,7 +64,11 @@ extern "C" void ph_video_hash_dtor(zend_
 }
 
 int le_ph_image_hash;
+#if PHP_VERSION_ID >= 70000
+extern "C" void ph_image_hash_dtor(zend_resource *rsrc TSRMLS_DC)
+#else
 extern "C" void ph_image_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+#endif
 {
 	ulong64 * resource = (ulong64 *)(rsrc->ptr);
 
@@ -67,7 +77,11 @@ extern "C" void ph_image_hash_dtor(zend_
 }
 
 int le_ph_audio_hash;
+#if PHP_VERSION_ID >= 70000
+extern "C" void ph_audio_hash_dtor(zend_resource *rsrc TSRMLS_DC)
+#else
 extern "C" void ph_audio_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+#endif
 {
 	ph_audio_hash * resource = (ph_audio_hash *)(rsrc->ptr);
 
@@ -79,7 +93,11 @@ extern "C" void ph_audio_hash_dtor(zend_
 }
 
 int le_ph_txt_hash;
+#if PHP_VERSION_ID >= 70000
+extern "C" void ph_txt_hash_dtor(zend_resource *rsrc TSRMLS_DC)
+#else
 extern "C" void ph_txt_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+#endif
 {
 	ph_text_hash * resource = (ph_text_hash *)(rsrc->ptr);
 
@@ -145,7 +163,9 @@ ZEND_GET_MODULE(pHash)
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(pHash)
 {
+#if PHP_VERSION_ID < 50500
 	php_register_info_logo("PHASH_LOGO_ID", "", pHash_logo, 49651);
+#endif
 	le_ph_video_hash = zend_register_list_destructors_ex(ph_video_hash_dtor, 
 						   NULL, "ph_video_hash", module_number);
 	le_ph_image_hash = zend_register_list_destructors_ex(ph_image_hash_dtor, 
@@ -165,7 +185,9 @@ PHP_MINIT_FUNCTION(pHash)
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(pHash)
 {
+#if PHP_VERSION_ID < 50500
 	php_unregister_info_logo("PHASH_LOGO_ID");
+#endif
 
 	/* add your stuff here */
 
@@ -203,7 +225,9 @@ PHP_MINFO_FUNCTION(pHash)
 	if (SG(request_info).request_uri) {
 		php_printf("%s", (SG(request_info).request_uri));
 	}   
+#if PHP_VERSION_ID < 50500
 	php_printf("?=%s", "PHASH_LOGO_ID");
+#endif
 	php_printf("' align='right' alt='image' border='0'>\n");
 
 	php_printf("pHash\n");
@@ -225,10 +249,12 @@ PHP_MINFO_FUNCTION(pHash)
 PHP_FUNCTION(ph_dct_videohash)
 {
 	ph_video_hash * return_res;
+#if PHP_VERSION_ID < 70000
 	long return_res_id = -1;
+#endif
 
 	const char * file = NULL;
-	int file_len = 0;
+	SIZETorINT file_len = 0;
 
 
 
@@ -249,7 +275,11 @@ PHP_FUNCTION(ph_dct_videohash)
 	else
 		RETURN_FALSE;
 
+#if PHP_VERSION_ID >= 70000
+	RETURN_RES(zend_register_resource(return_res, le_ph_video_hash));
+#else
 	return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_video_hash);
+#endif
 }
 /* }}} ph_dct_videohash */
 
@@ -261,10 +291,12 @@ PHP_FUNCTION(ph_dct_videohash)
 PHP_FUNCTION(ph_dct_imagehash)
 {
 	ulong64 * return_res;
+#if PHP_VERSION_ID < 70000
 	long return_res_id = -1;
+#endif
 
 	const char * file = NULL;
-	int file_len = 0;
+	SIZETorINT file_len = 0;
 
 
 
@@ -282,7 +314,11 @@ PHP_FUNCTION(ph_dct_imagehash)
 	else
 		return_res = hash;
 
+#if PHP_VERSION_ID >= 70000
+	RETURN_RES(zend_register_resource(return_res, le_ph_image_hash));
+#else
 	return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_image_hash);
+#endif
 }
 /* }}} ph_dct_imagehash */
 
@@ -293,10 +329,12 @@ PHP_FUNCTION(ph_dct_imagehash)
 PHP_FUNCTION(ph_texthash)
 {
 	ph_text_hash * return_res;
+#if PHP_VERSION_ID < 70000
 	long return_res_id = -1;
+#endif
 
 	const char * file = NULL;
-	int file_len = 0;
+	SIZETorINT file_len = 0;
 
 
 
@@ -316,7 +354,11 @@ PHP_FUNCTION(ph_texthash)
 	else
 		RETURN_FALSE;
 
+#if PHP_VERSION_ID >= 70000
+	RETURN_RES(zend_register_resource(return_res, le_ph_txt_hash));
+#else
 	return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_txt_hash);
+#endif
 }
 /* }}} ph_texthash */
 
@@ -327,12 +369,14 @@ PHP_FUNCTION(ph_texthash)
 PHP_FUNCTION(ph_audiohash)
 {
 	ph_audio_hash * return_res;
+#if PHP_VERSION_ID < 70000
 	long return_res_id = -1;
+#endif
 
 	const char * file = NULL;
-	int file_len = 0;
-	long sample_rate = 5512;
-	long channels = 1;
+	SIZETorINT file_len = 0;
+	zppLONG sample_rate = 5512;
+	zppLONG channels = 1;
 
 
 
@@ -362,7 +406,11 @@ PHP_FUNCTION(ph_audiohash)
 	else
 		RETURN_FALSE;
 
+#if PHP_VERSION_ID >= 70000
+	RETURN_RES(zend_register_resource(return_res, le_ph_audio_hash));
+#else
 	return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_audio_hash);
+#endif
 }
 /* }}} ph_audiohash */
 
@@ -386,8 +434,17 @@ PHP_FUNCTION(ph_image_dist)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &h1_res, &h2_res) == FAILURE) {
 		return;
 	}
+#if PHP_VERSION_ID >= 70000
+	if ((h1 = (ulong64 *)zend_fetch_resource2(Z_RES_P(h1_res), "ph_image_hash", h1_resid, le_ph_image_hash)) == NULL) {
+		RETURN_FALSE;
+	}
+	if ((h2 = (ulong64 *)zend_fetch_resource2(Z_RES_P(h2_res), "ph_image_hash", h2_resid, le_ph_image_hash)) == NULL) {
+		RETURN_FALSE;
+	}
+#else
 	ZEND_FETCH_RESOURCE(h1, ulong64 *, &h1_res, h1_resid, "ph_image_hash", le_ph_image_hash);
 	ZEND_FETCH_RESOURCE(h2, ulong64 *, &h2_res, h2_resid, "ph_image_hash", le_ph_image_hash);
+#endif
 
 
 
@@ -415,15 +472,24 @@ PHP_FUNCTION(ph_video_dist)
 	int h2_resid = -1;
 	ph_video_hash * h2;
 
-	long thresh = 21;
+	zppLONG thresh = 21;
 
 
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l", &h1_res, &h2_res, &thresh) == FAILURE) {
 		return;
 	}
+#if PHP_VERSION_ID >= 70000
+	if ((h1 = (ph_video_hash *)zend_fetch_resource2(Z_RES_P(h1_res), "ph_video_hash", h1_resid, le_ph_video_hash)) == NULL) {
+		RETURN_FALSE;
+	}
+	if ((h2 = (ph_video_hash *)zend_fetch_resource2(Z_RES_P(h2_res), "ph_video_hash", h2_resid, le_ph_video_hash)) == NULL) {
+		RETURN_FALSE;
+	}
+#else
 	ZEND_FETCH_RESOURCE(h1, ph_video_hash *, &h1_res, h1_resid, "ph_video_hash", le_ph_video_hash);
 	ZEND_FETCH_RESOURCE(h2, ph_video_hash *, &h2_res, h2_resid, "ph_video_hash", le_ph_video_hash);
+#endif
 
 
 
@@ -452,7 +518,7 @@ PHP_FUNCTION(ph_audio_dist)
 	int h2_resid = -1;
 	ph_audio_hash * h2;
 
-	long block_size = 256;
+	zppLONG block_size = 256;
 	double thresh = 0.30;
 
 
@@ -460,8 +526,17 @@ PHP_FUNCTION(ph_audio_dist)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|ld", &h1_res, &h2_res, &block_size, &thresh) == FAILURE) {
 		return;
 	}
+#if PHP_VERSION_ID >= 70000
+	if ((h1 = (ph_audio_hash *)zend_fetch_resource2(Z_RES_P(h1_res), "ph_audio_hash", h1_resid, le_ph_audio_hash)) == NULL) {
+		RETURN_FALSE;
+	}
+	if ((h2 = (ph_audio_hash *)zend_fetch_resource2(Z_RES_P(h2_res), "ph_audio_hash", h2_resid, le_ph_audio_hash)) == NULL) {
+		RETURN_FALSE;
+	}
+#else
 	ZEND_FETCH_RESOURCE(h1, ph_audio_hash *, &h1_res, h1_resid, "ph_audio_hash", le_ph_audio_hash);
 	ZEND_FETCH_RESOURCE(h2, ph_audio_hash *, &h2_res, h2_resid, "ph_audio_hash", le_ph_audio_hash);
+#endif
 
 
 
@@ -510,8 +585,17 @@ PHP_FUNCTION(ph_compare_text_hashes)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &h1_res, &h2_res) == FAILURE) {
 		return;
 	}
+#if PHP_VERSION_ID >= 70000
+	if ((h1 = (ph_text_hash *)zend_fetch_resource2(Z_RES_P(h1_res), "ph_txt_hash", h1_resid, le_ph_txt_hash)) == NULL) {
+		RETURN_FALSE;
+	}
+	if ((h2 = (ph_text_hash *)zend_fetch_resource2(Z_RES_P(h2_res), "ph_txt_hash", h2_resid, le_ph_txt_hash)) == NULL) {
+		RETURN_FALSE;
+	}
+#else
 	ZEND_FETCH_RESOURCE(h1, ph_text_hash *, &h1_res, h1_resid, "ph_txt_hash", le_ph_txt_hash);
 	ZEND_FETCH_RESOURCE(h2, ph_text_hash *, &h2_res, h2_resid, "ph_txt_hash", le_ph_txt_hash);
+#endif
 
 
 
@@ -525,6 +609,14 @@ PHP_FUNCTION(ph_compare_text_hashes)
 		{
 			for(int i = 0; i < count; ++i)
 			{
+#if PHP_VERSION_ID >= 70000
+				zval array;
+				array_init(&array);
+				add_assoc_long(&array, "begin", m[i].first_index);
+				add_assoc_long(&array, "end", m[i].second_index);
+				add_assoc_long(&array, "length", m[i].length);
+				add_next_index_zval(return_value, &array);
+#else
 				zval *array;
 				MAKE_STD_ZVAL(array);
 				array_init(array);
@@ -532,6 +624,7 @@ PHP_FUNCTION(ph_compare_text_hashes)
 				add_assoc_long(array, "end", m[i].second_index);
 				add_assoc_long(array, "length", m[i].length);
 				add_next_index_zval(return_value, array);
+#endif
 			}
 			free(m);
 		}