[Gridflow-cvs] [svn] commit: r6333 - in /trunk/src: classes2.cxx classes3.cxx opencv.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Fri Sep 24 10:13:20 EDT 2010


Author: matju
Date: Fri Sep 24 10:13:02 2010
New Revision: 6333

Log:
'convert' changed to t_atom2

Modified:
    trunk/src/classes2.cxx
    trunk/src/classes3.cxx
    trunk/src/opencv.cxx

Modified: trunk/src/classes2.cxx
==============================================================================
--- trunk/src/classes2.cxx (original)
+++ trunk/src/classes2.cxx Fri Sep 24 10:13:02 2010
@@ -300,7 +300,7 @@
 
 //****************************************************************
 
-static inline const t_atom *convert (const t_atom &r, const t_atom **bogus) {return &r;}
+static inline const t_atom *convert (const t_atom2 &r, const t_atom **bogus) {return &r;}
 
 \class GFPrint : FObject {
 	string prefix;

Modified: trunk/src/classes3.cxx
==============================================================================
--- trunk/src/classes3.cxx (original)
+++ trunk/src/classes3.cxx Fri Sep 24 10:13:02 2010
@@ -894,14 +894,14 @@
 
 enum DrawMode {DRAW_FILL,DRAW_LINE,DRAW_POINT};
 enum OmitMode {OMIT_NONE,OMIT_LAST,OMIT_ODD};
-DrawMode convert(const t_atom &x, DrawMode *foo) {
+DrawMode convert(const t_atom2 &x, DrawMode *foo) {
 	t_symbol *s = convert(x,(t_symbol **)0);
 	if (s==gensym("fill")) return DRAW_FILL;
 	if (s==gensym("line")) return DRAW_LINE;
 	if (s==gensym("point")) return DRAW_POINT;
 	RAISE("unknown DrawMode '%s' (want fill or line)",s->s_name);
 }
-OmitMode convert(const t_atom &x, OmitMode *foo) {
+OmitMode convert(const t_atom2 &x, OmitMode *foo) {
 	t_symbol *s = convert(x,(t_symbol **)0);
 	if (s==gensym("none")) return OMIT_NONE;
 	if (s==gensym("last")) return OMIT_LAST;

Modified: trunk/src/opencv.cxx
==============================================================================
--- trunk/src/opencv.cxx (original)
+++ trunk/src/opencv.cxx Fri Sep 24 10:13:02 2010
@@ -188,9 +188,9 @@
 	t_binbuf *b = binbuf_new(); binbuf_addv(b,"ffff",s.val[0],s.val[1],s.val[2],s.val[3]);
 	set_atom(a,b);
 }
-CvPoint  convert (const t_atom &a, CvPoint *)   {USELIST; return cvPoint( GETI(0),GETI(1));}
-CvSize   convert (const t_atom &a, CvSize *)    {USELIST; return cvSize(  GETI(0),GETI(1));}
-CvScalar convert (const t_atom &a, CvScalar *)  {USELIST; return cvScalar(GETF(0),GETF(1),GETF(2),GETF(3));}
+CvPoint  convert (const t_atom2 &a, CvPoint *)   {USELIST; return cvPoint( GETI(0),GETI(1));}
+CvSize   convert (const t_atom2 &a, CvSize *)    {USELIST; return cvSize(  GETI(0),GETI(1));}
+CvScalar convert (const t_atom2 &a, CvScalar *)  {USELIST; return cvScalar(GETF(0),GETF(1),GETF(2),GETF(3));}
 
 /* ******************************** CLASSES ******************************** */
 



More information about the Gridflow-cvs mailing list