Changeset 348

Show
Ignore:
Timestamp:
01/21/07 12:59:33 (2 years ago)
Author:
anthony_rowe
Message:

fixed cc3_math compile problem

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/cc3_ilp/cc3_math.c

    r343 r348  
    6666 
    6767 
    68     double muX = lreg_mean( x_data,size ); 
    69     double muY = lreg_mean( y_data,size ); 
     68    double muX = cc3_mean( x_data,size ); 
     69    double muY = cc3_mean( y_data,size ); 
    7070 
    7171 

  • trunk/projects/cmucam2/Makefile

    r333 r348  
    1 CSOURCES=cmucam2.c polly.c conv.c 
    2 INCLUDES=polly.h conv.h 
     1CSOURCES=cmucam2.c 
    32PROJECT=cmucam2 
    43LIBS=cc3_ilp jpeg-6b 

  • trunk/projects/cmucam2/cmucam2.c

    r342 r348  
    1010#include <stdlib.h> 
    1111#include "cc3_jpg.h" 
    12 #include "polly.h" 
    1312 
    1413//#define SERIAL_BAUD_RATE  CC3_UART_RATE_230400 
    …… 
    270269        else 
    271270          print_ACK (); 
    272         do { 
     271        /*do { 
    273272                polly_config_t p_config; 
    274273                p_config.color_thresh=arg_list[0]; 
    …… 
    280279                if (!cc3_uart_has_data (0)) 
    281280                        break; 
    282             } while (!poll_mode); 
     281            } while (!poll_mode);*/ 
    283282        break; 
    284283 

  • trunk/projects/cmucam2/conv.c

    r333 r348  
    77 
    88mat_div=filter.size*filter.size; 
    9 printf( "convolution\n" ); 
    10 printf( "img = %d, %d\n",img.width,img.height ); 
    11 printf( "filter = %d\n",filter.size); 
     9if(img.height-filter.size<0 ) return 0; 
     10if(img.width-filter.size<0 ) return 0; 
    1211 
    1312for(j=0; j<img.height-filter.size+1; j++ ) 
    …… 
    2524        cc3_set_pixel (&img, i, j, &p);          
    2625        } 
    27  
     26return 1; 
    2827}