From 7309a365642841b473d811f1a344cccde1b1e351 Mon Sep 17 00:00:00 2001
From: aki <g.akshat@gmail.com>
Date: Mon, 9 Jun 2008 18:58:40 +0530
Subject: [PATCH] Some more debugs

---
 individual_files/.phpCairoContext.c.swp | Bin 16384 -> 16384 bytes
 individual_files/phpCairoContext.c      |  49 +++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/individual_files/.phpCairoContext.c.swp b/individual_files/.phpCairoContext.c.swp
index 96cf1160e3c14ef3d427d0f1965fbd0dc6c4f1e4..ff3c79dfea13d138e84bc1077f2125590ac675ea 100644
GIT binary patch
delta 903
zcwTLg&r1|x7{{O4U9;InvpPge#CVC>h0-p17}UVF9|tjoI#t^^`<f%NBQtN-w#bZh
z67mohbg)YW9XiE8w=P8x9qJ&F(5XMbGP9pj<9GIbL(K+0Jn!dypZ9s*XTnekLnSxV
ze)d$K-g)>4;cFpk&-R^sbiJAO7ar%{q;FnqNHtNkls=~g(@5w~5h;kPaU9=4T#)_?
zK7%-(7XA}{1M#=?A2NSBBm6u3A!2KT@Ne+jh%cpoh2KX!zfJf`90&CV)F?K-AmJ9`
zjPzw$pmn?O&+z2IPoyu&{2o>KC+YLjKf*f@FJ*-<O1~>ToiuJsE<^*nq65Jc?hW89
z`DMxW;!dLXU;(@X55PSz3cA1^up6v4BL}<%FTiu~4AejsTmZ*FC+Gkg_|Qc33e15s
z;I&5mRMd#}f(%Fj1rUgLpg5QZPr)QO3jW}+bHD@Rzy*U@F~sR?q+~)hS~0aupk8B@
za>*SUWi~HOSYwx&?lF#qNj37h#T{GUn$l}Ip4;nIIJ?UKo>bTsqn>GxS-xLl74B8_
zg3a=H6{&34W6Th#d6QIZskY^qo?9w2pL=fAutmK?-ExtnIm27GYeeet!D4atM9;yN
zddCsVACYBdr@HqAxT)i_H$4z<5w3UX#=l2-vDh&5gzJ?5J7<}@o>4z7$Z?1YZ8W*w
PE+=ax17g1Q&L*t^V#fRq

delta 461
zcwQ~g%_{_P9LMqRn0>(PE-R-^I4Om=Acwt3)<GM^Nr}Ur<e_YiJGB=QiBJx#hg_7>
zT=*ZhT$h|2IAN`2Jsie+`u(QfedaYy{id;P!?umsZ1?2IXlq|rk8stC47Vo|7uks9
zlUK1@GnigZb@qoRoT51u%53mTvP#5Y|6JGIWgoPEwU<ogAH2#2e9GVWkloa-;2hiG
zSN_5WY+m~lAF-)`a@ln=?m9RApnCAZ3w!LAb_s8@ZPm)}*!$pX?IPY`hia7H@ETjt
ze#O1)Os(<@9%T2mP2r#>Ztk72sMDNTu=ob@ewz3AsZQjM3Uo<Xnxi;XA|i|Q92U8u
qb2_6_I-z4)p)^fX3q6KJaulaVYM>~U)w!mWEXVN8Th91E$oCID8FQTg

diff --git a/individual_files/phpCairoContext.c b/individual_files/phpCairoContext.c
index 22cb70f..1c62cba 100644
--- a/individual_files/phpCairoContext.c
+++ b/individual_files/phpCairoContext.c
@@ -1052,10 +1052,10 @@ PHP_METHOD(CairoContext, glyph_extents)
 {
 	zend_class_entry * _this_ce;
 	int i;
-	zval * _this_zval = NULL;
+	zval * _this_zval = NULL, **ppzval;
 	zval * obj = NULL;
 	long num = -1;
-	cairo_glyph_t *glyphs=NULL , *glyph;
+	cairo_glyph_t **glyphs=NULL , **glyph;
 	HashTable *obj_hash = NULL;
 	cairo_text_extents_t extents;
 
@@ -1063,13 +1063,12 @@ PHP_METHOD(CairoContext, glyph_extents)
 		return;
 	}
 	obj_hash = HASH_OF(obj);
- 	
 	glyphs = emalloc(num*sizeof(cairo_glyph_t));
+
 	for(i=0 , glyph=glyphs; i<num; i++, glyph++) {
 		zend_hash_get_current_data(obj_hash, (void **)&glyph);
 		zend_hash_move_forward(obj_hash);
 	}
-
 	_this_ce = Z_OBJCE_P(_this_zval);
 	context_object *curr=(context_object *)zend_objects_get_address(_this_zval TSRMLS_CC);
 	
@@ -1082,6 +1081,7 @@ PHP_METHOD(CairoContext, glyph_extents)
 	add_assoc_double(return_value, "height", extents.height);
 	add_assoc_double(return_value, "x_advance", extents.x_advance);
 	add_assoc_double(return_value, "y_advance", extents.y_advance);
+	efree(glyphs);
 
 }
 /* }}} glyph_extents */
@@ -1815,7 +1815,7 @@ PHP_METHOD(CairoContext, scale)
 
 
 
-/* {{{ proto void select_font_face(object obj[, int slant, int weight])
+/* {{{ proto void select_font_face(object string[, int slant, int weight])
    */
 PHP_METHOD(CairoContext, select_font_face)
 {
@@ -1873,29 +1873,35 @@ PHP_METHOD(CairoContext, set_antialias)
 PHP_METHOD(CairoContext, set_dash)
 {
 	zend_class_entry * _this_ce;
-	double *das;
+	double *das, **d;
 	zval * _this_zval = NULL;
-	zval * dashes = NULL;
+	zval * dashes = NULL, **ppzval;
 	long num_dashes = 0;
 	HashTable *dashes_hash = NULL;
 	double offset = 0.0;
 	int i;
 
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oa/l|d", &_this_zval, CairoContext_ce_ptr, &dashes, &offset) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oa/l|d", &_this_zval, CairoContext_ce_ptr, &dashes, &num_dashes,  &offset) == FAILURE) {
 		return;
 	}
-	dashes_hash = HASH_OF(dashes);
+	dashes_hash = Z_ARRVAL_P(dashes);
 	das = emalloc(num_dashes * sizeof(double));
 	_this_ce = Z_OBJCE_P(_this_zval);
 	context_object *curr=(context_object *)zend_objects_get_address(_this_zval TSRMLS_CC);
-
-    for(i=0; i<num_dashes; i++) {
-        zend_hash_get_current_data(dashes_hash, (void **)&das[i]);
-        zend_hash_move_forward(dashes_hash);
-    }
+	i = zend_hash_num_elements(dashes_hash);
+	printf("num %d",i);
+	i=0;
+	for(zend_hash_internal_pointer_reset(dashes_hash); zend_hash_has_more_elements(dashes_hash) == SUCCESS; zend_hash_move_forward(dashes_hash)) { 
+		if (zend_hash_get_current_data(dashes_hash, (void **)&ppzval) == FAILURE) {
+        continue; 
+        } 
+		
+		das[i++] = Z_DVAL_PP(ppzval);
+	}
 	cairo_set_dash(curr->context, das, num_dashes, offset);
 	phpCAIRO_CONTEXT_ERROR(curr->context);
+	efree(das);
 	
 
 }
@@ -2328,7 +2334,7 @@ PHP_METHOD(CairoContext, show_glyphs)
 {
 	zend_class_entry * _this_ce;
 	int i;
-	zval * _this_zval = NULL;
+	zval * _this_zval = NULL, **ppzval;
 	zval * obj = NULL;
 	long num_glyphs = 0;
 	HashTable *obj_hash = NULL;
@@ -2345,11 +2351,20 @@ PHP_METHOD(CairoContext, show_glyphs)
     obj_hash = HASH_OF(obj);
 
 	glyphs = emalloc(num_glyphs*sizeof(cairo_glyph_t));
-	for(i=0 , glyph=glyphs; i<num_glyphs; i++, glyph++) {
+	i=0;
+    for(zend_hash_internal_pointer_reset(obj_hash); zend_hash_has_more_elements(obj_hash) == SUCCESS; zend_hash_move_forward(obj_hash)) {
+        if (zend_hash_get_current_data(obj_hash, (void **)&ppzval) == FAILURE) {
+		        continue; 
+	        }
+//        glyphs[i++] = Z_RESVAL_PP(ppzval);
+    }
+
+	
+/*	for(i=0 , glyph=glyphs; i<num_glyphs; i++, glyph++) {
 		zend_hash_get_current_data(obj_hash, (void **)&glyph);
         zend_hash_move_forward(obj_hash);
     }
-
+*/
 	cairo_show_glyphs(curr->context, glyphs, num_glyphs);
 	phpCAIRO_CONTEXT_ERROR(curr->context);
 
-- 
2.11.4.GIT