Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22350
Modified Files:
Tag: devel_0_39
desire.c desire.h m_binbuf.c
Log Message:
fixes for some undefined value bugs
Index: m_binbuf.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v
retrieving revision 1.4.4.1.2.7
retrieving revision 1.4.4.1.2.8
diff -C2 -d -r1.4.4.1.2.7 -r1.4.4.1.2.8
*** m_binbuf.c 30 Jun 2006 11:22:42 -0000 1.4.4.1.2.7
--- m_binbuf.c 19 Nov 2006 08:01:55 -0000 1.4.4.1.2.8
***************
*** 7,11 ****
* changed the canvas_restore in "g_canvas.c", so that it might accept $args as well (like "pd $0_test")
* so you can make multiple & distinguishable templates
! * 1511:forum::für::umläute:2001
* change marked with IOhannes
*/
--- 7,11 ----
* changed the canvas_restore in "g_canvas.c", so that it might accept $args as well (like "pd $0_test")
* so you can make multiple & distinguishable templates
! * 1511:forum::fr::umlᅵte:2001
* change marked with IOhannes
*/
***************
*** 588,592 ****
/* IMPD: allows messages to unbound objects, via pointers */
if (!target) {
! if (!sscanf(s->s_name,".x%x",&target)) target=0;
}
#endif
--- 588,592 ----
/* IMPD: allows messages to unbound objects, via pointers */
if (!target) {
! if (!sscanf(s->s_name,".x%lx",(long*)&target)) target=0;
}
#endif
Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -C2 -d -r1.1.2.40 -r1.1.2.41
*** desire.h 13 Oct 2006 23:39:55 -0000 1.1.2.40
--- desire.h 19 Nov 2006 08:01:55 -0000 1.1.2.41
***************
*** 38,42 ****
--- 38,44 ----
*/
+ #ifndef DESIRE
#define DESIRE
+ #endif
#ifndef __DESIRE_H
#define __DESIRE_H
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.191
retrieving revision 1.1.2.192
diff -C2 -d -r1.1.2.191 -r1.1.2.192
*** desire.c 17 Nov 2006 05:03:57 -0000 1.1.2.191
--- desire.c 19 Nov 2006 08:01:53 -0000 1.1.2.192
***************
*** 1653,1657 ****
int style = filestyle == 0 ? PLOTSTYLE_POLY : filestyle == 1 ? PLOTSTYLE_POINTS : filestyle;
if (templateargsym != &s_float) {
! pd_error(x,"%s: only 'float' type understood", templateargsym->s_name);
return 0;
}
--- 1653,1657 ----
int style = filestyle == 0 ? PLOTSTYLE_POLY : filestyle == 1 ? PLOTSTYLE_POINTS : filestyle;
if (templateargsym != &s_float) {
! pd_error(gl,"%s: only 'float' type understood", templateargsym->s_name);
return 0;
}
***************
*** 1659,1671 ****
TEMPLATE_CHECK(gl,templatesym,0)
if (!template_find_field(t, gensym("z"), &zonset, &ztype, &zarraytype)) {
! pd_error(x,"template %s has no 'z' field", templatesym->s_name);
return 0;
}
if (ztype != DT_ARRAY) {
! pd_error(x,"template %s, 'z' field is not an array", templatesym->s_name);
return 0;
}
if (!(ztemplate = template_findbyname(zarraytype))) {
! pd_error(x,"no template of type %s", zarraytype->s_name);
return 0;
}
--- 1659,1671 ----
TEMPLATE_CHECK(gl,templatesym,0)
if (!template_find_field(t, gensym("z"), &zonset, &ztype, &zarraytype)) {
! pd_error(gl,"template %s has no 'z' field", templatesym->s_name);
return 0;
}
if (ztype != DT_ARRAY) {
! pd_error(gl,"template %s, 'z' field is not an array", templatesym->s_name);
return 0;
}
if (!(ztemplate = template_findbyname(zarraytype))) {
! pd_error(gl,"no template of type %s", zarraytype->s_name);
return 0;
}
***************
*** 5046,5056 ****
if (xonset >= 0) {
usexloc = basex + xloc + *(float *)((elem + elemsize*i) + xonset);
inextx = ixpix + 2;
} else {
usexloc = xsum;
xsum += xinc;
inextx = canvas_xtopixels(canvas, slot_cvttocoord(xslot, xsum));
}
- ixpix = canvas_xtopixels(canvas, slot_cvttocoord(xslot, usexloc));
yval = yonset>=0 ? yloc + *(float *)((elem + elemsize*i) + yonset) : 0;
if (yval > maxyval) maxyval = yval;
--- 5046,5057 ----
if (xonset >= 0) {
usexloc = basex + xloc + *(float *)((elem + elemsize*i) + xonset);
+ ixpix = canvas_xtopixels(canvas, slot_cvttocoord(xslot, usexloc));
inextx = ixpix + 2;
} else {
usexloc = xsum;
xsum += xinc;
+ ixpix = canvas_xtopixels(canvas, slot_cvttocoord(xslot, usexloc));
inextx = canvas_xtopixels(canvas, slot_cvttocoord(xslot, xsum));
}
yval = yonset>=0 ? yloc + *(float *)((elem + elemsize*i) + yonset) : 0;
if (yval > maxyval) maxyval = yval;
***************
*** 8083,8084 ****
--- 8084,8086 ----
}
+