Changeset 777 for soft/giet_vm/applications/rosenfeld/src/ecc_main_rosenfeld_sa.c

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

File:

• soft/giet_vm/applications/rosenfeld/src/ecc_main_rosenfeld_sa.c (modified) (5 diffs)

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);