star-mc

commit dcca0f80d0ec28980e7dba56affea716bffe7db8
parent 252717d95f1f36372b545b7253375b9b12b8f809
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 12 May 2015 12:48:08 +0200

Fix the compilation of the light path test

Diffstat:
M
cmake/CMakeLists.txt
 | 
1
-
M
src/test_smc_light_path.c
 | 
8
++++----

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -51,7 +51,6 @@ endif()
 
 include_directories(${RSys_INCLUDE_DIR} ${StarSP_INCLUDE_DIR})
 
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
 include(rcmake)
 include(rcmake_runtime)
diff --git a/src/test_smc_light_path.c b/src/test_smc_light_path.c
@@ -385,7 +385,7 @@ main(int argc, char** argv)
     (&allocator, IMG_WIDTH*IMG_HEIGHT, sizeof(struct integrator_context));
   NCHECK(contexts, NULL);
   estimators = MEM_CALLOC
-    (&allocator, IMG_WIDTH*IMG_HEIGHT, sizeof(struct smc_estimators*));
+    (&allocator, IMG_WIDTH*IMG_HEIGHT, sizeof(struct smc_estimator*));
   NCHECK(estimators, NULL);
 
   camera_init(&cam);
@@ -422,11 +422,11 @@ main(int argc, char** argv)
   }}
 
 
-  MEM_FREE(&allocator, contexts);
-  MEM_FREE(&allocator, estimators);
+  MEM_RM(&allocator, contexts);
+  MEM_RM(&allocator, estimators);
   if(argc > 1) {
     CHECK(image_ppm_write(argv[1], IMG_WIDTH, IMG_HEIGHT, 3, img), RES_OK);
-    MEM_FREE(&allocator, img);
+    MEM_RM(&allocator, img);
   }
 
   CHECK(s3d_scene_end_trace(scn), RES_OK);