Changeset 645


Ignore:
Timestamp:
12/19/08 11:37:01 (4 years ago)
Author:
EWAVR
Message:
  • supress some warnings in autobuild process (maybe)
  • fixed "dng via usb" for s5is
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/core/dng_hdr.c

    r640 r645  
    327327 
    328328unsigned int* get_focal_length_for_exif(int focal_length){ 
    329  static int fl[2]={0,1000}; 
     329 static unsigned int fl[2]={0,1000}; 
    330330 fl[0]=focal_length; 
    331331 return fl; 

  • trunk/core/raw.c

    r639 r645  
    219219 
    220220void set_raw_pixel(unsigned int x, unsigned int y, unsigned short value){ 
    221  unsigned char* addr=get_raw_image_addr()+y*RAW_ROWLEN+(x/8)*CAM_SENSOR_BITS_PER_PIXEL; 
     221 unsigned char* addr=(unsigned char*)get_raw_image_addr()+y*RAW_ROWLEN+(x/8)*CAM_SENSOR_BITS_PER_PIXEL; 
    222222#if CAM_SENSOR_BITS_PER_PIXEL==10 
    223223 switch (x%8) { 
    … …  
    238238//------------------------------------------------------------------- 
    239239unsigned short get_raw_pixel(unsigned int x,unsigned  int y){ 
    240  unsigned char* addr=get_raw_image_addr()+y*RAW_ROWLEN+(x/8)*CAM_SENSOR_BITS_PER_PIXEL; 
     240 unsigned char* addr=(unsigned char*)get_raw_image_addr()+y*RAW_ROWLEN+(x/8)*CAM_SENSOR_BITS_PER_PIXEL; 
    241241#if CAM_SENSOR_BITS_PER_PIXEL==10 
    242242 switch (x%8) { 

  • trunk/platform/s5is/sub/101a/stubs_entry_2.S

    r538 r645  
    9090NHSTUB(qsort                                  ,0xFF9CA2EC) 
    9191 
    92 NHSTUB(strstr                                 ,0xFF9C9E0C) 
     92//NHSTUB(strstr                                 ,0xFF9C9E0C) 
    9393NHSTUB(strncpy                                ,0xFF81E688) 
    9494NHSTUB(strrchr                                ,0xFF8B32A0) 

  • trunk/platform/s5is/sub/101b/stubs_entry_2.S

    r538 r645  
    9090NHSTUB(qsort                                  ,0xFF9CA224) 
    9191 
    92 NHSTUB(strstr                                 ,0xFF9C9D44) 
     92//NHSTUB(strstr                                 ,0xFF9C9D44) 
    9393NHSTUB(strncpy                                ,0xFF81E5C0) 
    9494NHSTUB(strrchr                                ,0xFF8B31D8) 
Note: See TracChangeset for help on using the changeset viewer.