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

Timestamp:

Feb 4, 2016, 6:25:22 PM (9 years ago)

Author:

meunier

Message:

• Ajout de quelques fonction dans la lib math
• Déplacement de certaines fonctions de stdlib vers string

Location:

soft/giet_vm/applications/rosenfeld/src

Files:

• ecc_common.c (modified) (5 diffs)
• ecc_generation.c (modified) (4 diffs)
• ecc_main_rosenfeld_sa.c (modified) (5 diffs)
• str_ext.c (modified) (1 diff)

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

@@ -5 +5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
 
@@ -310 +311 @@
     char complete_filename[64];
     
-    sprintf(complete_filename, "%s.dot", filename);
+    snprintf(complete_filename, 64, "%s.dot", filename);
     
     fd = open(complete_filename, O_CREAT | O_TRUNC);
@@ -330 +331 @@
     char complete_filename[64];
     
-    sprintf(complete_filename, "%s.dot", filename);
+    snprintf(complete_filename, 64, "%s.dot", filename);
     
     
@@ -351 +352 @@
     char complete_filename[64];
     
-    sprintf(complete_filename, "%s.dot", filename);
+    snprintf(complete_filename, 64, "%s.dot", filename);
     
     
@@ -403 +404 @@
     char complete_filename[64];
     
-    sprintf(complete_filename, "%s.dot", filename);
+    snprintf(complete_filename, 64, "%s.dot", filename);
     
     

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

@@ -58 +58 @@
     generate_granularity_density_float(X, i0, i1, j0, j1, granularity, (float) density, seed);
 }
-// ---------------------------------------------------------------------------------------------
-void generate_granularity_density_name(char *name, int granularity, int density, char *filename)
-// ---------------------------------------------------------------------------------------------
-{
-    sprintf(filename, "%s_%02d_%03d.pgm", name, granularity, density);
-}
-// ------------------------------------------------------------------------------------------------------------------
-void generate_granularity_density_ext_name(char *name, int granularity, int density, char *extension, char *filename)
-// ------------------------------------------------------------------------------------------------------------------
-{
-    sprintf(filename, "%s_%02d_%03d.%s", name, granularity, density, extension);
-}
-// ------------------------------------------------------------------------------------------------------------
-void generate_size_granularity_density_name(char *name, int size, int granularity, int density, char *filename)
-// ------------------------------------------------------------------------------------------------------------
-{
-    sprintf(filename, "%s_%d_%02d_%03d.pgm", name, size, granularity, density);
-}
-// ---------------------------------------------------------------------------------------------------------------------------------
-void generate_size_granularity_density_ext_name(char *name, int size, int granularity, int density, char *extension, char *filename)
-// ---------------------------------------------------------------------------------------------------------------------------------
-{
-    sprintf(filename, "%s_%d_%02d_%03d.%s", name, size, granularity, density, extension);
-}
-// ---------------------------------------------------------------------------------------
-void generate_size_granularity_name(char *name, int size, int granularity, char *filename)
-// ---------------------------------------------------------------------------------------
-{
-    sprintf(filename, "%s_%d_%02d.pgm", name, size, granularity);
-}// ------------------------------------------------------------------------------
-void generate_name100(char *name, int granularity, float density, char *filename)
-// ------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------------------------------------
+void generate_granularity_density_name(char *name, int granularity, int density, char *filename, int maxlen)
+// ---------------------------------------------------------------------------------------------------------
+{
+    snprintf(filename, maxlen, "%s_%02d_%03d.pgm", name, granularity, density);
+}
+// ------------------------------------------------------------------------------------------------------------------------------
+void generate_granularity_density_ext_name(char *name, int granularity, int density, char *extension, char *filename, int maxlen)
+// ------------------------------------------------------------------------------------------------------------------------------
+{
+    snprintf(filename, maxlen, "%s_%02d_%03d.%s", name, granularity, density, extension);
+}
+// ------------------------------------------------------------------------------------------------------------------------
+void generate_size_granularity_density_name(char *name, int size, int granularity, int density, char *filename, int maxlen)
+// ------------------------------------------------------------------------------------------------------------------------
+{
+    snprintf(filename, maxlen, "%s_%d_%02d_%03d.pgm", name, size, granularity, density);
+}
+// ---------------------------------------------------------------------------------------------------------------------------------------------
+void generate_size_granularity_density_ext_name(char *name, int size, int granularity, int density, char *extension, char *filename, int maxlen)
+// ---------------------------------------------------------------------------------------------------------------------------------------------
+{
+    snprintf(filename, maxlen, "%s_%d_%02d_%03d.%s", name, size, granularity, density, extension);
+}
+// ---------------------------------------------------------------------------------------------------
+void generate_size_granularity_name(char *name, int size, int granularity, char *filename, int maxlen)
+// ---------------------------------------------------------------------------------------------------
+{
+    snprintf(filename, maxlen, "%s_%d_%02d.pgm", name, size, granularity);
+}// -----------------------------------------------------------------------------------------
+void generate_name100(char *name, int granularity, float density, char *filename, int maxlen)
+// ------------------------------------------------------------------------------------------
 {
     // density en pourcentage: 0:100
     // mais aussi <1, par exe 0.01
     int d = (int) ceil(100 * density);
-    sprintf(filename, "%s_%02d_%05d.pgm", name, granularity, d);
+    snprintf(filename, maxlen, "%s_%02d_%05d.pgm", name, granularity, d);
 }
 // ----------------------------------------
@@ -128 +128 @@
         for(d=dmin; d<=dmax; d+=dstep) {
             generate_granularity_density_int(X, 0, n-1, 0, n-1, g, d, seed);
-            generate_granularity_density_name("I", g, d, filename);
+            generate_granularity_density_name("I", g, d, filename, 32);
             printf(filename);
             bin2gray_ui8matrix(X, 0, n-1, 0, n-1, X255);
@@ -256 +256 @@
     X255 = ui8matrix(0, h-1, 0, w-1);
     
-    sprintf(filename, "spirale_simple_%d.pgm", n);
+    snprintf(filename, 128, "spirale_simple_%d.pgm", n);
     spirale_simple(X, h, w);
     bin2gray_ui8matrix(X,   0, h-1, 0, w-1, X255);
     SavePGM_ui8matrix(X255, 0, h-1, 0, w-1, filename); 
     
-    sprintf(filename, "spirale_double_%d.pgm", n);
+    snprintf(filename, 128, "spirale_double_%d.pgm", n);
     spirale_double(X, h, w);
     bin2gray_ui8matrix(X,   0, h-1, 0, w-1, X255);
@@ -306 +306 @@
 
     generate_granularity_density_float(X, 0, h-1, 0, w-1, g, d, seed);
-    generate_granularity_density_name("HGH", g, d, filename);
+    generate_granularity_density_name("HGH", g, d, filename, 32);
     printf(filename);
     bin2gray_ui8matrix(X,   0, h-1, 0, w-1, X255);

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

@@ -105 +105 @@
     binarisation_ui8matrix(X0, i0, i1, j0, j1, 1, 1, X);    // pour le traitement
     binarisation_ui8matrix(X0, i0, i1, j0, j1, 1, 255, X0); // pour la verif visuelle
-    generate_path_filename(dst_path, "verif.pgm", complete_filename);
+    generate_path_filename(dst_path, "verif.pgm", complete_filename, 1024);
     SavePGM_ui8matrix(X0, i0, i1, j0, j1, complete_filename);
     display_ui8matrix_positive(X, i0, i1, j0, j1, 3, "X");
@@ -131 +131 @@
     // traitement: desactiver FlattenL dans Rosenfeld
     // pour voir l'image d'etiquettes  sans re-etiquetage
-    na = Rosenfeld_UF_Org1_4C(X, height, width, E32, T, A, nemax, Stats); ECC_VERBOSE(printf("na = %d\n", na)); filename = "Rosenfeld_UF_Org1_4C.bmp"; mod_ui32matrix_ui8matrix(E32, i0, i1, j0, j1, E8); generate_path_filename(dst_path, filename, complete_filename); SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename); display_ui32matrix_positive(E32,i0, i1, j0, j1, 3, "E1"); zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border); display_RegionStatsVector(Stats, 1, na, "Stats"); zero_RegionStatsVector(Stats, 0, nemax);
-
-
-    na = Rosenfeld_UF_Org1_8C(X, height, width, E32, T, A, nemax, Stats); ECC_VERBOSE(printf("na = %d\n", na)); filename = "Rosenfeld_UF_Org1_8C.bmp"; mod_ui32matrix_ui8matrix(E32, i0, i1, j0, j1, E8); generate_path_filename(dst_path, filename, complete_filename); SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename); display_ui32matrix_positive(E32,i0, i1, j0, j1, 3, "E1"); zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border); display_RegionStatsVector(Stats, 1, na, "Stats"); zero_RegionStatsVector(Stats, 0, nemax);
-
-
-    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(dst_path, filename, complete_filename); SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename); display_ui32matrix_positive(E32,i0, i1, j0, j1, 3, "E1"); zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border); display_RegionStatsVector(Stats, 1, na, "Stats"); zero_RegionStatsVector(Stats, 0, nemax);
+    na = Rosenfeld_UF_Org1_4C(X, height, width, E32, T, A, nemax, Stats); ECC_VERBOSE(printf("na = %d\n", na)); filename = "Rosenfeld_UF_Org1_4C.bmp"; mod_ui32matrix_ui8matrix(E32, i0, i1, j0, j1, E8); generate_path_filename(dst_path, filename, complete_filename, 1024); SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename); display_ui32matrix_positive(E32,i0, i1, j0, j1, 3, "E1"); zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border); display_RegionStatsVector(Stats, 1, na, "Stats"); zero_RegionStatsVector(Stats, 0, nemax);
+
+
+    na = Rosenfeld_UF_Org1_8C(X, height, width, E32, T, A, nemax, Stats); ECC_VERBOSE(printf("na = %d\n", na)); filename = "Rosenfeld_UF_Org1_8C.bmp"; mod_ui32matrix_ui8matrix(E32, i0, i1, j0, j1, E8); generate_path_filename(dst_path, filename, complete_filename, 1024); SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename); display_ui32matrix_positive(E32,i0, i1, j0, j1, 3, "E1"); zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border); display_RegionStatsVector(Stats, 1, na, "Stats"); zero_RegionStatsVector(Stats, 0, nemax);
+
+
+    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(dst_path, filename, complete_filename, 1024); SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename); display_ui32matrix_positive(E32,i0, i1, j0, j1, 3, "E1"); zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border); display_RegionStatsVector(Stats, 1, na, "Stats"); zero_RegionStatsVector(Stats, 0, nemax);
     
     // free
@@ -188 +188 @@
     
     Palette_18ColorsBW(palette);
-    generate_path_filename(pathSrc, filename, complete_filename);
+    generate_path_filename(pathSrc, filename, complete_filename, 1024);
 
     // chargement d'une image depuis le disque
@@ -206 +206 @@
     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);
+    generate_path_filename(pathDst, "verif.pgm", complete_filename, 1024);
     SavePGM_ui8matrix(X0, i0, i1, j0, j1, complete_filename);
 
@@ -236 +236 @@
     filename = "Rosenfeld_UF_Org1_8C.bmp";
     mod_ui32matrix_ui8matrix(E32, i0, i1, j0, j1, E8);
-    generate_path_filename(pathDst, filename, complete_filename);
+    generate_path_filename(pathDst, filename, complete_filename, 1024);
     SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename);
     zero_ui32matrix(E32, i0 - border, i1 + border, j0 - border, j1 + border);

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

@@ -9 +9 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "nrc_os_config.h"