Changeset 349 for trunk/projects/polly/polly.c

Timestamp:

01/21/07 22:19:45 (4 years ago)

Author:

anthony_rowe

Message:

polly update

Files:

• trunk/projects/polly/polly.c (modified) (9 diffs)

trunk/projects/polly/polly.c

@@ -7 +7 @@
 #include <cc3.h>
 #include <cc3_ilp.h>
+#include <cc3_conv.h>
 #include "polly.h"
-#include "conv.h"
-#include "lreg.h"
 
 #define MMC_DEBUG
 
+ccr_config_t g_cc_conf;
 
 // Constants for connected component blob reduce
@@ -30 +30 @@
   uint32_t last_time, val,i;
   char c;
-  filter_t blur;
+  cc3_kernel_t blur;
   cc3_pixel_t p;
   cc3_image_t polly_img;
   cc3_image_t img;
-  uint8_t *range;
-  uint8_t *x_axis;
+  
   cc3_pixel_t mid_pix;
   cc3_pixel_t right_pix;
   cc3_pixel_t down_pix;
-  reg_data_t reg_line;
+ 
 
  // limit the recursive depth
@@ -74 +73 @@
         return 0;
   
-  range = malloc(polly_img.width);
-  if(range==NULL)
+  if(config.histogram==NULL)
         return 0;
 
@@ -108 +106 @@
         blur.mat[1][0]=1; blur.mat[1][1]=1; blur.mat[1][2]=1;
         blur.mat[2][0]=1; blur.mat[2][1]=1; blur.mat[2][2]=1;
-        val=convolve(img,blur);
+        blur.divisor=9;
+        val=cc3_convolve_img(img,blur);
         if(val==0)
                 {
@@ -149 +148 @@
     matrix_to_pgm (&polly_img);
 #endif
-    generate_polly_histogram (&polly_img, range);
+    generate_polly_histogram (&polly_img, config.histogram);
   
-    x_axis = malloc(polly_img.width);
+    /*x_axis = malloc(polly_img.width);
     for(i=0; i<polly_img.width; i++ )
         x_axis[i]=i;
     
 
-     lreg(x_axis, range, polly_img.width,&reg_line);
+     lreg(x_axis, config.histogram, polly_img.width,&reg_line);
 
      printf( "a=%f\n",reg_line.a );     
@@ -166 +165 @@
      printf( "distance = %f\n",distance ); 
     
-    convert_histogram_to_ppm (&polly_img, range);
+    convert_histogram_to_ppm (&polly_img, config.histogram);
 
 
@@ -176 +175 @@
     printf( "H " );
     for(int i=5; i<polly_img.width; i+=5)
-            printf( "%d ",polly_img.height-range[i] );
+            printf( "%d ",polly_img.height-config.histogram[i] );
     printf( "\r" );
-
+*/
 
   free (img.pix);               // don't forget to free!
   free (polly_img.pix);               
-  free (x_axis);             
-  free (range);               
+ // free (x_axis);             
 
 }
@@ -406 +404 @@
       break;
   }
+
+  // Downsample Histogram 
+//  for (x = 0; x < width - 5; x += 5) {
+//    int min;
+//    min = 100;
+//    for (int i = 0; i < 5; i++) {
+//      if (hist[x + i] < min)
+//        min = hist[x + i];
+//    }
+//    for (int i = 0; i < 5; i++)
+//      hist[x + i] = min;
+// }
+
+
+}
 /*
-  // Downsample Histogram 
-  for (x = 0; x < width - 5; x += 5) {
-    int min;
-    min = 100;
-    for (int i = 0; i < 5; i++) {
-      if (hist[x + i] < min)
-        min = hist[x + i];
-    }
-    for (int i = 0; i < 5; i++)
-      hist[x + i] = min;
-  }
-*/
-
-
-
-
-}
-
 void convert_histogram_to_ppm (cc3_image_t * img, uint8_t * hist)
 {
@@ -448 +443 @@
   }
 }
-
+*/