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

Timestamp:

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

Author:

meunier

Message:

• Bug fixes in Rosenfeld

Location:

soft/giet_vm/applications/rosenfeld/src

Files:

• bmpNR.c (modified) (3 diffs)
• dummy_func.c (modified) (1 diff)
• ecc_common.c (modified) (1 diff)
• ecc_features.c (modified) (3 diffs)
• ecc_main_rosenfeld_sa.c (modified) (10 diffs)

soft/giet_vm/applications/rosenfeld/src/bmpNR.c

@@ -10 +10 @@
 #include <stdlib.h>
 #include <math.h>
-
 
 /* -- image -- */
@@ -20 +19 @@
 #include "nralloc.h"
 #endif
+
+#if TARGET_OS == LINUX
+    #include <sys/types.h>
+    #include <sys/stat.h>
+    #include <fcntl.h>
+    #include <unistd.h>
+#endif
+
 
 #include "palette.h"
@@ -242 +249 @@
     //DEBUG(printf("BMP  : %d %d\n", sizeof( BitmapFileHeader), sizeof( BitmapInfoHeader)));
     if (sizeof(BitmapFileHeader) != 14) {
-        printf("*** Error SaveMBP: sizeof(BitmapFileHeader) = %d should be 14...\n", sizeof(BitmapFileHeader));
+        printf("*** Error SaveMBP: sizeof(BitmapFileHeader) = %d should be 14...\n", (int) sizeof(BitmapFileHeader));
     }
 

soft/giet_vm/applications/rosenfeld/src/dummy_func.c

@@ -10 +10 @@
 
 
-
-IMAGE_EXPORT(uint8 **) LoadPGM_ui8matrix(char *filename, int *nrl, int *nrh, int *ncl, int *nch) { return NULL; }
-IMAGE_EXPORT(void) SavePGM_ui8matrix(uint8 **m, int nrl, int nrh, int ncl, int nch, char *filename) {}
-
 void write_ui8matrix_positive (uint8  **m,int i0, int i1, int j0, int j1, int iformat, char *filename) {}
 

soft/giet_vm/applications/rosenfeld/src/ecc_common.c

@@ -8 +8 @@
 #include <math.h>
 
-
 #ifdef CLI
 #include "nrc_os_config.h"
 #include "nrc.h"
 #endif
+
+#if TARGET_OS == LINUX
+    #include <sys/types.h>
+    #include <sys/stat.h>
+    #include <fcntl.h>
+#endif
+
 
 #include "ecc_common.h"

soft/giet_vm/applications/rosenfeld/src/ecc_features.c

@@ -19 +19 @@
 #include <malloc.h>
 
-#ifdef OPENMP
-#include <omp.h>
-#endif
 
 #ifdef CLI
 #include "nrc_os_config.h"
 #include "nrc.h"
+#endif
+
+
+
+#if TARGET_OS == LINUX
+    #include <sys/types.h>
+    #include <sys/stat.h>
+    #include <fcntl.h>
+#endif
+
+
+#ifdef OPENMP
+#include <omp.h>
 #endif
 
@@ -147 +157 @@
 // --------------------------------- 
 {
-    int ne;
+    int ne = 0;
     // @QM giet
     fscanf(fd, "%d", &ne);
@@ -162 +172 @@
 // -------------------------------------------------------------- 
 {
-    int i, t;
+    int i;
     
     for (i = 1; i <= ne; i++) {

soft/giet_vm/applications/rosenfeld/src/ecc_main_rosenfeld_sa.c

@@ -159 +159 @@
 // ---------------------------------------------------------------------
 {
-    printf("[---------------------------]");
-    printf("[--- main_rosenfeld_file ---]");
-    printf("[---------------------------]");
-    
-    char *pathSrc = src_path;
-    char *pathDst = dst_path;
-    
-    uint8 **X0, **X;
-    uint8 **E8;
-    
-    uint32 **E32;
-    uint32 *S; // Stack for Bailey algorithm
-    
-    uint32 *T;
-    uint32 *A;
-    uint32 *N;
-    //uint32 *SNE; // memorisation de la somme des ne: sne
+    printf("[---------------------------]\n");
+    printf("[--- main_rosenfeld_file ---]\n");
+    printf("[---------------------------]\n");
+    
+    char * pathSrc = src_path;
+    char * pathDst = dst_path;
+    
+    uint8 ** X0;
+    uint8 ** X;
+    uint8 ** E8;
+    
+    uint32 ** E32;
+    uint32 * S; // Stack for Bailey algorithm
+    
+    uint32 * T;
+    uint32 * A;
+    uint32 * N;
+    //uint32 * SNE; // memorisation de la somme des ne: sne
 
     int i0, i1, j0, j1;
-    int height, width, border=1;
+    int height, width, border = 1;
     uint32 nemax, nermax;
     int na;
@@ -191 +192 @@
 
     // chargement d'une image depuis le disque
-    //X0 = LoadPGM_ui8matrix(complete_filename, &i0, &i1, &j0, &j1);
-    init_forme_boulon1(&X0, &i0, &i1, &j0, &j1);
-    
+    printf("Loading file %s... ", filename);
+    X0 = LoadPGM_ui8matrix(complete_filename, &i0, &i1, &j0, &j1);
+    //init_forme_boulon1(&X0, &i0, &i1, &j0, &j1);
+    printf("done.\n");
+
+    printf("Allocating memory... ");
     // allocation memoire
     X   = ui8matrix (i0 - border, i1 + border, j0 - border, j1 + border);
@@ -206 +210 @@
     // pre-traitements
     binarisation_ui8matrix(X0, i0, i1, j0, j1, 20, 1, X); // pour le traitement
-    //binarisation_ui8matrix(X0, i0, i1, j0, j1, 20, 255, X0); // pour la verif visuelle
-    //generate_path_filename(pathDst, "verif.pgm", complete_filename, 1024);
-    //SavePGM_ui8matrix(X0, i0, i1, j0, j1, complete_filename);
+    binarisation_ui8matrix(X0, i0, i1, j0, j1, 20, 255, X0); // pour la verif visuelle
+    printf("done.\n");
+
+    printf("Saving file %s for verification... ", complete_filename);
+    generate_path_filename(pathDst, "verif.pgm", complete_filename, 1024);
+    SavePGM_ui8matrix(X0, i0, i1, j0, j1, complete_filename);
+    printf("done.\n");
 
     height = i1 - i0 + 1;
@@ -246 +254 @@
     /*na = Rosenfeld_UF_Org2_4C    (X, height, width, E32, T, A, nemax, Stats); ECC_VERBOSE(printf("na = %d\n", na)); filename = "Rosenfeld_UF_Org2_4C.bmp";     mod_ui32matrix_ui8matrix(E32, i0, i1, j0, j1, E8); generate_path_filename(pathDst, filename, complete_filename); SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename); zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border); display_RegionStatsVector(Stats, 1, na, "Stats"); zero_RegionStatsVector(Stats, 0, nemax);*/
 
-    free_ui8matrix (X0,  i0,        i1,        j0,        j1);
-    free_ui8matrix (X,   i0-border, i1+border, j0-border, j1+border);
-    free_ui8matrix (E8,  i0-border, i1+border, j0-border, j1+border);
-    free_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border); 
+    free_ui8matrix (X0,  i0,          i1,          j0,          j1);
+    free_ui8matrix (X,   i0 - border, i1 + border, j0 - border, j1 + border);
+    free_ui8matrix (E8,  i0 - border, i1 + border, j0 - border, j1 + border);
+    free_ui32matrix(E32, i0 - border, i1 + border, j0 - border, j1 + border); 
     
     free_ui32vector(T, 0, nemax);
@@ -255 +263 @@
     free_ui32vector(N, 0, nemax);
     
-    free_ui32vector(S, 0, 2*nermax);
+    free_ui32vector(S, 0, 2 * nermax);
 
     return;
@@ -267 +275 @@
     char *dst_path;
     
-    printf("[======================]");
-    printf("[=== main_rosenfeld ===]");
-    printf("[======================]");
-    
-    src_path = "./"; // ne pas oublier le / a la fin
+    printf("[======================]\n");
+    printf("[=== main_rosenfeld ===]\n");
+    printf("[======================]\n");
+    
+    src_path = "/misc/"; // ne pas oublier le / a la fin
     dst_path = "";
     
@@ -287 +295 @@
     int i;
     
-    printf("=================");
-    printf("== display_arg ==");
-    printf("=================");
-    printf("");
+    printf("=================\n");
+    printf("== display_arg ==\n");
+    printf("=================\n");
+    printf("\n");
     
     printf("argc = %d\n", argc);
@@ -297 +305 @@
         printf("%s ", argv[i]);
     }
-    printf("");
+    printf("\n");
 }
 // -----------------------
@@ -303 +311 @@
 // -----------------------
 {
-    printf("=====================");
-    printf("== ecc_info_define ==");
-    printf("=====================");
-    printf("");
+    printf("=====================\n");
+    printf("== ecc_info_define ==\n");
+    printf("=====================\n");
+    printf("\n");
     ecc_info_omp();
     //Label_Display_Info();
-    printf("");
+    printf("\n");
 }
 // -----------------------------
-int main(int argc, char* argv[])
+__attribute__((constructor)) void main(int argc, char* argv[])
 // -----------------------------
 {
-#if TARGET_OS==GIET_VM
+#if TARGET_OS == GIETVM
     giet_tty_alloc(1);
+    heap_init(0, 0);
 #endif
     display_arg(argc, argv);
@@ -322 +331 @@
     main_rosenfeld(argc, argv);
     printf("[main]: bye");
-    return 0;
-}
+    exit(0);
+}