Changeset 14630 for trunk/FACT++

Timestamp:

11/16/12 23:19:19 (12 years ago)

Author:

tbretz

Message:

Fixed the HandleScope in the astrometry functions.

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (9 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -511 +511 @@
     return handle_scope.Close(Boolean::New(true));
 }
+
 Handle<Value> InterpreterV8::FuncDbQuery(const Arguments &args)
 {
@@ -1272 +1273 @@
 
     Handle<Value> arg[] = { Number::New(equ.ra/15), Number::New(equ.dec), date };
-    return fTemplateSky->GetFunction()->NewInstance(3, arg);
-
-    //return handle_scope.Close(ConstructSky(equ.ra/15, equ.dec, date));
+    return handle_scope.Close(fTemplateSky->GetFunction()->NewInstance(3, arg));
 }
 
@@ -1307 +1306 @@
 
     Handle<Value> arg[] = { Number::New(90-hrz.alt), Number::New(hrz.az), date };
-    return fTemplateLocal->GetFunction()->NewInstance(3, arg);
+    return handle_scope.Close(fTemplateLocal->GetFunction()->NewInstance(3, arg));
 }
 
@@ -1339 +1338 @@
 
     Handle<Value> arg[] = { Number::New(90-hrz.alt), Number::New(hrz.az), date };
-    return fTemplateLocal->GetFunction()->NewInstance(3, arg);
+    return handle_scope.Close(fTemplateLocal->GetFunction()->NewInstance(3, arg));
 }
 
@@ -1384 +1383 @@
     This->Set(String::New("time"),    date,                    ReadOnly);
 
-    return This;
-
-    //return handle_scope.Close(ConstructSky(equ.ra/15, equ.dec, date, true));
+    return handle_scope.Close(This);
 }
 
@@ -1404 +1401 @@
 
     // ----------------------------
+
+    HandleScope handle_scope;
 
     Handle<Object> This = args.This();
@@ -1428 +1427 @@
         This->Set(String::New("time"), args[2], ReadOnly);
 
-    return This;
+    return handle_scope.Close(This);
 }
 
@@ -1447 +1446 @@
 
     // --------------------
+
+    HandleScope handle_scope;
 
     Handle<Object> This = args.This();
@@ -1471 +1472 @@
         This->Set(String::New("time"), args[2], ReadOnly);
 
-    return This;
-
-    // ----------------------
+    return handle_scope.Close(This);
 }
 #endif