Ignore:
Timestamp:
12/04/11 05:06:43 (2 years ago)
Author:
philmoz
Message:

Minor updates:

  • Fix for G10 & G12 needing custom hack in lens_set_focus_pos function (undefine CAM_CAN_SD_OVER_NOT_IN_MF for these cameras instead).
  • Fix for recreview_hold value for G10 & SD940 (IXUS120)
  • Add CAM_SHOW_OSD_IN_SHOOT_MENU for SX30 & sx40hs/platform_camera.h
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/platform/generic/wrappers.c

    r1444 r1453  
    224224void lens_set_focus_pos(long newpos) 
    225225{ 
    226 #if defined(CAMERA_g12) || defined(CAMERA_g10)  // G12 & G10 crash if in Continuous AF mode, and not MF, and try to call _MoveFocusLensToDistance 
    227         int af_mode; 
    228         get_property_case(PROPCASE_CONTINUOUS_AF,&af_mode,sizeof(af_mode)); 
    229         if ((af_mode == 0) || (shooting_get_focus_mode() == 1)) // can only set focus distance when MF mode or not in continuous AF mode 
    230 #endif 
    231         { 
    232                 _MoveFocusLensToDistance((short*)&newpos); 
    233                 //while (focus_busy); 
    234                 while ((shooting_is_flash_ready()!=1) || (focus_busy)); 
    235                 newpos = _GetFocusLensSubjectDistance(); 
    236                 _SetPropertyCase(PROPCASE_SUBJECT_DIST1, &newpos, sizeof(newpos)); 
    237                 _SetPropertyCase(PROPCASE_SUBJECT_DIST2, &newpos, sizeof(newpos)); 
    238         } 
     226        _MoveFocusLensToDistance((short*)&newpos); 
     227        //while (focus_busy); 
     228        while ((shooting_is_flash_ready()!=1) || (focus_busy)); 
     229        newpos = _GetFocusLensSubjectDistance(); 
     230        _SetPropertyCase(PROPCASE_SUBJECT_DIST1, &newpos, sizeof(newpos)); 
     231        _SetPropertyCase(PROPCASE_SUBJECT_DIST2, &newpos, sizeof(newpos)); 
    239232} 
    240233 
Note: See TracChangeset for help on using the changeset viewer.