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

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

Files:

• Makefile (modified) (3 diffs)
• include/nrc_os_config.h (modified) (2 diffs)
• include/nrio2.h (modified) (1 diff)
• src/nrio2.c (modified) (3 diffs)

soft/giet_vm/applications/rosenfeld/nrc2/Makefile

@@ -7 +7 @@
 
 # -- File list ----------
-FILE = nralloc1.c, nralloc2.c, nralloc2x.c, nrarith0.c, nrarith1.c, nrarith2.c, nrarith2x.c, nrbool1.c, nrbool2.c,  nrhisto.c, nrio0.c, nrio1.c, nrio2.c, nrkernel.c, nrlinalg.c, nrlut.c, nrmem1.c, nrmem1x.c, nrmem2.c, nrmem2x.c, nrset1.c, nrset2.c, nrset2x.c, nrsort1.c, nrsort2.c, nrwrap1.c, nrwrap2.c
+FILE = nralloc1.c, nralloc2.c, nralloc2x.c, nrarith0.c, nrarith1.c, nrarith2.c, nrarith2x.c, nrbool1.c, nrbool2.c, nrhisto.c, nrio0.c, nrio1.c, nrio2.c, nrkernel.c, nrlinalg.c, nrlut.c, nrmem1.c, nrmem1x.c, nrmem2.c, nrmem2x.c, nrset1.c, nrset2.c, nrset2x.c, nrsort1.c, nrsort2.c, nrwrap1.c, nrwrap2.c
 
 
@@ -19 +19 @@
 C_DEBUG_FLAGS = -O0
 C_OPTIMISATION_FLAGS = -std=c99 -O2 -fstrict-aliasing
-C_OS_FLAGS = -DGTODay
+C_OS_FLAGS = -DGTODay -DTARGET_OS=GIETVM
 C_CONFIG_FLAGS = -DCLI
 C_INC_FLAGS = -I$(INC_PATH) -I../../.. -I../../../giet_libs
@@ -41 +41 @@
 CFLAGSW := -Wredundant-decls -Wdisabled-optimization -Winline -Wpointer-arith -Wsign-compare -Wendif-labels
 CFLAGSCPU := -mips32 -EL -G0 -mhard-float
-CFLAGS := $(CFLAGS) -g -Wall -fomit-frame-pointer $(CFLAGSW) $(CFLAGSCPU) -I$(DIR_INC) -fno-builtin -ffreestanding
+CFLAGS := $(CFLAGS) -g -Wall -fomit-frame-pointer $(CFLAGSW) $(CFLAGSCPU) -fno-builtin -ffreestanding
 
 

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
 }

soft/giet_vm/applications/rosenfeld/nrc2/src/nrio2.c

@@ -13 +13 @@
 
 #include <stdio.h>
-#include <stddef.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "nrc_os_config.h"
+
+#if TARGET_OS == LINUX
+    #include <sys/types.h>
+    #include <sys/stat.h>
+    #include <fcntl.h>
+    #include <unistd.h>
+#endif
+
+
 #include "mypredef.h"
 #include "nrtype.h"
@@ -28 +37 @@
 #include "nrio1.h"
 #include "nrio2.h"
+
+#define isalnum(x) (((x) >= 0x30 && (x) <= 0x39) \
+                 || ((x) >= 0x41 && (x) <= 0x5A) \
+                 || ((x) >= 0x61 && (x) <= 0x7A))
+
 
 /*
@@ -870 +884 @@
     }    
 }
+
+
+
+/* --------------------------------------- */
+static char * readitem(int fd, char * buffer)
+/* --------------------------------------- */
+{
+    char * aux;
+    int k;
+    int n;
+    
+    k = 0;
+    aux = buffer;
+    while (1) {
+        n = read(fd, aux, 1);
+        if (n == 0) {
+            break;
+        }
+        switch (k) {
+            case 0:
+                if (*aux == '#') {
+                    k = 1;
+                }
+                if (isalnum(*aux)) {
+                    k = 2;
+                    aux++;
+                }
+                break;
+            case 1:
+                if (*aux == 0xA) {
+                    k = 0;
+                }
+                break;
+            case 2:
+                if (!isalnum(*aux)) {
+                    *aux = 0;
+                    return buffer;
+                }
+                aux++;
+                break;
+        }
+    }
+    *aux = 0;
+    return buffer;
+}
+
+
+/* ------------------------------------------------- */
+static void ReadPGMrow(int fd, int width, uint8 * line)
+/* ------------------------------------------------- */
+{
+    read(fd, &line[0], sizeof(uint8) * width);
+}
+
+
+/* -------------------------------------------------- */
+static void WritePGMrow(uint8 * line, int width, int fd)
+/* -------------------------------------------------- */
+{
+    write(fd, &line[0], sizeof(uint8) * width);
+}
+
+
+/* ----------------------------------------------------------------------------------------------- */
+IMAGE_EXPORT(uint8 **) LoadPGM_ui8matrix(char * filename, int * nrl, int * nrh, int * ncl, int * nch)
+/* ----------------------------------------------------------------------------------------------- */
+{
+    // only for P5 binary type, not for text type
+    
+    int height, width, gris;
+    uint8 ** m;
+    int fd;
+    
+    char buffer[80];
+    int i;
+    
+    // open file
+    fd = open(filename, O_RDONLY);
+    if (fd < 0) {
+        printf("*** Error: Can't open file %s in %s.\n", filename, __func__);
+    }
+    
+    // read PGM header
+    readitem(fd, &buffer[0]);
+    if (strcmp(&buffer[0], "P5") != 0) {
+        printf("*** Error: Invalid file header in file %s\n", filename);
+    }
+    
+    width  = atoi(readitem(fd, &buffer[0]));
+    height = atoi(readitem(fd, &buffer[0]));
+    gris   = atoi(readitem(fd, &buffer[0]));
+    
+    *nrl = 0;
+    *nrh = height - 1;
+    *ncl = 0;
+    *nch = width - 1;
+    m = ui8matrix(*nrl, *nrh, *ncl, *nch);
+    
+    for (i = 0; i < height; i++) {
+        ReadPGMrow(fd, width, m[i]);
+    }
+    
+    close(fd);
+    
+    return m;
+}
+
+
+/* ----------------------------------------------------------------------------------------------- */
+IMAGE_EXPORT(void) SavePGM_ui8matrix(uint8 ** m, int nrl, int nrh, int ncl, int nch, char * filename)
+/* ----------------------------------------------------------------------------------------------- */
+{
+    int nrow = nrh - nrl + 1;
+    int ncol = nch - ncl + 1;
+    
+    char buffer[80];
+    
+    int fd;
+    int i;
+    
+    fd = open(filename, O_TRUNC | O_CREAT);
+    if (fd < 0) {
+        printf("*** Error: Impossible to open file %s in %s\n", filename, __func__);
+    }
+    
+    /* enregistrement de l'image au format rpgm */
+    snprintf(buffer, 80, "P5\n%d %d\n255\n", ncol, nrow);
+    write(fd, buffer, strlen(buffer));
+    for (i = nrl; i <= nrh; i++) {
+        WritePGMrow(m[i], ncol, fd);
+    }
+    
+    /* fermeture du fichier */
+    close(fd);
+}
+
+
+