diff -upa freewrl-1.22.13/src/lib/world_script/fieldGet.c.nojsco freewrl-1.22.13/src/lib/world_script/fieldGet.c
--- freewrl-1.22.13/src/lib/world_script/fieldGet.c.nojsco 2013-02-01 17:02:35.955396943 +0100
+++ freewrl-1.22.13/src/lib/world_script/fieldGet.c 2013-02-01 17:04:54.512391990 +0100
@@ -242,7 +242,7 @@ int set_one_MFElementType(int tonode, in
float *fp, *fp_in=(float *)Data;
/* create a new MFRotation object... */
- newMFObject = JS_ConstructObject(cx, &MFRotationClass,JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFRotationClass,JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -252,7 +252,7 @@ int set_one_MFElementType(int tonode, in
elementlen = (int) sizeof (float);
for (x=0; x<datalen; x++) {
/* create a new SFRotation object */
- newSFObject = JS_ConstructObject(cx,&SFRotationClass, newMFObject);
+ newSFObject = JS_NewObject(cx,&SFRotationClass, newMFObject, NULL);
if ((SFRPptr = (SFRotationNative *)JS_GetPrivate(newSFObject)) == NULL) {
printf ("failure in getting SF class at %s:%d\n",__FILE__,__LINE__);
#if defined(JS_THREADSAFE)
@@ -293,7 +293,7 @@ int set_one_MFElementType(int tonode, in
float *fp, *fp_in=(float *)Data;
/* create a new MFVec3f object... */
- newMFObject = JS_ConstructObject(cx, &MFVec3fClass,JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFVec3fClass,JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -303,7 +303,7 @@ int set_one_MFElementType(int tonode, in
elementlen = (int) sizeof (float);
for (x=0; x<datalen; x++) {
/* create a new SFVec3f object */
- newSFObject = JS_ConstructObject(cx,&SFVec3fClass, newMFObject);
+ newSFObject = JS_NewObject(cx,&SFVec3fClass, newMFObject, NULL);
if ((SFRPptr = (SFVec3fNative *)JS_GetPrivate(newSFObject)) == NULL) {
printf ("failure in getting SF class at %s:%d\n",__FILE__,__LINE__);
#if defined(JS_THREADSAFE)
@@ -343,7 +343,7 @@ int set_one_MFElementType(int tonode, in
float *fp, *fp_in=(float *)Data;
/* create a new MFColor object... */
- newMFObject = JS_ConstructObject(cx, &MFColorClass,JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFColorClass,JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -353,7 +353,7 @@ int set_one_MFElementType(int tonode, in
elementlen = (int) sizeof (float);
for (x=0; x<datalen; x++) {
/* create a new SFColor object */
- newSFObject = JS_ConstructObject(cx,&SFColorClass, newMFObject);
+ newSFObject = JS_NewObject(cx,&SFColorClass, newMFObject, NULL);
if ((SFRPptr = (SFColorNative *)JS_GetPrivate(newSFObject)) == NULL) {
printf ("failure in getting SF class at %s:%d\n",__FILE__,__LINE__);
#if defined(JS_THREADSAFE)
@@ -393,7 +393,7 @@ int set_one_MFElementType(int tonode, in
float *fp, *fp_in=(float *)Data;
/* create a new MFVec2f object... */
- newMFObject = JS_ConstructObject(cx, &MFVec2fClass,JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFVec2fClass,JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -403,7 +403,7 @@ int set_one_MFElementType(int tonode, in
elementlen = (int) sizeof (float);
for (x=0; x<datalen; x++) {
/* create a new SFVec2f object */
- newSFObject = JS_ConstructObject(cx,&SFVec2fClass, newMFObject);
+ newSFObject = JS_NewObject(cx,&SFVec2fClass, newMFObject, NULL);
if ((SFRPptr = (SFVec2fNative *)JS_GetPrivate(newSFObject)) == NULL) {
printf ("failure in getting SF class at %s:%d\n",__FILE__,__LINE__);
#if defined(JS_THREADSAFE)
@@ -441,7 +441,7 @@ int set_one_MFElementType(int tonode, in
jsval newjsval;
float *fp, *fp_in=(float *)Data;
/* create a new MFFloat object... */
- newMFObject = JS_ConstructObject(cx, &MFFloatClass, JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFFloatClass, JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -480,7 +480,7 @@ int set_one_MFElementType(int tonode, in
double *dp, *dp_in=(double *)Data;
/* create a new MFTime object... */
- newMFObject = JS_ConstructObject(cx, &MFTimeClass, JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFTimeClass, JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -519,7 +519,7 @@ int set_one_MFElementType(int tonode, in
int *ip, *ip_in=(int *)Data;
/* create a new MFInt32 object... */
- newMFObject = JS_ConstructObject(cx, &MFInt32Class, JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFInt32Class, JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -558,7 +558,7 @@ int set_one_MFElementType(int tonode, in
struct Uni_String * *ip_in=(struct Uni_String **)Data;
/* create a new MFString object... */
- newMFObject = JS_ConstructObject(cx, &MFStringClass, JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFStringClass, JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* Data points to a Uni_String */
@@ -597,7 +597,7 @@ int set_one_MFElementType(int tonode, in
jsval newjsval;
double *ip, *ip_in=(double *)Data;
/* create a new MFNode object... */
- newMFObject = JS_ConstructObject(cx, &MFNodeClass, JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &MFNodeClass, JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -635,7 +635,7 @@ int set_one_MFElementType(int tonode, in
double *ip, *ip_in=(double *)Data;
/* create a new MFNode object... */
- newMFObject = JS_ConstructObject(cx, &SFImageClass, JS_GetParent(obj));
+ newMFObject = JS_NewObject(cx, &SFImageClass, JS_GetParent(obj), NULL);
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
diff -upa freewrl-1.22.13/src/lib/world_script/jsVRML_MFClasses.c.nojsco freewrl-1.22.13/src/lib/world_script/jsVRML_MFClasses.c
--- freewrl-1.22.13/src/lib/world_script/jsVRML_MFClasses.c.nojsco 2013-02-01 17:00:53.353400611 +0100
+++ freewrl-1.22.13/src/lib/world_script/jsVRML_MFClasses.c 2013-02-01 17:01:46.316398717 +0100
@@ -1300,7 +1300,7 @@ VrmlMatrixinverse(JSContext *cx, unsigne
_getmatrix (cx, obj,src);
matinverse (dest,src);
- retObj = JS_ConstructObject(cx,&VrmlMatrixClass, NULL);
+ retObj = JS_NewObject(cx,&VrmlMatrixClass, NULL, NULL);
_setmatrix(cx,retObj,dest);
#if JS_VERSION < 185
@@ -1332,7 +1332,7 @@ VrmlMatrixtranspose(JSContext *cx, unsig
_getmatrix (cx, obj,src);
mattranspose (dest,src);
- retObj = JS_ConstructObject(cx,&VrmlMatrixClass, NULL);
+ retObj = JS_NewObject(cx,&VrmlMatrixClass, NULL, NULL);
_setmatrix(cx,retObj,dest);
#if JS_VERSION < 185
@@ -1376,7 +1376,7 @@ VrmlMatrixmultLeft(JSContext *cx, unsign
_getmatrix(cx,transObj,matrix2);
matmultiply(matrix1,matrix1,matrix2);
- retObj = JS_ConstructObject(cx,&VrmlMatrixClass, NULL);
+ retObj = JS_NewObject(cx,&VrmlMatrixClass, NULL, NULL);
/*
printf ("multLeft calculated Matrix: \n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n",
@@ -1426,7 +1426,7 @@ VrmlMatrixmultRight(JSContext *cx, unsig
_getmatrix(cx,transObj,matrix2);
matmultiply(matrix1,matrix2,matrix1);
- retObj = JS_ConstructObject(cx,&VrmlMatrixClass, NULL);
+ retObj = JS_NewObject(cx,&VrmlMatrixClass, NULL, NULL);
/*
printf ("multRight calculated Matrix: \n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n",
@@ -1487,7 +1487,7 @@ VrmlMatrixmultVecMatrix(JSContext *cx, u
matrotate2v(matrix1, inp, outp);
- retObj = JS_ConstructObject(cx,&SFVec3fClass, NULL);
+ retObj = JS_NewObject(cx,&SFVec3fClass, NULL, NULL);
if ((Vptr = (SFVec3fNative *)JS_GetPrivate(retObj)) == NULL) {
printf ("error in new VrmlMatrix\n");
return JS_FALSE;
@@ -1545,7 +1545,7 @@ VrmlMatrixmultMatrixVec(JSContext *cx, u
matrotate2v(matrix1, inp, outp);
- retObj = JS_ConstructObject(cx,&SFVec3fClass, NULL);
+ retObj = JS_NewObject(cx,&SFVec3fClass, NULL, NULL);
if ((Vptr = (SFVec3fNative *)JS_GetPrivate(retObj)) == NULL) {
printf ("error in new VrmlMatrix\n");
return JS_FALSE;
diff -upa freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c.nojsco freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c
--- freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c.nojsco 2013-02-01 16:58:12.819406349 +0100
+++ freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c 2013-02-01 17:00:23.814401666 +0100
@@ -1850,8 +1850,8 @@ SFRotationGetAxis(JSContext *cx, uint32_
printf ("start of SFRotationGetAxis\n");
#endif
- if ((_retObj = JS_ConstructObject(cx, &SFVec3fClass, NULL)) == NULL) {
- printf( "JS_ConstructObject failed in SFRotationGetAxis.\n");
+ if ((_retObj = JS_NewObject(cx, &SFVec3fClass, NULL, NULL)) == NULL) {
+ printf( "JS_NewObject failed in SFRotationGetAxis.\n");
return JS_FALSE;
}
@@ -1909,8 +1909,8 @@ SFRotationInverse(JSContext *cx, uint32_
printf( "JS_GetPrototype failed in SFRotationInverse.\n");
return JS_FALSE;
}
- if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto)) == NULL) {
- printf( "JS_ConstructObject failed in SFRotationInverse.\n");
+ if ((_retObj = JS_NewObject(cx, &SFRotationClass, _proto, NULL)) == NULL) {
+ printf( "JS_NewObject failed in SFRotationInverse.\n");
return JS_FALSE;
}
#if JS_VERSION < 185
@@ -1979,8 +1979,8 @@ SFRotationMultiply(JSContext *cx, uint32
return JS_FALSE;
}
- if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto)) == NULL) {
- printf( "JS_ConstructObject failed in SFRotationMultiply.\n");
+ if ((_retObj = JS_NewObject(cx, &SFRotationClass, _proto, NULL)) == NULL) {
+ printf( "JS_NewObject failed in SFRotationMultiply.\n");
return JS_FALSE;
}
@@ -2060,8 +2060,8 @@ SFRotationMultVec(JSContext *cx, uint32_
return JS_FALSE;
}
- if ((_retObj = JS_ConstructObject(cx, &SFVec3fClass, _proto)) == NULL) {
- printf( "JS_ConstructObject failed in SFRotationMultVec.\n");
+ if ((_retObj = JS_NewObject(cx, &SFVec3fClass, _proto, NULL)) == NULL) {
+ printf( "JS_NewObject failed in SFRotationMultVec.\n");
return JS_FALSE;
}
@@ -2203,8 +2203,8 @@ SFRotationSlerp(JSContext *cx, uint32_t
return JS_FALSE;
}
- if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto)) == NULL) {
- printf( "JS_ConstructObject failed in SFRotationSlerp.\n");
+ if ((_retObj = JS_NewObject(cx, &SFRotationClass, _proto, NULL)) == NULL) {
+ printf( "JS_NewObject failed in SFRotationSlerp.\n");
return JS_FALSE;
}
/* root the object */
@@ -2775,8 +2775,8 @@ JSBool SFVec2fGeneric( JSContext *cx, JS
return JS_FALSE;
}
if ((_retObj =
- JS_ConstructObject(cx, &SFVec2fClass, _proto)) == NULL) {
- printf( "JS_ConstructObject failed in SFVec2f.\n");
+ JS_NewObject(cx, &SFVec2fClass, _proto, NULL)) == NULL) {
+ printf( "JS_NewObject failed in SFVec2f.\n");
return JS_FALSE;
}
*rval = OBJECT_TO_JSVAL(_retObj);
@@ -3336,8 +3336,8 @@ JSBool SFVec3fGeneric( JSContext *cx, JS
return JS_FALSE;
}
if ((_retObj =
- JS_ConstructObject(cx, &SFVec3fClass, _proto)) == NULL) {
- printf( "JS_ConstructObject failed in SFVec3f.\n");
+ JS_NewObject(cx, &SFVec3fClass, _proto, NULL)) == NULL) {
+ printf( "JS_NewObject failed in SFVec3f.\n");
return JS_FALSE;
}
*rval = OBJECT_TO_JSVAL(_retObj);
@@ -3988,8 +3988,8 @@ JSBool SFVec3dGeneric( JSContext *cx, JS
return JS_FALSE;
}
if ((_retObj =
- JS_ConstructObject(cx, &SFVec3dClass, _proto)) == NULL) {
- printf( "JS_ConstructObject failed in SFVec3d.\n");
+ JS_NewObject(cx, &SFVec3dClass, _proto, NULL)) == NULL) {
+ printf( "JS_NewObject failed in SFVec3d.\n");
return JS_FALSE;
}
*rval = OBJECT_TO_JSVAL(_retObj);