Changeset 1520 for branches/reyalp-flt


Ignore:
Timestamp:
12/31/11 05:54:12 (17 months ago)
Author:
philmoz
Message:

Fix for G10, G11, S90 edge overlay broken in changeset 1499 (reyalp-flt branch).

Location:
branches/reyalp-flt/platform
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/reyalp-flt/platform/g10/lib.c

    r1514 r1520  
    7474int vid_get_viewport_width() 
    7575{ 
    76         return 720 ;   //  G10 
     76        return 360 ;   //  G10 
    7777} 
    7878 
    … …  
    8282} 
    8383 
     84// Y multiplier for cameras with 480 pixel high viewports (CHDK code assumes 240) 
     85int vid_get_viewport_yscale() { 
     86        return 2;               // G10 viewport is 480 pixels high 
     87} 

  • branches/reyalp-flt/platform/g11/lib.c

    r1376 r1520  
    4949} 
    5050 
     51// Viewport and Bitmap values that shouldn't change across firmware versions. 
     52// Values that may change are in lib.c for each firmware version. 
     53 
     54int vid_get_viewport_width() 
     55{ 
     56        return 360; 
     57} 
     58 
     59long vid_get_viewport_height() 
     60{ 
     61   return 240; 
     62} 
     63 
     64// Y multiplier for cameras with 480 pixel high viewports (CHDK code assumes 240) 
     65int vid_get_viewport_yscale() { 
     66        return 2;               // G11 viewport is 480 pixels high 
     67} 

  • branches/reyalp-flt/platform/g11/sub/100f/lib.c

    r1514 r1520  
    8787    return (char*)0x97234;// G11 OK /* Search for a9999 ; "9999" */ 
    8888} 
    89  
    90 int vid_get_viewport_width() 
    91 { 
    92         return 720; 
    93 } 
    94  
    95 long vid_get_viewport_height() 
    96 { 
    97    return 240; 
    98  
    99 } 

  • branches/reyalp-flt/platform/g11/sub/100j/lib.c

    r1514 r1520  
    107107 
    108108} 
    109  
    110 int vid_get_viewport_width() 
    111 { 
    112         return 720; 
    113 } 
    114  
    115 long vid_get_viewport_height() 
    116 { 
    117    return 240; 
    118  
    119 } 

  • branches/reyalp-flt/platform/g11/sub/100l/lib.c

    r1514 r1520  
    107107 
    108108} 
    109  
    110 int vid_get_viewport_width() 
    111 { 
    112         return 720; 
    113 } 
    114  
    115 long vid_get_viewport_height() 
    116 { 
    117    return 240; 
    118  
    119 } 

  • branches/reyalp-flt/platform/s90/lib.c

    r977 r1520  
    4949} 
    5050 
     51// Viewport and Bitmap values that shouldn't change across firmware versions. 
     52// Values that may change are in lib.c for each firmware version. 
     53 
     54int vid_get_viewport_width() 
     55{ 
     56        return 360; 
     57} 
     58 
     59long vid_get_viewport_height() 
     60{ 
     61   return 240; 
     62} 
     63 
     64// Y multiplier for cameras with 480 pixel high viewports (CHDK code assumes 240) 
     65int vid_get_viewport_yscale() { 
     66        return 2;               // S90 viewport is 480 pixels high 
     67} 
     68 

  • branches/reyalp-flt/platform/s90/sub/100c/lib.c

    r1514 r1520  
    8585    return (char*)0x9792C;// S90 OK /* Search for a9999 ; "9999" */ 
    8686} 
    87  
    88 int vid_get_viewport_width() 
    89 { 
    90         return 720; 
    91 } 
    92  
    93 long vid_get_viewport_height() 
    94 { 
    95    return 240; 
    96  
    97 } 

  • branches/reyalp-flt/platform/s90/sub/101a/lib.c

    r1514 r1520  
    105105    return (char*)0x9792C;// S90 OK /* Search for a9999 ; "9999" */ 
    106106} 
    107  
    108 int vid_get_viewport_width() 
    109 { 
    110         return 720; 
    111 } 
    112  
    113 long vid_get_viewport_height() 
    114 { 
    115    return 240; 
    116  
    117 } 

  • branches/reyalp-flt/platform/s90/sub/101c/lib.c

    r1514 r1520  
    105105    return (char*)0x9792C;// S90 OK /* Search for a9999 ; "9999" */ 
    106106} 
    107  
    108 int vid_get_viewport_width() 
    109 { 
    110         return 720; 
    111 } 
    112  
    113 long vid_get_viewport_height() 
    114 { 
    115    return 240; 
    116  
    117 } 

  • branches/reyalp-flt/platform/s95/lib.c

    r1518 r1520  
    7575// Y multiplier for cameras with 480 pixel high viewports (CHDK code assumes 240) 
    7676int vid_get_viewport_yscale() { 
    77         return 2;               // G12 viewport is 480 pixels high 
     77        return 2;               // S95 viewport is 480 pixels high 
    7878} 
Note: See TracChangeset for help on using the changeset viewer.