Changeset 291

Show
Ignore:
Timestamp:
02/08/08 06:21:46 (4 years ago)
Author:
nirschi
Message:

ixus850_sd800: Is a digic3 camera but has digic2 property cases (quietschi)
IXUS(SD): meaningless DOF values when ND filter in, fixed

Location:
branches/nirschi-ixus
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/nirschi-ixus/core/gui_osd.c

    r256 r291  
    431431            
    432432    av=shooting_get_real_aperture(); 
    433     fl=get_focal_length(lens_get_zoom_point());  
     433#if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus950_sd850) 
     434    if (av>=shooting_get_aperture_from_av96(shooting_get_aperture_sizes_table_prop_id(shooting_get_aperture_sizes_table_size()/2))) av/=2; // nd filter in 
     435#endif 
     436    fl=get_focal_length(lens_get_zoom_point()); 
    434437    dof.far_limit=-1.0; 
    435438    dof.near_limit=-1.0; 

  • branches/nirschi-ixus/include/platform.h

    r281 r291  
    5252}; 
    5353 
    54 #if defined(CAMERA_a570) || defined(CAMERA_a560) || defined(CAMERA_a720) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) 
     54#if defined(CAMERA_a570) || defined(CAMERA_a560) || defined(CAMERA_a720) || defined(CAMERA_ixus70_sd1000) 
    5555 #define PROPCASE_DRIVE_MODE                                    102 
    5656 #define PROPCASE_FOCUS_MODE                                    133