Changeset 798 for soft/giet_vm/applications/rosenfeld/nrc2/include

Timestamp:

Mar 2, 2016, 3:08:27 PM (9 years ago)

Author:

meunier

Message:

• Bug fixes in Rosenfeld

Location:

soft/giet_vm/applications/rosenfeld/nrc2/include

Files:

• nrc_os_config.h (modified) (2 diffs)
• nrio2.h (modified) (1 diff)

soft/giet_vm/applications/rosenfeld/nrc2/include/nrc_os_config.h

@@ -1 +1 @@
 
-#define TARGET_OS GIETVM
 
-#if TARGET_OS==GIETVM
+#define GIETVM 1
+#define LINUX 2
+
+#if TARGET_OS == GIETVM
     #define printf(...)  giet_tty_printf(__VA_ARGS__)
 
@@ -12 +14 @@
     #define fscanf(x, ...)  ;
     #define exit(x)         giet_pthread_exit(NULL)
+#else
 #endif
 

soft/giet_vm/applications/rosenfeld/nrc2/include/nrio2.h

@@ -239 +239 @@
 IMAGE_EXPORT(uint8 **) LoadPGM_bmatrix  (char *filename, int *nrl, int *nrh, int *ncl, int *nch);
 IMAGE_EXPORT(void)     LoadPGM_bmatrix2 (char *filename, int *nrl, int *nrh, int *ncl, int *nch, uint8 **m);
-IMAGE_EXPORT(void)    MLoadPGM_bmatrix  (char *filename, int nrl, int nrh, int ncl, int nch, uint8 **m);
+IMAGE_EXPORT(void)     MLoadPGM_bmatrix (char *filename, int nrl, int nrh, int ncl, int nch, uint8 **m);
 
 IMAGE_EXPORT(void)     SavePGM_bmatrix  (uint8 **m, int nrl, int nrh, int ncl, int nch, char *filename);
 IMAGE_EXPORT(void)     SavePGM_ui8matrix(uint8 **m, int nrl, int nrh, int ncl, int nch, char *filename);
 
-IMAGE_EXPORT(rgb8 **) LoadPPM_rgb8matrix (char *filename, int *nrl, int *nrh, int *ncl, int *nch);
-IMAGE_EXPORT(void)    LoadPPM_rgb8matrix2(char *filename, int *nrl, int *nrh, int *ncl, int *nch, rgb8 **m);
-
-IMAGE_EXPORT(void)    SavePPM_rgb8matrix(rgb8 **m, int nrl, int nrh, int ncl, int nch, char *filename);
+IMAGE_EXPORT(rgb8 **)  LoadPPM_rgb8matrix (char *filename, int *nrl, int *nrh, int *ncl, int *nch);
+IMAGE_EXPORT(void)     LoadPPM_rgb8matrix2(char *filename, int *nrl, int *nrh, int *ncl, int *nch, rgb8 **m);
+
+IMAGE_EXPORT(void)     SavePPM_rgb8matrix(rgb8 **m, int nrl, int nrh, int ncl, int nch, char *filename);
+
+
+
 #ifdef __cplusplus
 }