Changeset 1681
- Timestamp:
- 02/19/12 05:39:52 (15 months ago)
- Location:
- trunk
- Files:
-
- 33 edited
-
. (modified) (1 prop)
-
core/gui_draw.h (modified) (13 diffs)
-
include/platform.h (modified) (2 diffs)
-
platform/a1100/platform_camera.h (modified) (1 diff)
-
platform/a3000/platform_camera.h (modified) (1 diff)
-
platform/a3300/platform_camera.h (modified) (1 diff)
-
platform/a470/wrappers.c (modified) (1 diff)
-
platform/g11/wrappers.c (modified) (1 diff)
-
platform/g12/platform_camera.h (modified) (1 diff)
-
platform/generic/wrappers.c (modified) (1 diff)
-
platform/ixus100_sd780/wrappers.c (modified) (1 diff)
-
platform/ixus120_sd940/wrappers.c (modified) (1 diff)
-
platform/ixus200_sd980/wrappers.c (modified) (1 diff)
-
platform/ixus220_elph300hs/platform_camera.h (modified) (1 diff)
-
platform/ixus230_elph310hs/platform_camera.h (modified) (1 diff)
-
platform/ixus310_elph500hs/platform_camera.h (modified) (1 diff)
-
platform/ixus80_sd1100/wrappers.c (modified) (1 diff)
-
platform/ixus85_sd770/wrappers.c (modified) (1 diff)
-
platform/ixus860_sd870/wrappers.c (modified) (1 diff)
-
platform/ixus870_sd880/platform_camera.h (modified) (1 diff)
-
platform/ixus870_sd880/wrappers.c (modified) (1 diff)
-
platform/ixus90_sd790/wrappers.c (modified) (1 diff)
-
platform/ixus95_sd1200/wrappers.c (modified) (1 diff)
-
platform/ixus960_sd950/wrappers.c (modified) (2 diffs)
-
platform/ixus970_sd890/wrappers.c (modified) (1 diff)
-
platform/s90/wrappers.c (modified) (1 diff)
-
platform/s95/platform_camera.h (modified) (1 diff)
-
platform/sx120is/wrappers.c (modified) (1 diff)
-
platform/sx220hs/platform_camera.h (modified) (1 diff)
-
platform/sx230hs/platform_camera.h (modified) (1 diff)
-
platform/sx230hs/wrappers.c (modified) (1 diff)
-
platform/sx30/platform_camera.h (modified) (1 diff)
-
platform/sx40hs/platform_camera.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/release-1_0 merged: 1680
- Property svn:mergeinfo changed
-
trunk/core/gui_draw.h
r1620 r1681 2 2 #define GUI_DRAW_H 3 3 4 #include "camera.h" // ensure the camera defintion is loaded 5 6 #include "gui.h" // for color, coord definitions 7 4 #include "camera.h" // ensure the camera definition is loaded 5 6 //------------------------------------------------------------------- 7 8 // Moved from gui_bench.c, gui_debug.c, gui_calendar.c, gui_reversi.c & gui_sokoban.c so it can be overridden 9 // Default value is white in SX30 & G12 palette making white text hard to read 10 #define SCREEN_COLOR 0xF7 11 12 //------------------------------------------------------------------- 8 13 9 14 // Common colors that are the same in all palettes … … 13 18 //------------------------------------------------------------------- 14 19 15 // Moved from gui_bench.c, gui_debug.c, gui_calendar.c, gui_reversi.c & gui_sokoban.c so it can be overridden16 // Default value is white in SX30 & G12 palette making white text hard to read17 #define SCREEN_COLOR 0xF718 19 //-------------------------------------------------------------------20 21 //-------------------------------------------------------------------22 23 20 #if CAM_BITMAP_PALETTE==1 24 21 25 22 // Default palette used unless overridden - see list of cameras using each palette below 26 27 #define COLOR_WHITE 0x1128 #define COLOR_RED 0x2229 #define COLOR_GREY 0x3F30 #define COLOR_GREEN 0x5531 #define COLOR_BLUE_LT 0xDD32 #define COLOR_BLUE 0xDF33 #define COLOR_YELLOW 0xEE34 #define COLOR_BG 0x4435 #define COLOR_FG COLOR_WHITE36 #define COLOR_SELECTED_BG COLOR_RED37 #define COLOR_SELECTED_FG COLOR_WHITE38 #define COLOR_ALT_BG 0xD439 #define COLOR_SPLASH_RED 0x2E40 #define COLOR_SPLASH_PINK 0x2141 #define COLOR_SPLASH_GREY 0x1F42 // colors for blended histo43 #define COLOR_HISTO_R COLOR_RED44 #define COLOR_HISTO_R_PLAY COLOR_RED45 #define COLOR_HISTO_B COLOR_BLUE46 #define COLOR_HISTO_G COLOR_GREEN47 #define COLOR_HISTO_G_PLAY COLOR_GREEN48 #define COLOR_HISTO_BG COLOR_BLUE_LT49 #define COLOR_HISTO_RG COLOR_YELLOW50 #define COLOR_HISTO_RB 0x6651 #define COLOR_HISTO_RB_PLAY 0xE252 #define COLOR_HISTO_B_PLAY 0xCC53 #define COLOR_HISTO_BG_PLAY 0x9954 #define COLOR_HISTO_RG_PLAY 0x6655 23 24 #define COLOR_WHITE 0x11 25 #define COLOR_RED 0x22 26 #define COLOR_GREY 0x3F 27 #define COLOR_GREEN 0x55 28 #define COLOR_BLUE_LT 0xDD 29 #define COLOR_BLUE 0xDF 30 #define COLOR_YELLOW 0xEE 31 #define COLOR_BG 0x44 32 #define COLOR_FG COLOR_WHITE 33 #define COLOR_SELECTED_BG COLOR_RED 34 #define COLOR_SELECTED_FG COLOR_WHITE 35 #define COLOR_ALT_BG 0xD4 36 #define COLOR_SPLASH_RED 0x2E 37 #define COLOR_SPLASH_PINK 0x21 38 #define COLOR_SPLASH_GREY 0x1F 39 // colors for blended histo 40 #define COLOR_HISTO_R COLOR_RED 41 #define COLOR_HISTO_R_PLAY COLOR_RED 42 #define COLOR_HISTO_B COLOR_BLUE 43 #define COLOR_HISTO_G COLOR_GREEN 44 #define COLOR_HISTO_G_PLAY COLOR_GREEN 45 #define COLOR_HISTO_BG COLOR_BLUE_LT 46 #define COLOR_HISTO_RG COLOR_YELLOW 47 #define COLOR_HISTO_RB 0x66 48 #define COLOR_HISTO_RB_PLAY 0xE2 49 #define COLOR_HISTO_B_PLAY 0xCC 50 #define COLOR_HISTO_BG_PLAY 0x99 51 #define COLOR_HISTO_RG_PLAY 0x66 52 56 53 // Icon colors 57 54 // 3 shades of Red, Green, Yellow and Grey … … 59 56 // to cater for cameras with variable palettes 60 57 #if defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus75_sd750) 61 #define COLOR_ICON_REC_RED0x8862 #define COLOR_ICON_REC_RED_DK0x8363 #define COLOR_ICON_REC_RED_LT0x8164 #define COLOR_ICON_REC_GREEN0x5565 #define COLOR_ICON_REC_GREEN_DK0x5366 #define COLOR_ICON_REC_GREEN_LT0x5167 #define COLOR_ICON_REC_YELLOW0x6668 #define COLOR_ICON_REC_YELLOW_DK0x3669 #define COLOR_ICON_REC_YELLOW_LT0x6170 #define COLOR_ICON_REC_GREYCOLOR_GREY71 #define COLOR_ICON_REC_GREY_DK0x3372 #define COLOR_ICON_REC_GREY_LT0x1158 #define COLOR_ICON_REC_RED 0x88 59 #define COLOR_ICON_REC_RED_DK 0x83 60 #define COLOR_ICON_REC_RED_LT 0x81 61 #define COLOR_ICON_REC_GREEN 0x55 62 #define COLOR_ICON_REC_GREEN_DK 0x53 63 #define COLOR_ICON_REC_GREEN_LT 0x51 64 #define COLOR_ICON_REC_YELLOW 0x66 65 #define COLOR_ICON_REC_YELLOW_DK 0x36 66 #define COLOR_ICON_REC_YELLOW_LT 0x61 67 #define COLOR_ICON_REC_GREY COLOR_GREY 68 #define COLOR_ICON_REC_GREY_DK 0x33 69 #define COLOR_ICON_REC_GREY_LT 0x11 73 70 #endif 74 71 #if defined (CAMERA_a610) 75 #define COLOR_ICON_REC_RED0x2276 #define COLOR_ICON_REC_RED_DK0x2F77 #define COLOR_ICON_REC_RED_LT0x2678 #define COLOR_ICON_REC_GREEN0x5F79 #define COLOR_ICON_REC_GREEN_DK0x2580 #define COLOR_ICON_REC_GREEN_LT0x5181 #define COLOR_ICON_REC_YELLOW0x9F82 #define COLOR_ICON_REC_YELLOW_DK0x9F83 #define COLOR_ICON_REC_YELLOW_LT0x9984 #define COLOR_ICON_REC_GREYCOLOR_GREY85 #define COLOR_ICON_REC_GREY_DK0x3386 #define COLOR_ICON_REC_GREY_LT0x1372 #define COLOR_ICON_REC_RED 0x22 73 #define COLOR_ICON_REC_RED_DK 0x2F 74 #define COLOR_ICON_REC_RED_LT 0x26 75 #define COLOR_ICON_REC_GREEN 0x5F 76 #define COLOR_ICON_REC_GREEN_DK 0x25 77 #define COLOR_ICON_REC_GREEN_LT 0x51 78 #define COLOR_ICON_REC_YELLOW 0x9F 79 #define COLOR_ICON_REC_YELLOW_DK 0x9F 80 #define COLOR_ICON_REC_YELLOW_LT 0x99 81 #define COLOR_ICON_REC_GREY COLOR_GREY 82 #define COLOR_ICON_REC_GREY_DK 0x33 83 #define COLOR_ICON_REC_GREY_LT 0x13 87 84 #endif 88 85 … … 91 88 // Used by :- G10, IXUS95_SD1200, IXUS980_SD990 92 89 93 #define COLOR_WHITE 0xD394 #define COLOR_RED 0x6495 #define COLOR_GREY 0x1296 #define COLOR_GREEN 0xC497 #define COLOR_BLUE_LT 0x6A98 #define COLOR_BLUE 0x8799 #define COLOR_YELLOW 0x44100 #define COLOR_BG 0x22 101 #define COLOR_FG COLOR_WHITE102 #define COLOR_SELECTED_BG COLOR_RED103 #define COLOR_SELECTED_FG COLOR_WHITE104 #define COLOR_ALT_BG 0x22105 #define COLOR_SPLASH_RED 0x58106 #define COLOR_SPLASH_PINK 0x4C107 #define COLOR_SPLASH_GREY 0x16108 // colors for blended histo 109 // many of these probably wrong on this cam110 #define COLOR_HISTO_R COLOR_RED111 #define COLOR_HISTO_R_PLAY COLOR_RED112 #define COLOR_HISTO_B COLOR_BLUE113 #define COLOR_HISTO_G COLOR_GREEN114 #define COLOR_HISTO_G_PLAY COLOR_GREEN115 #define COLOR_HISTO_BG COLOR_BLUE_LT116 #define COLOR_HISTO_RG COLOR_YELLOW117 #define COLOR_HISTO_RB 0x66118 #define COLOR_HISTO_RB_PLAY 0xE2119 #define COLOR_HISTO_B_PLAY 0xCC120 #define COLOR_HISTO_BG_PLAY 0x99121 #define COLOR_HISTO_RG_PLAY 0x66122 #undef SCREEN_COLOR123 #define SCREEN_COLOR 0x15// try for a dark color in both record and play mode90 #define COLOR_WHITE 0xD3 91 #define COLOR_RED 0x64 92 #define COLOR_GREY 0x12 93 #define COLOR_GREEN 0xC4 94 #define COLOR_BLUE_LT 0x6A 95 #define COLOR_BLUE 0x87 96 #define COLOR_YELLOW 0x44 97 #define COLOR_BG 0x22 98 #define COLOR_FG COLOR_WHITE 99 #define COLOR_SELECTED_BG COLOR_RED 100 #define COLOR_SELECTED_FG COLOR_WHITE 101 #define COLOR_ALT_BG 0x22 102 #define COLOR_SPLASH_RED 0x58 103 #define COLOR_SPLASH_PINK 0x4C 104 #define COLOR_SPLASH_GREY 0x16 105 // colors for blended histo 106 // many of these probably wrong on this cam 107 #define COLOR_HISTO_R COLOR_RED 108 #define COLOR_HISTO_R_PLAY COLOR_RED 109 #define COLOR_HISTO_B COLOR_BLUE 110 #define COLOR_HISTO_G COLOR_GREEN 111 #define COLOR_HISTO_G_PLAY COLOR_GREEN 112 #define COLOR_HISTO_BG COLOR_BLUE_LT 113 #define COLOR_HISTO_RG COLOR_YELLOW 114 #define COLOR_HISTO_RB 0x66 115 #define COLOR_HISTO_RB_PLAY 0xE2 116 #define COLOR_HISTO_B_PLAY 0xCC 117 #define COLOR_HISTO_BG_PLAY 0x99 118 #define COLOR_HISTO_RG_PLAY 0x66 119 #undef SCREEN_COLOR 120 #define SCREEN_COLOR 0x15 // try for a dark color in both record and play mode 124 121 125 122 // Icon colors … … 128 125 // to cater for cameras with variable palettes 129 126 #if defined (CAMERA_g10) 130 #define COLOR_ICON_REC_RED0x5F131 #define COLOR_ICON_REC_RED_DK0x69132 #define COLOR_ICON_REC_RED_LT0x55133 #define COLOR_ICON_REC_GREEN0x80134 #define COLOR_ICON_REC_GREEN_DK0x87135 #define COLOR_ICON_REC_GREEN_LT0x79136 #define COLOR_ICON_REC_YELLOW0x40137 #define COLOR_ICON_REC_YELLOW_DK0x47138 #define COLOR_ICON_REC_YELLOW_LT0x3D139 #define COLOR_ICON_REC_GREYCOLOR_GREY140 #define COLOR_ICON_REC_GREY_DK0x15141 #define COLOR_ICON_REC_GREY_LT0x08142 #define COLOR_ICON_PLY_REDCOLOR_ICON_REC_RED143 #define COLOR_ICON_PLY_RED_DKCOLOR_ICON_REC_RED_DK144 #define COLOR_ICON_PLY_RED_LTCOLOR_ICON_REC_RED_LT145 #define COLOR_ICON_PLY_GREEN0xCD146 #define COLOR_ICON_PLY_GREEN_DK0xD2147 #define COLOR_ICON_PLY_GREEN_LT0xC4148 #define COLOR_ICON_PLY_YELLOWCOLOR_ICON_REC_YELLOW149 #define COLOR_ICON_PLY_YELLOW_DKCOLOR_ICON_REC_YELLOW_DK150 #define COLOR_ICON_PLY_YELLOW_LTCOLOR_ICON_REC_YELLOW_LT151 #define COLOR_ICON_PLY_GREYCOLOR_ICON_REC_GREY152 #define COLOR_ICON_PLY_GREY_DKCOLOR_ICON_REC_GREY_DK153 #define COLOR_ICON_PLY_GREY_LTCOLOR_ICON_REC_GREY_LT127 #define COLOR_ICON_REC_RED 0x5F 128 #define COLOR_ICON_REC_RED_DK 0x69 129 #define COLOR_ICON_REC_RED_LT 0x55 130 #define COLOR_ICON_REC_GREEN 0x80 131 #define COLOR_ICON_REC_GREEN_DK 0x87 132 #define COLOR_ICON_REC_GREEN_LT 0x79 133 #define COLOR_ICON_REC_YELLOW 0x40 134 #define COLOR_ICON_REC_YELLOW_DK 0x47 135 #define COLOR_ICON_REC_YELLOW_LT 0x3D 136 #define COLOR_ICON_REC_GREY COLOR_GREY 137 #define COLOR_ICON_REC_GREY_DK 0x15 138 #define COLOR_ICON_REC_GREY_LT 0x08 139 #define COLOR_ICON_PLY_RED COLOR_ICON_REC_RED 140 #define COLOR_ICON_PLY_RED_DK COLOR_ICON_REC_RED_DK 141 #define COLOR_ICON_PLY_RED_LT COLOR_ICON_REC_RED_LT 142 #define COLOR_ICON_PLY_GREEN 0xCD 143 #define COLOR_ICON_PLY_GREEN_DK 0xD2 144 #define COLOR_ICON_PLY_GREEN_LT 0xC4 145 #define COLOR_ICON_PLY_YELLOW COLOR_ICON_REC_YELLOW 146 #define COLOR_ICON_PLY_YELLOW_DK COLOR_ICON_REC_YELLOW_DK 147 #define COLOR_ICON_PLY_YELLOW_LT COLOR_ICON_REC_YELLOW_LT 148 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 149 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 150 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 154 151 #endif 155 152 … … 158 155 // Used by :- IXUS120_SD940, SX200IS 159 156 160 #define COLOR_WHITE 0x01161 #define COLOR_RED 0x2B162 #define COLOR_GREY 0x17163 #define COLOR_GREEN 0x99164 #define COLOR_BLUE_LT 0x2D165 #define COLOR_BLUE 0x3B166 #define COLOR_YELLOW 0x9A167 #define COLOR_BG 0x81168 #define COLOR_FG COLOR_WHITE169 #define COLOR_SELECTED_BG COLOR_RED170 #define COLOR_SELECTED_FG COLOR_WHITE171 #define COLOR_ALT_BG COLOR_GREY172 #define COLOR_SPLASH_RED 0x29173 #define COLOR_SPLASH_PINK 0x1E174 #define COLOR_SPLASH_GREY 0x16175 // colors for blended histo176 #define COLOR_HISTO_R COLOR_RED177 #define COLOR_HISTO_R_PLAY COLOR_HISTO_R178 #define COLOR_HISTO_B COLOR_BLUE179 #define COLOR_HISTO_G COLOR_GREEN180 #define COLOR_HISTO_G_PLAY COLOR_HISTO_G181 #define COLOR_HISTO_BG COLOR_BLUE_LT182 #define COLOR_HISTO_RG COLOR_YELLOW183 #define COLOR_HISTO_RB COLOR_BLACK // there isn't purplish on this cam I guess184 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB185 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B186 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT187 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW188 157 #define COLOR_WHITE 0x01 158 #define COLOR_RED 0x2B 159 #define COLOR_GREY 0x17 160 #define COLOR_GREEN 0x99 161 #define COLOR_BLUE_LT 0x2D 162 #define COLOR_BLUE 0x3B 163 #define COLOR_YELLOW 0x9A 164 #define COLOR_BG 0x81 165 #define COLOR_FG COLOR_WHITE 166 #define COLOR_SELECTED_BG COLOR_RED 167 #define COLOR_SELECTED_FG COLOR_WHITE 168 #define COLOR_ALT_BG COLOR_GREY 169 #define COLOR_SPLASH_RED 0x29 170 #define COLOR_SPLASH_PINK 0x1E 171 #define COLOR_SPLASH_GREY 0x16 172 // colors for blended histo 173 #define COLOR_HISTO_R COLOR_RED 174 #define COLOR_HISTO_R_PLAY COLOR_HISTO_R 175 #define COLOR_HISTO_B COLOR_BLUE 176 #define COLOR_HISTO_G COLOR_GREEN 177 #define COLOR_HISTO_G_PLAY COLOR_HISTO_G 178 #define COLOR_HISTO_BG COLOR_BLUE_LT 179 #define COLOR_HISTO_RG COLOR_YELLOW 180 #define COLOR_HISTO_RB COLOR_BLACK // there isn't purplish on this cam I guess 181 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 182 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B 183 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 184 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 185 189 186 // Icon colors 190 187 // 3 shades of Red, Green, Yellow and Grey … … 192 189 // to cater for cameras with variable palettes 193 190 #if defined (CAMERA_sx200is) 194 #define COLOR_ICON_REC_RED0x2C195 #define COLOR_ICON_REC_RED_DK0x2C196 #define COLOR_ICON_REC_RED_LT0x20197 #define COLOR_ICON_REC_GREEN0x68198 #define COLOR_ICON_REC_GREEN_DK0x68199 #define COLOR_ICON_REC_GREEN_LT0x60200 #define COLOR_ICON_REC_YELLOW0x8F201 #define COLOR_ICON_REC_YELLOW_DK0x93202 #define COLOR_ICON_REC_YELLOW_LT0x87203 #define COLOR_ICON_REC_GREYCOLOR_GREY204 #define COLOR_ICON_REC_GREY_DK0x15205 #define COLOR_ICON_REC_GREY_LT0x10206 #define COLOR_ICON_PLY_REDCOLOR_ICON_REC_RED207 #define COLOR_ICON_PLY_RED_DKCOLOR_ICON_REC_RED_DK208 #define COLOR_ICON_PLY_RED_LTCOLOR_ICON_REC_RED_LT209 #define COLOR_ICON_PLY_GREEN0xA0210 #define COLOR_ICON_PLY_GREEN_DK0xA0211 #define COLOR_ICON_PLY_GREEN_LT0xA0212 #define COLOR_ICON_PLY_YELLOW0x6A213 #define COLOR_ICON_PLY_YELLOW_DK0x6C214 #define COLOR_ICON_PLY_YELLOW_LT0x66215 #define COLOR_ICON_PLY_GREYCOLOR_ICON_REC_GREY216 #define COLOR_ICON_PLY_GREY_DKCOLOR_ICON_REC_GREY_DK217 #define COLOR_ICON_PLY_GREY_LTCOLOR_ICON_REC_GREY_LT191 #define COLOR_ICON_REC_RED 0x2C 192 #define COLOR_ICON_REC_RED_DK 0x2C 193 #define COLOR_ICON_REC_RED_LT 0x20 194 #define COLOR_ICON_REC_GREEN 0x68 195 #define COLOR_ICON_REC_GREEN_DK 0x68 196 #define COLOR_ICON_REC_GREEN_LT 0x60 197 #define COLOR_ICON_REC_YELLOW 0x8F 198 #define COLOR_ICON_REC_YELLOW_DK 0x93 199 #define COLOR_ICON_REC_YELLOW_LT 0x87 200 #define COLOR_ICON_REC_GREY COLOR_GREY 201 #define COLOR_ICON_REC_GREY_DK 0x15 202 #define COLOR_ICON_REC_GREY_LT 0x10 203 #define COLOR_ICON_PLY_RED COLOR_ICON_REC_RED 204 #define COLOR_ICON_PLY_RED_DK COLOR_ICON_REC_RED_DK 205 #define COLOR_ICON_PLY_RED_LT COLOR_ICON_REC_RED_LT 206 #define COLOR_ICON_PLY_GREEN 0xA0 207 #define COLOR_ICON_PLY_GREEN_DK 0xA0 208 #define COLOR_ICON_PLY_GREEN_LT 0xA0 209 #define COLOR_ICON_PLY_YELLOW 0x6A 210 #define COLOR_ICON_PLY_YELLOW_DK 0x6C 211 #define COLOR_ICON_PLY_YELLOW_LT 0x66 212 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 213 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 214 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 218 215 #endif 219 216 #if defined (CAMERA_ixus120_sd940) … … 249 246 // Used by :- G11, S90, SX120IS 250 247 251 #define COLOR_WHITE 0x01252 #define COLOR_RED 0x2B253 #define COLOR_GREY 0x17254 #define COLOR_GREEN 0x99255 #define COLOR_BLUE_LT 0xA9256 #define COLOR_BLUE 0xA1257 #define COLOR_YELLOW 0x9A258 #define COLOR_BG 0x61259 #define COLOR_FG COLOR_WHITE260 #define COLOR_SELECTED_BG COLOR_RED261 #define COLOR_SELECTED_FG COLOR_WHITE262 #define COLOR_ALT_BG COLOR_GREY263 #define COLOR_SPLASH_RED 0x29264 #define COLOR_SPLASH_PINK 0x1E265 #define COLOR_SPLASH_GREY 0x16266 // colors for blended histo267 #define COLOR_HISTO_R COLOR_RED268 #define COLOR_HISTO_R_PLAY COLOR_HISTO_R269 #define COLOR_HISTO_B COLOR_BLUE270 #define COLOR_HISTO_G COLOR_GREEN271 #define COLOR_HISTO_G_PLAY COLOR_HISTO_G272 #define COLOR_HISTO_BG COLOR_BLUE_LT273 #define COLOR_HISTO_RG COLOR_YELLOW274 #define COLOR_HISTO_RB COLOR_BLACK // there isn't purplish on this cam I guess275 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB276 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B277 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT278 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW279 248 #define COLOR_WHITE 0x01 249 #define COLOR_RED 0x2B 250 #define COLOR_GREY 0x17 251 #define COLOR_GREEN 0x99 252 #define COLOR_BLUE_LT 0xA9 253 #define COLOR_BLUE 0xA1 254 #define COLOR_YELLOW 0x9A 255 #define COLOR_BG 0x61 256 #define COLOR_FG COLOR_WHITE 257 #define COLOR_SELECTED_BG COLOR_RED 258 #define COLOR_SELECTED_FG COLOR_WHITE 259 #define COLOR_ALT_BG COLOR_GREY 260 #define COLOR_SPLASH_RED 0x29 261 #define COLOR_SPLASH_PINK 0x1E 262 #define COLOR_SPLASH_GREY 0x16 263 // colors for blended histo 264 #define COLOR_HISTO_R COLOR_RED 265 #define COLOR_HISTO_R_PLAY COLOR_HISTO_R 266 #define COLOR_HISTO_B COLOR_BLUE 267 #define COLOR_HISTO_G COLOR_GREEN 268 #define COLOR_HISTO_G_PLAY COLOR_HISTO_G 269 #define COLOR_HISTO_BG COLOR_BLUE_LT 270 #define COLOR_HISTO_RG COLOR_YELLOW 271 #define COLOR_HISTO_RB COLOR_BLACK // there isn't purplish on this cam I guess 272 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 273 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B 274 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 275 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 276 280 277 // Icon colors 281 278 // 3 shades of Red, Green, Yellow and Grey … … 283 280 // to cater for cameras with variable palettes 284 281 #if defined (CAMERA_sx120is) 285 #define COLOR_ICON_REC_RED0x1E286 #define COLOR_ICON_REC_RED_DK0xA0287 #define COLOR_ICON_REC_RED_LT0x26288 #define COLOR_ICON_REC_GREEN0x47289 #define COLOR_ICON_REC_GREEN_DK0x4A290 #define COLOR_ICON_REC_GREEN_LT0x44291 #define COLOR_ICON_REC_YELLOW0x69292 #define COLOR_ICON_REC_YELLOW_DK0x9A293 #define COLOR_ICON_REC_YELLOW_LT0x78294 #define COLOR_ICON_REC_GREYCOLOR_GREY295 #define COLOR_ICON_REC_GREY_DK0x10296 #define COLOR_ICON_REC_GREY_LT0x19297 #define COLOR_ICON_PLY_RED0x27298 #define COLOR_ICON_PLY_RED_DK0x2C299 #define COLOR_ICON_PLY_RED_LT0x20300 #define COLOR_ICON_PLY_GREEN0xCB301 #define COLOR_ICON_PLY_GREEN_DK0xCB302 #define COLOR_ICON_PLY_GREEN_LT0xCB303 #define COLOR_ICON_PLY_YELLOW0xBE304 #define COLOR_ICON_PLY_YELLOW_DK0x76305 #define COLOR_ICON_PLY_YELLOW_LT0x5A306 #define COLOR_ICON_PLY_GREYCOLOR_ICON_REC_GREY307 #define COLOR_ICON_PLY_GREY_DKCOLOR_ICON_REC_GREY_DK308 #define COLOR_ICON_PLY_GREY_LTCOLOR_ICON_REC_GREY_LT282 #define COLOR_ICON_REC_RED 0x1E 283 #define COLOR_ICON_REC_RED_DK 0xA0 284 #define COLOR_ICON_REC_RED_LT 0x26 285 #define COLOR_ICON_REC_GREEN 0x47 286 #define COLOR_ICON_REC_GREEN_DK 0x4A 287 #define COLOR_ICON_REC_GREEN_LT 0x44 288 #define COLOR_ICON_REC_YELLOW 0x69 289 #define COLOR_ICON_REC_YELLOW_DK 0x9A 290 #define COLOR_ICON_REC_YELLOW_LT 0x78 291 #define COLOR_ICON_REC_GREY COLOR_GREY 292 #define COLOR_ICON_REC_GREY_DK 0x10 293 #define COLOR_ICON_REC_GREY_LT 0x19 294 #define COLOR_ICON_PLY_RED 0x27 295 #define COLOR_ICON_PLY_RED_DK 0x2C 296 #define COLOR_ICON_PLY_RED_LT 0x20 297 #define COLOR_ICON_PLY_GREEN 0xCB 298 #define COLOR_ICON_PLY_GREEN_DK 0xCB 299 #define COLOR_ICON_PLY_GREEN_LT 0xCB 300 #define COLOR_ICON_PLY_YELLOW 0xBE 301 #define COLOR_ICON_PLY_YELLOW_DK 0x76 302 #define COLOR_ICON_PLY_YELLOW_LT 0x5A 303 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 304 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 305 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 309 306 #endif 310 307 … … 313 310 // Used by :- D10, IXUS100_SD780 314 311 315 #define COLOR_WHITE 0xD3316 #define COLOR_RED 0x6A317 #define COLOR_GREY 0x12318 #define COLOR_GREEN 0xBF319 #define COLOR_BLUE_LT 0x7C320 #define COLOR_BLUE 0x90321 #define COLOR_YELLOW 0x53322 #define COLOR_BG 0x22323 #define COLOR_FG COLOR_WHITE324 #define COLOR_SELECTED_BG COLOR_RED325 #define COLOR_SELECTED_FG COLOR_WHITE326 #define COLOR_ALT_BG 0x22327 #define COLOR_SPLASH_RED 0x72328 #define COLOR_SPLASH_PINK 0x5C329 #define COLOR_SPLASH_GREY 0x16330 #define COLOR_HISTO_R COLOR_RED331 #define COLOR_HISTO_R_PLAY COLOR_RED332 #define COLOR_HISTO_B COLOR_BLUE333 #define COLOR_HISTO_G COLOR_GREEN334 #define COLOR_HISTO_G_PLAY COLOR_GREEN335 #define COLOR_HISTO_BG COLOR_BLUE_LT336 #define COLOR_HISTO_RG COLOR_YELLOW337 #define COLOR_HISTO_RB 0x72338 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB339 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B340 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT341 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW342 #undef SCREEN_COLOR343 #define SCREEN_COLOR0x1D312 #define COLOR_WHITE 0xD3 313 #define COLOR_RED 0x6A 314 #define COLOR_GREY 0x12 315 #define COLOR_GREEN 0xBF 316 #define COLOR_BLUE_LT 0x7C 317 #define COLOR_BLUE 0x90 318 #define COLOR_YELLOW 0x53 319 #define COLOR_BG 0x22 320 #define COLOR_FG COLOR_WHITE 321 #define COLOR_SELECTED_BG COLOR_RED 322 #define COLOR_SELECTED_FG COLOR_WHITE 323 #define COLOR_ALT_BG 0x22 324 #define COLOR_SPLASH_RED 0x72 325 #define COLOR_SPLASH_PINK 0x5C 326 #define COLOR_SPLASH_GREY 0x16 327 #define COLOR_HISTO_R COLOR_RED 328 #define COLOR_HISTO_R_PLAY COLOR_RED 329 #define COLOR_HISTO_B COLOR_BLUE 330 #define COLOR_HISTO_G COLOR_GREEN 331 #define COLOR_HISTO_G_PLAY COLOR_GREEN 332 #define COLOR_HISTO_BG COLOR_BLUE_LT 333 #define COLOR_HISTO_RG COLOR_YELLOW 334 #define COLOR_HISTO_RB 0x72 335 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 336 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B 337 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 338 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 339 #undef SCREEN_COLOR 340 #define SCREEN_COLOR 0x1D 344 341 345 342 #elif CAM_BITMAP_PALETTE==6 … … 347 344 // Used by :- SX20 348 345 349 #define COLOR_WHITE 0x01350 #define COLOR_RED 0x2B351 #define COLOR_GREY 0x0F352 #define COLOR_GREEN 0xA9353 #define COLOR_BLUE_LT 0x2D354 #define COLOR_BLUE 0x3B355 #define COLOR_YELLOW 0x8B356 #define COLOR_BG 0xFE357 #define COLOR_FG COLOR_WHITE358 #define COLOR_SELECTED_BG COLOR_RED359 #define COLOR_SELECTED_FG COLOR_WHITE360 #define COLOR_ALT_BG COLOR_BG361 #define COLOR_SPLASH_RED COLOR_RED362 #define COLOR_SPLASH_PINK 0xEA363 #define COLOR_SPLASH_GREY 0x16364 #define COLOR_HISTO_R COLOR_RED365 #define COLOR_HISTO_R_PLAY COLOR_RED366 #define COLOR_HISTO_B COLOR_BLUE367 #define COLOR_HISTO_G COLOR_GREEN368 #define COLOR_HISTO_G_PLAY COLOR_GREEN369 #define COLOR_HISTO_BG COLOR_BLUE_LT370 #define COLOR_HISTO_RG COLOR_YELLOW371 #define COLOR_HISTO_RB COLOR_RED372 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB373 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B374 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT375 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW376 346 #define COLOR_WHITE 0x01 347 #define COLOR_RED 0x2B 348 #define COLOR_GREY 0x0F 349 #define COLOR_GREEN 0xA9 350 #define COLOR_BLUE_LT 0x2D 351 #define COLOR_BLUE 0x3B 352 #define COLOR_YELLOW 0x8B 353 #define COLOR_BG 0xFE 354 #define COLOR_FG COLOR_WHITE 355 #define COLOR_SELECTED_BG COLOR_RED 356 #define COLOR_SELECTED_FG COLOR_WHITE 357 #define COLOR_ALT_BG COLOR_BG 358 #define COLOR_SPLASH_RED COLOR_RED 359 #define COLOR_SPLASH_PINK 0xEA 360 #define COLOR_SPLASH_GREY 0x16 361 #define COLOR_HISTO_R COLOR_RED 362 #define COLOR_HISTO_R_PLAY COLOR_RED 363 #define COLOR_HISTO_B COLOR_BLUE 364 #define COLOR_HISTO_G COLOR_GREEN 365 #define COLOR_HISTO_G_PLAY COLOR_GREEN 366 #define COLOR_HISTO_BG COLOR_BLUE_LT 367 #define COLOR_HISTO_RG COLOR_YELLOW 368 #define COLOR_HISTO_RB COLOR_RED 369 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 370 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B 371 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 372 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 373 377 374 // Icon colors 378 375 // 3 shades of Red, Green, Yellow and Grey 379 376 // Separate definitions for record and playback mode 380 377 // to cater for cameras with variable palettes 381 #define COLOR_ICON_REC_RED0x2C382 #define COLOR_ICON_REC_RED_DK0x91383 #define COLOR_ICON_REC_RED_LT0x26384 #define COLOR_ICON_REC_GREEN0xB0385 #define COLOR_ICON_REC_GREEN_DK0xB7386 #define COLOR_ICON_REC_GREEN_LT0xA9387 #define COLOR_ICON_REC_YELLOW0xDB388 #define COLOR_ICON_REC_YELLOW_DK0xD9389 #define COLOR_ICON_REC_YELLOW_LT0xDD390 #define COLOR_ICON_REC_GREYCOLOR_GREY391 #define COLOR_ICON_REC_GREY_DK0x11392 #define COLOR_ICON_REC_GREY_LT0x10393 #define COLOR_ICON_PLY_RED0x25394 #define COLOR_ICON_PLY_RED_DK0x2C395 #define COLOR_ICON_PLY_RED_LT0x1E396 #define COLOR_ICON_PLY_GREEN0xA5397 #define COLOR_ICON_PLY_GREEN_DK0xAC398 #define COLOR_ICON_PLY_GREEN_LT0x9E399 #define COLOR_ICON_PLY_YELLOW0x75400 #define COLOR_ICON_PLY_YELLOW_DK0x7A401 #define COLOR_ICON_PLY_YELLOW_LT0x71402 #define COLOR_ICON_PLY_GREYCOLOR_ICON_REC_GREY403 #define COLOR_ICON_PLY_GREY_DKCOLOR_ICON_REC_GREY_DK404 #define COLOR_ICON_PLY_GREY_LTCOLOR_ICON_REC_GREY_LT378 #define COLOR_ICON_REC_RED 0x2C 379 #define COLOR_ICON_REC_RED_DK 0x91 380 #define COLOR_ICON_REC_RED_LT 0x26 381 #define COLOR_ICON_REC_GREEN 0xB0 382 #define COLOR_ICON_REC_GREEN_DK 0xB7 383 #define COLOR_ICON_REC_GREEN_LT 0xA9 384 #define COLOR_ICON_REC_YELLOW 0xDB 385 #define COLOR_ICON_REC_YELLOW_DK 0xD9 386 #define COLOR_ICON_REC_YELLOW_LT 0xDD 387 #define COLOR_ICON_REC_GREY COLOR_GREY 388 #define COLOR_ICON_REC_GREY_DK 0x11 389 #define COLOR_ICON_REC_GREY_LT 0x10 390 #define COLOR_ICON_PLY_RED 0x25 391 #define COLOR_ICON_PLY_RED_DK 0x2C 392 #define COLOR_ICON_PLY_RED_LT 0x1E 393 #define COLOR_ICON_PLY_GREEN 0xA5 394 #define COLOR_ICON_PLY_GREEN_DK 0xAC 395 #define COLOR_ICON_PLY_GREEN_LT 0x9E 396 #define COLOR_ICON_PLY_YELLOW 0x75 397 #define COLOR_ICON_PLY_YELLOW_DK 0x7A 398 #define COLOR_ICON_PLY_YELLOW_LT 0x71 399 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 400 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 401 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 405 402 406 403 #elif CAM_BITMAP_PALETTE==7 407 404 408 // Used by :- S95, SX130IS 409 410 #define COLOR_WHITE 0x01 411 #define COLOR_RED 0x1e 412 #define COLOR_GREY 0x1a 413 #define COLOR_GREEN 0x17 414 #define COLOR_BLUE_LT 0x10 415 #define COLOR_BLUE 0x14 416 #define COLOR_YELLOW 0x60 417 #define COLOR_BG 0x62 418 #define COLOR_FG COLOR_WHITE 419 #define COLOR_SELECTED_BG 0x0e 420 #define COLOR_SELECTED_FG COLOR_BLACK 421 #define COLOR_ALT_BG COLOR_BG 422 #define COLOR_SPLASH_RED COLOR_RED 423 #define COLOR_SPLASH_PINK 0x1e // Orange 424 #define COLOR_SPLASH_GREY 0x16 425 #define COLOR_HISTO_R 0x66 426 #define COLOR_HISTO_R_PLAY 0xA0 427 #define COLOR_HISTO_B 0x61 428 #define COLOR_HISTO_B_PLAY 0xA2 429 #define COLOR_HISTO_G 0x5F 430 #define COLOR_HISTO_G_PLAY 0xA1 431 #define COLOR_HISTO_BG COLOR_BLUE_LT 432 #define COLOR_HISTO_RG COLOR_YELLOW 433 #define COLOR_HISTO_RB COLOR_RED 434 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 435 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 436 #define COLOR_HISTO_RG_PLAY 0x80 437 #undef SCREEN_COLOR 438 #define SCREEN_COLOR 0x1D 439 440 #if defined(CAMERA_sx130is) 441 #define COLOR_ICON_REC_RED 0x66 442 #define COLOR_ICON_REC_RED_DK 0x66 443 #define COLOR_ICON_REC_RED_LT 0x66 444 #define COLOR_ICON_REC_GREEN 0x6B 445 #define COLOR_ICON_REC_GREEN_DK 0x6B 446 #define COLOR_ICON_REC_GREEN_LT 0x69 447 #define COLOR_ICON_REC_YELLOW 0x60 448 #define COLOR_ICON_REC_YELLOW_DK 0x45 449 #define COLOR_ICON_REC_YELLOW_LT 0x6C 450 #define COLOR_ICON_REC_GREY COLOR_GREY 451 #define COLOR_ICON_REC_GREY_DK 0x19 452 #define COLOR_ICON_REC_GREY_LT 0x10 453 #define COLOR_ICON_PLY_RED 0xA0 454 #define COLOR_ICON_PLY_RED_DK 0xA0 455 #define COLOR_ICON_PLY_RED_LT 0xA0 456 #define COLOR_ICON_PLY_GREEN 0xA1 457 #define COLOR_ICON_PLY_GREEN_DK 0xA1 458 #define COLOR_ICON_PLY_GREEN_LT 0xA1 459 #define COLOR_ICON_PLY_YELLOW 0x6A 460 #define COLOR_ICON_PLY_YELLOW_DK 0x6F 461 #define COLOR_ICON_PLY_YELLOW_LT 0x63 462 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 463 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 464 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 465 #endif 466 467 #elif CAM_BITMAP_PALETTE==8 468 469 // Used by :- A490, A495 470 471 #define COLOR_WHITE 0x01 472 #define COLOR_RED 0x66 473 #define COLOR_GREY 0x6D 474 #define COLOR_GREEN 0x69 475 #define COLOR_BLUE_LT 0x68 476 #define COLOR_BLUE 0x67 477 #define COLOR_YELLOW 0x60 478 #define COLOR_BG 0x20 479 #define COLOR_FG COLOR_WHITE 480 #define COLOR_SELECTED_BG COLOR_RED 481 #define COLOR_SELECTED_FG COLOR_WHITE 482 #define COLOR_ALT_BG 0x20 483 #define COLOR_SPLASH_RED COLOR_RED 484 #define COLOR_SPLASH_PINK COLOR_GREY 485 #define COLOR_SPLASH_GREY 0xDE 486 #define COLOR_HISTO_R COLOR_RED 487 #define COLOR_HISTO_R_PLAY COLOR_RED 488 #define COLOR_HISTO_B COLOR_BLUE 489 #define COLOR_HISTO_G COLOR_GREEN 490 #define COLOR_HISTO_G_PLAY COLOR_GREEN 491 #define COLOR_HISTO_BG COLOR_BLUE_LT 492 #define COLOR_HISTO_RG COLOR_YELLOW 493 #define COLOR_HISTO_RB COLOR_RED 494 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 495 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B 496 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 497 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 498 499 #elif CAM_BITMAP_PALETTE==9 500 501 // Used by :- SX220HS, SX230HS 502 503 #define COLOR_WHITE 0x01 504 #define COLOR_RED 0x9f 505 #define COLOR_GREY 0x1a 506 #define COLOR_GREY_LIGHT 0x0B 507 #define COLOR_GREY_DARK 0x19 508 #define COLOR_GREEN 0xa0 509 #define COLOR_BLUE_LT 0x96 510 #define COLOR_BLUE 0xa1 511 #define COLOR_YELLOW 0x92 512 #define COLOR_BG 0x4B 513 #define COLOR_FG COLOR_WHITE 514 #define COLOR_SELECTED_BG 0x0e 515 #define COLOR_SELECTED_FG COLOR_BLACK 516 #define COLOR_ALT_BG COLOR_BG 517 #define COLOR_SPLASH_RED COLOR_RED 518 #define COLOR_SPLASH_PINK 0x1e // Orange 519 #define COLOR_SPLASH_GREY 0x16 520 #define COLOR_HISTO_R 0x6C 521 #define COLOR_HISTO_R_PLAY COLOR_RED 522 #define COLOR_HISTO_B 0x6D 523 #define COLOR_HISTO_B_PLAY COLOR_BLUE 524 #define COLOR_HISTO_G 0x90 525 #define COLOR_HISTO_G_PLAY COLOR_GREEN 526 #define COLOR_HISTO_BG 0x52 // COLOR_BLUE_LT 527 #define COLOR_HISTO_RG 0x51 // COLOR_YELLOW 528 #define COLOR_HISTO_RB 0x3D // COLOR_RED 529 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 530 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 531 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 532 #undef SCREEN_COLOR 533 #define SCREEN_COLOR 0x1D 534 405 // Used by :- SX130IS 406 407 #define COLOR_WHITE 0x01 408 #define COLOR_RED 0x1e 409 #define COLOR_GREY 0x1a 410 #define COLOR_GREEN 0x17 411 #define COLOR_BLUE_LT 0x10 412 #define COLOR_BLUE 0x14 413 #define COLOR_YELLOW 0x60 414 #define COLOR_BG 0x62 415 #define COLOR_FG COLOR_WHITE 416 #define COLOR_SELECTED_BG 0x0e 417 #define COLOR_SELECTED_FG COLOR_BLACK 418 #define COLOR_ALT_BG COLOR_BG 419 #define COLOR_SPLASH_RED COLOR_RED 420 #define COLOR_SPLASH_PINK 0x1e // Orange 421 #define COLOR_SPLASH_GREY 0x16 422 #define COLOR_HISTO_R 0x66 423 #define COLOR_HISTO_R_PLAY 0xA0 424 #define COLOR_HISTO_B 0x61 425 #define COLOR_HISTO_B_PLAY 0xA2 426 #define COLOR_HISTO_G 0x5F 427 #define COLOR_HISTO_G_PLAY 0xA1 428 #define COLOR_HISTO_BG COLOR_BLUE_LT 429 #define COLOR_HISTO_RG COLOR_YELLOW 430 #define COLOR_HISTO_RB COLOR_RED 431 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 432 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 433 #define COLOR_HISTO_RG_PLAY 0x80 434 #undef SCREEN_COLOR 435 #define SCREEN_COLOR 0x1D 436 535 437 // Icon colors 536 438 // 3 shades of Red, Green, Yellow and Grey 537 439 // Separate definitions for record and playback mode 538 440 // to cater for cameras with variable palettes 539 #define COLOR_ICON_REC_RED 0x3D 540 #define COLOR_ICON_REC_RED_DK 0x6C 541 #define COLOR_ICON_REC_RED_LT 0x1E 542 #define COLOR_ICON_REC_GREEN 0x90 543 #define COLOR_ICON_REC_GREEN_DK 0x5A 544 #define COLOR_ICON_REC_GREEN_LT 0x59 545 #define COLOR_ICON_REC_YELLOW 0x2D 546 #define COLOR_ICON_REC_YELLOW_DK 0x1E 547 #define COLOR_ICON_REC_YELLOW_LT 0x20 548 #define COLOR_ICON_REC_GREY COLOR_GREY 549 #define COLOR_ICON_REC_GREY_DK 0x1A 550 #define COLOR_ICON_REC_GREY_LT 0x11 551 #define COLOR_ICON_PLY_RED 0x9F 552 #define COLOR_ICON_PLY_RED_DK 0x9F 553 #define COLOR_ICON_PLY_RED_LT 0x1E 554 #define COLOR_ICON_PLY_GREEN 0xA0 555 #define COLOR_ICON_PLY_GREEN_DK 0xA0 556 #define COLOR_ICON_PLY_GREEN_LT 0x9E 557 #define COLOR_ICON_PLY_YELLOW 0x55 558 #define COLOR_ICON_PLY_YELLOW_DK 0x55 559 #define COLOR_ICON_PLY_YELLOW_LT 0x4C 560 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 561 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 562 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 441 #if defined(CAMERA_sx130is) 442 #define COLOR_ICON_REC_RED 0x66 443 #define COLOR_ICON_REC_RED_DK 0x66 444 #define COLOR_ICON_REC_RED_LT 0x66 445 #define COLOR_ICON_REC_GREEN 0x6B 446 #define COLOR_ICON_REC_GREEN_DK 0x6B 447 #define COLOR_ICON_REC_GREEN_LT 0x69 448 #define COLOR_ICON_REC_YELLOW 0x60 449 #define COLOR_ICON_REC_YELLOW_DK 0x45 450 #define COLOR_ICON_REC_YELLOW_LT 0x6C 451 #define COLOR_ICON_REC_GREY COLOR_GREY 452 #define COLOR_ICON_REC_GREY_DK 0x19 453 #define COLOR_ICON_REC_GREY_LT 0x10 454 #define COLOR_ICON_PLY_RED 0xA0 455 #define COLOR_ICON_PLY_RED_DK 0xA0 456 #define COLOR_ICON_PLY_RED_LT 0xA0 457 #define COLOR_ICON_PLY_GREEN 0xA1 458 #define COLOR_ICON_PLY_GREEN_DK 0xA1 459 #define COLOR_ICON_PLY_GREEN_LT 0xA1 460 #define COLOR_ICON_PLY_YELLOW 0x6A 461 #define COLOR_ICON_PLY_YELLOW_DK 0x6F 462 #define COLOR_ICON_PLY_YELLOW_LT 0x63 463 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 464 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 465 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 466 #endif 467 468 #elif CAM_BITMAP_PALETTE==8 469 470 // Used by :- A490, A495 471 472 #define COLOR_WHITE 0x11 473 #define COLOR_RED 0x2F 474 #define COLOR_GREY 0x1F 475 #define COLOR_GREEN 0xFC 476 #define COLOR_BLUE_LT 0xEE 477 #define COLOR_BLUE 0xEF 478 #define COLOR_YELLOW 0xDD 479 #define COLOR_BG 0x0F 480 #define COLOR_FG COLOR_WHITE 481 #define COLOR_SELECTED_BG COLOR_RED 482 #define COLOR_SELECTED_FG COLOR_WHITE 483 #define COLOR_ALT_BG 0x20 484 #define COLOR_SPLASH_RED 0x22 485 #define COLOR_SPLASH_PINK 0x24 486 #define COLOR_SPLASH_GREY 0x1F 487 // colors for blended histo 488 #define COLOR_HISTO_R COLOR_RED 489 #define COLOR_HISTO_R_PLAY COLOR_RED 490 #define COLOR_HISTO_B COLOR_BLUE 491 #define COLOR_HISTO_G COLOR_GREEN 492 #define COLOR_HISTO_G_PLAY COLOR_GREEN 493 #define COLOR_HISTO_BG COLOR_BLUE_LT 494 #define COLOR_HISTO_RG COLOR_YELLOW 495 #define COLOR_HISTO_RB 0x66 496 #define COLOR_HISTO_RB_PLAY 0xE2 497 #define COLOR_HISTO_B_PLAY 0xCC 498 #define COLOR_HISTO_BG_PLAY 0x99 499 #define COLOR_HISTO_RG_PLAY 0x66 500 501 #elif CAM_BITMAP_PALETTE==9 502 503 // Used by :- S95 504 505 #define COLOR_WHITE 0x01 506 #define COLOR_RED 0x66 507 #define COLOR_GREY 0x6D 508 #define COLOR_GREEN 0x69 509 #define COLOR_BLUE_LT 0x68 510 #define COLOR_BLUE 0x67 511 #define COLOR_YELLOW 0x60 512 #define COLOR_BG 0x20 513 #define COLOR_FG COLOR_WHITE 514 #define COLOR_SELECTED_BG COLOR_RED 515 #define COLOR_SELECTED_FG COLOR_WHITE 516 #define COLOR_ALT_BG 0x20 517 #define COLOR_SPLASH_RED COLOR_RED 518 #define COLOR_SPLASH_PINK COLOR_GREY 519 #define COLOR_SPLASH_GREY 0xDE 520 #define COLOR_HISTO_R COLOR_RED 521 #define COLOR_HISTO_R_PLAY COLOR_RED 522 #define COLOR_HISTO_B COLOR_BLUE 523 #define COLOR_HISTO_G COLOR_GREEN 524 #define COLOR_HISTO_G_PLAY COLOR_GREEN 525 #define COLOR_HISTO_BG COLOR_BLUE_LT 526 #define COLOR_HISTO_RG COLOR_YELLOW 527 #define COLOR_HISTO_RB COLOR_RED 528 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 529 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B 530 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 531 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 563 532 564 533 #elif CAM_BITMAP_PALETTE==10 565 534 566 // Used by :- A1100 567 568 #define COLOR_WHITE 0x0A 569 #define COLOR_RED 0x6B 570 #define COLOR_GREY 0x17 571 #define COLOR_GREEN 0x96 572 #define COLOR_BLUE_LT 0x79 573 #define COLOR_BLUE 0x8A 574 #define COLOR_YELLOW 0x54 575 #define COLOR_BG 0x1F 576 #define COLOR_FG COLOR_WHITE 577 #define COLOR_SELECTED_BG COLOR_RED 578 #define COLOR_SELECTED_FG COLOR_WHITE 579 #define COLOR_ALT_BG 0x87 580 #define COLOR_SPLASH_RED 0x60 581 #define COLOR_SPLASH_PINK 0xBD 582 #define COLOR_SPLASH_GREY 0x16 583 // colors for blended histo 584 #define COLOR_HISTO_R COLOR_RED 585 #define COLOR_HISTO_R_PLAY COLOR_RED 586 #define COLOR_HISTO_B COLOR_BLUE 587 #define COLOR_HISTO_G COLOR_GREEN 588 #define COLOR_HISTO_G_PLAY COLOR_GREEN 589 #define COLOR_HISTO_BG COLOR_BLUE_LT 590 #define COLOR_HISTO_RG COLOR_YELLOW 591 #define COLOR_HISTO_RB 0x66 592 #define COLOR_HISTO_RB_PLAY 0xE2 593 #define COLOR_HISTO_B_PLAY 0xCC 594 #define COLOR_HISTO_BG_PLAY 0x99 595 #define COLOR_HISTO_RG_PLAY 0x66 596 #undef SCREEN_COLOR 597 #define SCREEN_COLOR 0x1D 598 599 #elif CAM_BITMAP_PALETTE==11 600 601 // Used by :- IXUS300_SD4000 602 603 // pallete changes almost completely depenting on mode and if canon menu is active or not 604 // playback, playback with menu, photo record mode, photo record mode with menu, ... 605 #define COLOR_WHITE 0x01 // always the same 606 #define COLOR_RED 0x1E // always the same, bright orange (red is only available in record more without menu) 607 #define COLOR_GREY 0x16 // always the same 608 #define COLOR_GREEN 0x9F // playback only, without menu 609 #define COLOR_BLUE_LT 0x0C // playback: light brown 610 #define COLOR_BLUE 0x12 // playback: dark brown (almost like sh.t) 611 #define COLOR_YELLOW 0x90 // playback only, without menu 612 #define COLOR_BG 0x1D // greyisch 613 #define COLOR_FG COLOR_WHITE 614 #define COLOR_SELECTED_BG COLOR_RED // always the same, light grey 615 #define COLOR_SELECTED_FG COLOR_BLACK 616 #define COLOR_ALT_BG COLOR_BG 617 #define COLOR_SPLASH_RED COLOR_RED 618 #define COLOR_SPLASH_PINK COLOR_BLUE 619 #define COLOR_SPLASH_GREY 0x16 // darker grey 620 #define COLOR_HISTO_R 0x66 // record only, without menu 621 #define COLOR_HISTO_R_PLAY COLOR_RED 622 #define COLOR_HISTO_B 0x3C 623 #define COLOR_HISTO_B_PLAY 0x50 // playback without menu dont have blue at all, bright Orange 624 #define COLOR_HISTO_G 0x6B 625 #define COLOR_HISTO_G_PLAY COLOR_GREEN 626 #define COLOR_HISTO_BG COLOR_BLUE_LT 627 #define COLOR_HISTO_RG COLOR_YELLOW 628 #define COLOR_HISTO_RB COLOR_RED 629 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 630 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 631 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 632 633 #elif CAM_BITMAP_PALETTE==12 634 635 // Used by :- G12, SX30, SX40HS, IXUS310_ELPH500HS 636 637 // Default Canon colors 638 #define COLOR_WHITE 0x01 639 #define COLOR_GREY_DK 0x1a 640 #define COLOR_GREY 0x16 641 #define COLOR_GREY_LT 0x0E 642 #undef SCREEN_COLOR 643 #define SCREEN_COLOR 0x1D 644 645 // CHDK colors loaded into these locations in the camera palette by load_chdk_palette() 646 #define COLOR_RED (CHDK_COLOR_BASE+0) 647 #define COLOR_RED_DK (CHDK_COLOR_BASE+1) 648 #define COLOR_RED_LT (CHDK_COLOR_BASE+2) 649 #define COLOR_GREEN (CHDK_COLOR_BASE+3) 650 #define COLOR_GREEN_DK (CHDK_COLOR_BASE+4) 651 #define COLOR_GREEN_LT (CHDK_COLOR_BASE+5) 652 #define COLOR_BLUE (CHDK_COLOR_BASE+6) 653 #define COLOR_BLUE_DK (CHDK_COLOR_BASE+7) 654 #define COLOR_BLUE_LT (CHDK_COLOR_BASE+8) 655 #define COLOR_MAGENTA (CHDK_COLOR_BASE+9) 656 #define COLOR_YELLOW (CHDK_COLOR_BASE+10) 657 #define COLOR_YELLOW_DK (CHDK_COLOR_BASE+11) 658 #define COLOR_YELLOW_LT (CHDK_COLOR_BASE+12) 659 660 #define COLOR_CYAN COLOR_BLUE_LT 661 #define COLOR_BG COLOR_GREY_DK 662 #define COLOR_FG COLOR_WHITE 663 #define COLOR_SELECTED_BG COLOR_GREY_LT 664 #define COLOR_SELECTED_FG COLOR_BLACK 665 #define COLOR_ALT_BG COLOR_BG 666 667 #define COLOR_SPLASH_RED COLOR_RED_DK 668 #define COLOR_SPLASH_PINK COLOR_RED_LT 669 #define COLOR_SPLASH_GREY COLOR_GREY_LT 670 671 #define COLOR_HISTO_R COLOR_RED 672 #define COLOR_HISTO_R_PLAY COLOR_RED 673 #define COLOR_HISTO_B COLOR_BLUE 674 #define COLOR_HISTO_B_PLAY COLOR_BLUE 675 #define COLOR_HISTO_G COLOR_GREEN 676 #define COLOR_HISTO_G_PLAY COLOR_GREEN 677 #define COLOR_HISTO_BG COLOR_CYAN 678 #define COLOR_HISTO_BG_PLAY COLOR_CYAN 679 #define COLOR_HISTO_RG COLOR_YELLOW 680 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 681 #define COLOR_HISTO_RB COLOR_MAGENTA 682 #define COLOR_HISTO_RB_PLAY COLOR_MAGENTA 683 535 // Used by :- SX220HS, SX230HS, IXUS220_ELPH300HS, IXUS230_ELPH310HS 536 537 #define COLOR_WHITE 0x01 538 #define COLOR_RED 0x9f 539 #define COLOR_GREY 0x1a 540 #define COLOR_GREY_LIGHT 0x0B 541 #define COLOR_GREY_DARK 0x19 542 #define COLOR_GREEN 0xa0 543 #define COLOR_BLUE_LT 0x96 544 #define COLOR_BLUE 0xa1 545 #define COLOR_YELLOW 0x92 546 #define COLOR_BG 0x4B 547 #define COLOR_FG COLOR_WHITE 548 #define COLOR_SELECTED_BG 0x0e 549 #define COLOR_SELECTED_FG COLOR_BLACK 550 #define COLOR_ALT_BG COLOR_BG 551 #define COLOR_SPLASH_RED COLOR_RED 552 #define COLOR_SPLASH_PINK 0x1e // Orange 553 #define COLOR_SPLASH_GREY 0x16 554 #define COLOR_HISTO_R 0x6C 555 #define COLOR_HISTO_R_PLAY COLOR_RED 556 #define COLOR_HISTO_B 0x6D 557 #define COLOR_HISTO_B_PLAY COLOR_BLUE 558 #define COLOR_HISTO_G 0x90 559 #define COLOR_HISTO_G_PLAY COLOR_GREEN 560 #define COLOR_HISTO_BG 0x52 //COLOR_BLUE_LT 561 #define COLOR_HISTO_RG 0x51 //COLOR_YELLOW 562 #define COLOR_HISTO_RB 0x3D //COLOR_RED 563 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 564 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 565 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 566 #undef SCREEN_COLOR 567 #define SCREEN_COLOR 0x1D 568 684 569 // Icon colors 685 570 // 3 shades of Red, Green, Yellow and Grey 686 571 // Separate definitions for record and playback mode 687 572 // to cater for cameras with variable palettes 688 #define COLOR_ICON_REC_RED COLOR_RED 689 #define COLOR_ICON_REC_RED_DK COLOR_RED_DK 690 #define COLOR_ICON_REC_RED_LT COLOR_RED_LT 691 #define COLOR_ICON_REC_GREEN COLOR_GREEN 692 #define COLOR_ICON_REC_GREEN_DK COLOR_GREEN_DK 693 #define COLOR_ICON_REC_GREEN_LT COLOR_GREEN_LT 694 #define COLOR_ICON_REC_YELLOW COLOR_YELLOW 695 #define COLOR_ICON_REC_YELLOW_DK COLOR_YELLOW_DK 696 #define COLOR_ICON_REC_YELLOW_LT COLOR_YELLOW_LT 697 #define COLOR_ICON_REC_GREY COLOR_GREY 698 #define COLOR_ICON_REC_GREY_DK COLOR_GREY_DK 699 #define COLOR_ICON_REC_GREY_LT COLOR_GREY_LT 573 #define COLOR_ICON_REC_RED 0x3D 574 #define COLOR_ICON_REC_RED_DK 0x6C 575 #define COLOR_ICON_REC_RED_LT 0x1E 576 #define COLOR_ICON_REC_GREEN 0x90 577 #define COLOR_ICON_REC_GREEN_DK 0x5A 578 #define COLOR_ICON_REC_GREEN_LT 0x59 579 #define COLOR_ICON_REC_YELLOW 0x2D 580 #define COLOR_ICON_REC_YELLOW_DK 0x1E 581 #define COLOR_ICON_REC_YELLOW_LT 0x20 582 #define COLOR_ICON_REC_GREY COLOR_GREY 583 #define COLOR_ICON_REC_GREY_DK 0x1A 584 #define COLOR_ICON_REC_GREY_LT 0x11 585 #define COLOR_ICON_PLY_RED 0x9F 586 #define COLOR_ICON_PLY_RED_DK 0x9F 587 #define COLOR_ICON_PLY_RED_LT 0x1E 588 #define COLOR_ICON_PLY_GREEN 0xA0 589 #define COLOR_ICON_PLY_GREEN_DK 0xA0 590 #define COLOR_ICON_PLY_GREEN_LT 0x9E 591 #define COLOR_ICON_PLY_YELLOW 0x55 592 #define COLOR_ICON_PLY_YELLOW_DK 0x55 593 #define COLOR_ICON_PLY_YELLOW_LT 0x4C 594 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 595 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 596 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 597 598 #elif CAM_BITMAP_PALETTE==11 599 600 // Used by :- IXUS300_SD4000 601 602 // pallete changes almost completely depenting on mode and if canon menu is active or not 603 // playback, playback with menu, photo record mode, photo record mode with menu, ... 604 #define COLOR_WHITE 0x01 // always the same 605 #define COLOR_RED 0x1E // always the same, bright orange (red is only available in record more without menu) 606 #define COLOR_GREY 0x16 // always the same 607 #define COLOR_GREEN 0x9F // playback only, without menu 608 #define COLOR_BLUE_LT 0x0C // playback: light brown 609 #define COLOR_BLUE 0x12 // playback: dark brown (almost like sh.t) 610 #define COLOR_YELLOW 0x90 // playback only, without menu 611 #define COLOR_BG 0x1D // greyisch 612 #define COLOR_FG COLOR_WHITE 613 #define COLOR_SELECTED_BG COLOR_RED // always the same, light grey 614 #define COLOR_SELECTED_FG COLOR_BLACK 615 #define COLOR_ALT_BG COLOR_BG 616 #define COLOR_SPLASH_RED COLOR_RED 617 #define COLOR_SPLASH_PINK COLOR_BLUE 618 #define COLOR_SPLASH_GREY 0x16 // darker grey 619 #define COLOR_HISTO_R 0x66 // record only, without menu 620 #define COLOR_HISTO_R_PLAY COLOR_RED 621 #define COLOR_HISTO_B 0x3C 622 #define COLOR_HISTO_B_PLAY 0x50 // playback without menu dont have blue at all, bright Orange 623 #define COLOR_HISTO_G 0x6B 624 #define COLOR_HISTO_G_PLAY COLOR_GREEN 625 #define COLOR_HISTO_BG COLOR_BLUE_LT 626 #define COLOR_HISTO_RG COLOR_YELLOW 627 #define COLOR_HISTO_RB COLOR_RED 628 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 629 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 630 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 631 632 #elif CAM_BITMAP_PALETTE==12 633 634 // Used by :- A1100 635 636 #define COLOR_WHITE 0x0A 637 #define COLOR_RED 0x6B 638 #define COLOR_GREY 0x17 639 #define COLOR_GREEN 0x96 640 #define COLOR_BLUE_LT 0x79 641 #define COLOR_BLUE 0x8A 642 #define COLOR_YELLOW 0x54 643 #define COLOR_BG 0x1F 644 #define COLOR_FG COLOR_WHITE 645 #define COLOR_SELECTED_BG COLOR_RED 646 #define COLOR_SELECTED_FG COLOR_WHITE 647 #define COLOR_ALT_BG 0x87 648 #define COLOR_SPLASH_RED 0x60 649 #define COLOR_SPLASH_PINK 0xBD 650 #define COLOR_SPLASH_GREY 0x16 651 // colors for blended histo 652 #define COLOR_HISTO_R COLOR_RED 653 #define COLOR_HISTO_R_PLAY COLOR_RED 654 #define COLOR_HISTO_B COLOR_BLUE 655 #define COLOR_HISTO_G COLOR_GREEN 656 #define COLOR_HISTO_G_PLAY COLOR_GREEN 657 #define COLOR_HISTO_BG COLOR_BLUE_LT 658 #define COLOR_HISTO_RG COLOR_YELLOW 659 #define COLOR_HISTO_RB 0x66 660 #define COLOR_HISTO_RB_PLAY 0xE2 661 #define COLOR_HISTO_B_PLAY 0xCC 662 #define COLOR_HISTO_BG_PLAY 0x99 663 #define COLOR_HISTO_RG_PLAY 0x66 664 #undef SCREEN_COLOR 665 #define SCREEN_COLOR 0x1D 700 666 701 667 #elif CAM_BITMAP_PALETTE==13 702 668 703 // Used by :- A3000IS 704 705 #define COLOR_TRANSPARENT 0x00 706 #define COLOR_WHITE 0x01 707 #define COLOR_RED 0x22 708 #define COLOR_GREY 0xF3 709 #define COLOR_GREEN 0xcF 710 #define COLOR_BLUE_LT 0x61 711 #define COLOR_BLUE 0xE7 712 #define COLOR_YELLOW 0xDD 713 #define COLOR_BLACK 0xFF 714 #define COLOR_BG 0x0F 715 #define COLOR_FG COLOR_WHITE 716 #define COLOR_SELECTED_BG COLOR_RED 717 #define COLOR_SELECTED_FG COLOR_GREY 718 #define COLOR_ALT_BG 0xf0 719 #define COLOR_SPLASH_RED COLOR_RED 720 #define COLOR_SPLASH_PINK 0x4E 721 #define COLOR_SPLASH_GREY 0x6F 722 // colors for blended histo 723 #define COLOR_HISTO_R COLOR_RED 724 #define COLOR_HISTO_R_PLAY COLOR_RED 725 #define COLOR_HISTO_B COLOR_BLUE 726 #define COLOR_HISTO_G COLOR_GREEN 727 #define COLOR_HISTO_G_PLAY COLOR_GREEN 728 #define COLOR_HISTO_BG COLOR_BLUE_LT 729 #define COLOR_HISTO_RG COLOR_YELLOW 730 #define COLOR_HISTO_RB COLOR_RED 731 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 732 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B 733 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 734 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 735 736 // Used by :- A3300IS 737 #elif CAM_BITMAP_PALETTE==14 738 739 #define COLOR_TRANS 0x4C 740 #define COLOR_WHITE 0x01 741 #define COLOR_RED 0x6C 742 #define COLOR_GREY 0x1D 743 #define COLOR_GREEN 0x5A 744 #define COLOR_BLUE_LT 0x58 745 #define COLOR_BLUE 0x6D 746 #define COLOR_YELLOW 0x51 747 #define COLOR_BG COLOR_TRANS 748 #define COLOR_FG COLOR_WHITE 749 #define COLOR_SELECTED_BG COLOR_RED 750 #define COLOR_SELECTED_FG COLOR_WHITE 751 #define COLOR_ALT_BG COLOR_TRANS 752 #define COLOR_SPLASH_RED COLOR_RED 753 #define COLOR_SPLASH_PINK COLOR_YELLOW 754 #define COLOR_SPLASH_GREY COLOR_GREY 755 // colors for blended histo 756 #define COLOR_HISTO_R COLOR_RED 757 #define COLOR_HISTO_R_PLAY 0x9F 758 #define COLOR_HISTO_B COLOR_BLUE 759 #define COLOR_HISTO_G COLOR_GREEN 760 #define COLOR_HISTO_G_PLAY 0xA0 761 #define COLOR_HISTO_BG COLOR_BLUE_LT 762 #define COLOR_HISTO_RG COLOR_YELLOW 763 #define COLOR_HISTO_RB 0x66 764 #define COLOR_HISTO_RB_PLAY 0x9F 765 #define COLOR_HISTO_B_PLAY 0xA1 766 #define COLOR_HISTO_BG_PLAY 0xA0 767 #define COLOR_HISTO_RG_PLAY 0x9F 768 #undef SCREEN_COLOR 769 #define SCREEN_COLOR 0x4C 669 // Used by :- G12, SX30, SX40HS, IXUS310_ELPH500HS 670 671 // Default Canon colors 672 #define COLOR_WHITE 0x01 673 #define COLOR_GREY_DK 0x1a 674 #define COLOR_GREY 0x16 675 #define COLOR_GREY_LT 0x0E 676 #undef SCREEN_COLOR 677 #define SCREEN_COLOR 0x1D 678 679 // CHDK colors loaded into these locations in the camera palette by load_chdk_palette() 680 #define COLOR_RED (CHDK_COLOR_BASE+0) 681 #define COLOR_RED_DK (CHDK_COLOR_BASE+1) 682 #define COLOR_RED_LT (CHDK_COLOR_BASE+2) 683 #define COLOR_GREEN (CHDK_COLOR_BASE+3) 684 #define COLOR_GREEN_DK (CHDK_COLOR_BASE+4) 685 #define COLOR_GREEN_LT (CHDK_COLOR_BASE+5) 686 #define COLOR_BLUE (CHDK_COLOR_BASE+6) 687 #define COLOR_BLUE_DK (CHDK_COLOR_BASE+7) 688 #define COLOR_BLUE_LT (CHDK_COLOR_BASE+8) 689 #define COLOR_MAGENTA (CHDK_COLOR_BASE+9) 690 #define COLOR_YELLOW (CHDK_COLOR_BASE+10) 691 #define COLOR_YELLOW_DK (CHDK_COLOR_BASE+11) 692 #define COLOR_YELLOW_LT (CHDK_COLOR_BASE+12) 693 694 #define COLOR_CYAN COLOR_BLUE_LT 695 #define COLOR_BG COLOR_GREY_DK 696 #define COLOR_FG COLOR_WHITE 697 #define COLOR_SELECTED_BG COLOR_GREY_LT 698 #define COLOR_SELECTED_FG COLOR_BLACK 699 #define COLOR_ALT_BG COLOR_BG 700 701 #define COLOR_SPLASH_RED COLOR_RED_DK 702 #define COLOR_SPLASH_PINK COLOR_RED_LT 703 #define COLOR_SPLASH_GREY COLOR_GREY_LT 704 705 #define COLOR_HISTO_R COLOR_RED 706 #define COLOR_HISTO_R_PLAY COLOR_RED 707 #define COLOR_HISTO_B COLOR_BLUE 708 #define COLOR_HISTO_B_PLAY COLOR_BLUE 709 #define COLOR_HISTO_G COLOR_GREEN 710 #define COLOR_HISTO_G_PLAY COLOR_GREEN 711 #define COLOR_HISTO_BG COLOR_CYAN 712 #define COLOR_HISTO_BG_PLAY COLOR_CYAN 713 #define COLOR_HISTO_RG COLOR_YELLOW 714 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 715 #define COLOR_HISTO_RB COLOR_MAGENTA 716 #define COLOR_HISTO_RB_PLAY COLOR_MAGENTA 770 717 771 718 // Icon colors … … 773 720 // Separate definitions for record and playback mode 774 721 // to cater for cameras with variable palettes 775 // Record mode colors 776 #define COLOR_ICON_REC_RED COLOR_RED 777 #define COLOR_ICON_REC_RED_DK COLOR_RED 778 #define COLOR_ICON_REC_RED_LT COLOR_RED 779 #define COLOR_ICON_REC_GREEN 0x90 780 #define COLOR_ICON_REC_GREEN_DK COLOR_GREEN 781 #define COLOR_ICON_REC_GREEN_LT 0x50 782 #define COLOR_ICON_REC_YELLOW 0x6B 783 #define COLOR_ICON_REC_YELLOW_DK COLOR_YELLOW 784 #define COLOR_ICON_REC_YELLOW_LT 0x6B 785 #define COLOR_ICON_REC_GREY COLOR_GREY 786 #define COLOR_ICON_REC_GREY_DK COLOR_GREY 787 #define COLOR_ICON_REC_GREY_LT 0x13 788 // Playback mode colors 789 #define COLOR_ICON_PLY_RED 0x9F 790 #define COLOR_ICON_PLY_RED_DK 0x9F 791 #define COLOR_ICON_PLY_RED_LT 0x9F 792 #define COLOR_ICON_PLY_GREEN 0xA0 793 #define COLOR_ICON_PLY_GREEN_DK 0xA0 794 #define COLOR_ICON_PLY_GREEN_LT 0x9E 795 #define COLOR_ICON_PLY_YELLOW 0x92 796 #define COLOR_ICON_PLY_YELLOW_DK 0x92 797 #define COLOR_ICON_PLY_YELLOW_LT 0x90 798 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 799 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 800 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 801 722 #define COLOR_ICON_REC_RED COLOR_RED 723 #define COLOR_ICON_REC_RED_DK COLOR_RED_DK 724 #define COLOR_ICON_REC_RED_LT COLOR_RED_LT 725 #define COLOR_ICON_REC_GREEN COLOR_GREEN 726 #define COLOR_ICON_REC_GREEN_DK COLOR_GREEN_DK 727 #define COLOR_ICON_REC_GREEN_LT COLOR_GREEN_LT 728 #define COLOR_ICON_REC_YELLOW COLOR_YELLOW 729 #define COLOR_ICON_REC_YELLOW_DK COLOR_YELLOW_DK 730 #define COLOR_ICON_REC_YELLOW_LT COLOR_YELLOW_LT 731 #define COLOR_ICON_REC_GREY COLOR_GREY 732 #define COLOR_ICON_REC_GREY_DK COLOR_GREY_DK 733 #define COLOR_ICON_REC_GREY_LT COLOR_GREY_LT 734 735 #elif CAM_BITMAP_PALETTE==14 736 737 // Used by :- A3000IS 738 739 #define COLOR_TRANSPARENT 0x00 740 #define COLOR_WHITE 0x01 741 #define COLOR_RED 0x22 742 #define COLOR_GREY 0xF3 743 #define COLOR_GREEN 0xcF 744 #define COLOR_BLUE_LT 0x61 745 #define COLOR_BLUE 0xE7 746 #define COLOR_YELLOW 0xDD 747 #define COLOR_BG 0x0F 748 #define COLOR_FG COLOR_WHITE 749 #define COLOR_SELECTED_BG COLOR_RED 750 #define COLOR_SELECTED_FG COLOR_GREY 751 #define COLOR_ALT_BG 0xf0 752 #define COLOR_SPLASH_RED COLOR_RED 753 #define COLOR_SPLASH_PINK 0x4E 754 #define COLOR_SPLASH_GREY 0x6F 755 // colors for blended histo 756 #define COLOR_HISTO_R COLOR_RED 757 #define COLOR_HISTO_R_PLAY COLOR_RED 758 #define COLOR_HISTO_B COLOR_BLUE 759 #define COLOR_HISTO_G COLOR_GREEN 760 #define COLOR_HISTO_G_PLAY COLOR_GREEN 761 #define COLOR_HISTO_BG COLOR_BLUE_LT 762 #define COLOR_HISTO_RG COLOR_YELLOW 763 #define COLOR_HISTO_RB COLOR_RED 764 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB 765 #define COLOR_HISTO_B_PLAY COLOR_HISTO_B 766 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 767 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 768 769 #elif CAM_BITMAP_PALETTE==15 770 771 // Used by :- A3300IS 772 773 #define COLOR_TRANS 0x4C 774 #define COLOR_WHITE 0x01 775 #define COLOR_RED 0x6C 776 #define COLOR_GREY 0x1D 777 #define COLOR_GREEN 0x5A 778 #define COLOR_BLUE_LT 0x58 779 #define COLOR_BLUE 0x6D 780 #define COLOR_YELLOW 0x51 781 #define COLOR_BG COLOR_TRANS 782 #define COLOR_FG COLOR_WHITE 783 #define COLOR_SELECTED_BG COLOR_RED 784 #define COLOR_SELECTED_FG COLOR_WHITE 785 #define COLOR_ALT_BG COLOR_TRANS 786 #define COLOR_SPLASH_RED COLOR_RED 787 #define COLOR_SPLASH_PINK COLOR_YELLOW 788 #define COLOR_SPLASH_GREY COLOR_GREY 789 // colors for blended histo 790 #define COLOR_HISTO_R COLOR_RED 791 #define COLOR_HISTO_R_PLAY 0x9F 792 #define COLOR_HISTO_B COLOR_BLUE 793 #define COLOR_HISTO_G COLOR_GREEN 794 #define COLOR_HISTO_G_PLAY 0xA0 795 #define COLOR_HISTO_BG COLOR_BLUE_LT 796 #define COLOR_HISTO_RG COLOR_YELLOW 797 #define COLOR_HISTO_RB 0x66 798 #define COLOR_HISTO_RB_PLAY 0x9F 799 #define COLOR_HISTO_B_PLAY 0xA1 800 #define COLOR_HISTO_BG_PLAY 0xA0 801 #define COLOR_HISTO_RG_PLAY 0x9F 802 #undef SCREEN_COLOR 803 #define SCREEN_COLOR 0x4C 804 805 // Icon colors 806 // 3 shades of Red, Green, Yellow and Grey 807 // Separate definitions for record and playback mode 808 // to cater for cameras with variable palettes 809 // Record mode colors 810 #define COLOR_ICON_REC_RED COLOR_RED 811 #define COLOR_ICON_REC_RED_DK COLOR_RED 812 #define COLOR_ICON_REC_RED_LT COLOR_RED 813 #define COLOR_ICON_REC_GREEN 0x90 814 #define COLOR_ICON_REC_GREEN_DK COLOR_GREEN 815 #define COLOR_ICON_REC_GREEN_LT 0x50 816 #define COLOR_ICON_REC_YELLOW 0x6B 817 #define COLOR_ICON_REC_YELLOW_DK COLOR_YELLOW 818 #define COLOR_ICON_REC_YELLOW_LT 0x6B 819 #define COLOR_ICON_REC_GREY COLOR_GREY 820 #define COLOR_ICON_REC_GREY_DK COLOR_GREY 821 #define COLOR_ICON_REC_GREY_LT 0x13 822 // Playback mode colors 823 #define COLOR_ICON_PLY_RED 0x9F 824 #define COLOR_ICON_PLY_RED_DK 0x9F 825 #define COLOR_ICON_PLY_RED_LT 0x9F 826 #define COLOR_ICON_PLY_GREEN 0xA0 827 #define COLOR_ICON_PLY_GREEN_DK 0xA0 828 #define COLOR_ICON_PLY_GREEN_LT 0x9E 829 #define COLOR_ICON_PLY_YELLOW 0x92 830 #define COLOR_ICON_PLY_YELLOW_DK 0x92 831 #define COLOR_ICON_PLY_YELLOW_LT 0x90 832 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 833 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 834 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 802 835 803 836 #else 804 #error CAM_BITMAP_PALETTE not defined837 #error CAM_BITMAP_PALETTE not defined 805 838 #endif 806 839 … … 809 842 // Separate definitions for record and playback mode 810 843 // to cater for cameras with variable palettes 811 #if !defined(COLOR_ICON_REC_RED) 812 #define COLOR_ICON_REC_RED0x22813 #define COLOR_ICON_REC_RED_DK0x2F814 #define COLOR_ICON_REC_RED_LT0x26815 #define COLOR_ICON_REC_GREEN0x5F816 #define COLOR_ICON_REC_GREEN_DK0x25817 #define COLOR_ICON_REC_GREEN_LT0x51818 #define COLOR_ICON_REC_YELLOW0x6F819 #define COLOR_ICON_REC_YELLOW_DK0x6F820 #define COLOR_ICON_REC_YELLOW_LT0x66821 #define COLOR_ICON_REC_GREYCOLOR_GREY822 #define COLOR_ICON_REC_GREY_DK0x33823 #define COLOR_ICON_REC_GREY_LT0x13824 #endif 825 #if !defined(COLOR_ICON_PLY_RED) 826 #define COLOR_ICON_PLY_REDCOLOR_ICON_REC_RED827 #define COLOR_ICON_PLY_RED_DKCOLOR_ICON_REC_RED_DK828 #define COLOR_ICON_PLY_RED_LTCOLOR_ICON_REC_RED_LT829 #define COLOR_ICON_PLY_GREENCOLOR_ICON_REC_GREEN830 #define COLOR_ICON_PLY_GREEN_DKCOLOR_ICON_REC_GREEN_DK831 #define COLOR_ICON_PLY_GREEN_LTCOLOR_ICON_REC_GREEN_LT832 #define COLOR_ICON_PLY_YELLOWCOLOR_ICON_REC_YELLOW833 #define COLOR_ICON_PLY_YELLOW_DKCOLOR_ICON_REC_YELLOW_DK834 #define COLOR_ICON_PLY_YELLOW_LTCOLOR_ICON_REC_YELLOW_LT835 #define COLOR_ICON_PLY_GREYCOLOR_ICON_REC_GREY836 #define COLOR_ICON_PLY_GREY_DKCOLOR_ICON_REC_GREY_DK837 #define COLOR_ICON_PLY_GREY_LTCOLOR_ICON_REC_GREY_LT844 #if !defined(COLOR_ICON_REC_RED) // Record mode colors 845 #define COLOR_ICON_REC_RED 0x22 846 #define COLOR_ICON_REC_RED_DK 0x2F 847 #define COLOR_ICON_REC_RED_LT 0x26 848 #define COLOR_ICON_REC_GREEN 0x5F 849 #define COLOR_ICON_REC_GREEN_DK 0x25 850 #define COLOR_ICON_REC_GREEN_LT 0x51 851 #define COLOR_ICON_REC_YELLOW 0x6F 852 #define COLOR_ICON_REC_YELLOW_DK 0x6F 853 #define COLOR_ICON_REC_YELLOW_LT 0x66 854 #define COLOR_ICON_REC_GREY COLOR_GREY 855 #define COLOR_ICON_REC_GREY_DK 0x33 856 #define COLOR_ICON_REC_GREY_LT 0x13 857 #endif 858 #if !defined(COLOR_ICON_PLY_RED) // Playback mode colors 859 #define COLOR_ICON_PLY_RED COLOR_ICON_REC_RED 860 #define COLOR_ICON_PLY_RED_DK COLOR_ICON_REC_RED_DK 861 #define COLOR_ICON_PLY_RED_LT COLOR_ICON_REC_RED_LT 862 #define COLOR_ICON_PLY_GREEN COLOR_ICON_REC_GREEN 863 #define COLOR_ICON_PLY_GREEN_DK COLOR_ICON_REC_GREEN_DK 864 #define COLOR_ICON_PLY_GREEN_LT COLOR_ICON_REC_GREEN_LT 865 #define COLOR_ICON_PLY_YELLOW COLOR_ICON_REC_YELLOW 866 #define COLOR_ICON_PLY_YELLOW_DK COLOR_ICON_REC_YELLOW_DK 867 #define COLOR_ICON_PLY_YELLOW_LT COLOR_ICON_REC_YELLOW_LT 868 #define COLOR_ICON_PLY_GREY COLOR_ICON_REC_GREY 869 #define COLOR_ICON_PLY_GREY_DK COLOR_ICON_REC_GREY_DK 870 #define COLOR_ICON_PLY_GREY_LT COLOR_ICON_REC_GREY_LT 838 871 #endif 839 872 -
trunk/include/platform.h
r1679 r1681 623 623 unsigned char SetFileAttributes(const char* fn, unsigned char attr); 624 624 625 #ifdef CAM_HAS_GPS 626 void GPS_UpdateData(); 627 extern char * camera_jpeg_current_filename(); 628 extern char * camera_jpeg_current_latitude(); 629 extern char * camera_jpeg_current_longitude(); 630 extern char * camera_jpeg_current_height(); 625 631 #endif 626 632 … … 637 643 #endif 638 644 645 #endif 646 -
trunk/platform/a1100/platform_camera.h
r1658 r1681 50 50 // color 51 51 #undef CAM_BITMAP_PALETTE 52 #define CAM_BITMAP_PALETTE 1 052 #define CAM_BITMAP_PALETTE 12 53 53 54 54 #define CAM_DNG_LENS_INFO { 62,10, 248,10, 27,10, 56,10 } // See comments in camera.h -
trunk/platform/a3000/platform_camera.h
r1656 r1681 55 55 56 56 #undef CAM_BITMAP_PALETTE 57 #define CAM_BITMAP_PALETTE 1 357 #define CAM_BITMAP_PALETTE 14 58 58 59 59 #undef CAM_HAS_MANUAL_FOCUS -
trunk/platform/a3300/platform_camera.h
r1663 r1681 85 85 86 86 #undef CAM_BITMAP_PALETTE 87 #define CAM_BITMAP_PALETTE 1 487 #define CAM_BITMAP_PALETTE 15 88 88 89 89 #define CHDK_COLOR_BASE 0x1D // Start color index for CHDK colors loaded into camera palette. -
trunk/platform/a470/wrappers.c
r977 r1681 8 8 long lens_get_focus_pos_from_lens() 9 9 { 10 return _GetCurrentTargetDistance(); 11 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 12 11 } 13 12 -
trunk/platform/g11/wrappers.c
r1376 r1681 15 15 long lens_get_target_distance() 16 16 { 17 18 //ERR99: TODO G11 19 //return _GetCurrentTargetDistance(); 20 return 0; 17 18 return _GetCurrentTargetDistance(); 21 19 } 22 23 -
trunk/platform/g12/platform_camera.h
r1663 r1681 62 62 63 63 #undef CAM_BITMAP_PALETTE 64 #define CAM_BITMAP_PALETTE 1 264 #define CAM_BITMAP_PALETTE 13 65 65 66 66 #undef CAM_USES_ASPECT_CORRECTION -
trunk/platform/generic/wrappers.c
r1661 r1681 810 810 #endif 811 811 } 812 812 813 813 void GetMemInfo(cam_meminfo *camera_meminfo) 814 814 { -
trunk/platform/ixus100_sd780/wrappers.c
r1665 r1681 3 3 long lens_get_focus_pos() 4 4 { 5 //return _GetFocusLensSubjectDistance(); // returns plaintext, calls GetCurrentTargetDistance to get value 6 return _GetCurrentTargetDistance(); 5 return _GetFocusLensSubjectDistance(); 7 6 } 8 7 9 8 long lens_get_focus_pos_from_lens() 10 9 { 11 return _GetCurrentTargetDistance(); 12 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 13 11 } 14 12 -
trunk/platform/ixus120_sd940/wrappers.c
r1154 r1681 3 3 long lens_get_focus_pos() 4 4 { 5 //return _GetFocusLensSubjectDistance(); // returns plaintext, calls GetCurrentTargetDistance to get value 6 return _GetCurrentTargetDistance(); 5 return _GetFocusLensSubjectDistance(); 7 6 } 8 7 9 8 long lens_get_focus_pos_from_lens() 10 9 { 11 return _GetCurrentTargetDistance(); 12 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 13 11 } 14 12 -
trunk/platform/ixus200_sd980/wrappers.c
r1212 r1681 3 3 long lens_get_focus_pos() 4 4 { 5 //return _GetFocusLensSubjectDistance(); // returns plaintext, calls GetCurrentTargetDistance to get value 6 return _GetCurrentTargetDistance(); 5 return _GetFocusLensSubjectDistance(); 7 6 } 8 7 9 8 long lens_get_focus_pos_from_lens() 10 9 { 11 return _GetCurrentTargetDistance(); 12 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 13 11 } 14 12 -
trunk/platform/ixus220_elph300hs/platform_camera.h
r1675 r1681 67 67 #define CAM_EXT_TV_RANGE 1 68 68 #undef CAM_BITMAP_PALETTE 69 #define CAM_BITMAP_PALETTE 969 #define CAM_BITMAP_PALETTE 10 70 70 #undef CAM_HAS_ERASE_BUTTON 71 71 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 -
trunk/platform/ixus230_elph310hs/platform_camera.h
r1658 r1681 74 74 75 75 #undef CAM_BITMAP_PALETTE 76 #define CAM_BITMAP_PALETTE 976 #define CAM_BITMAP_PALETTE 10 77 77 78 78 #undef EDGE_HMARGIN -
trunk/platform/ixus310_elph500hs/platform_camera.h
r1663 r1681 78 78 79 79 #undef CAM_BITMAP_PALETTE 80 #define CAM_BITMAP_PALETTE 1 280 #define CAM_BITMAP_PALETTE 13 81 81 82 82 #undef CAM_USES_ASPECT_CORRECTION -
trunk/platform/ixus80_sd1100/wrappers.c
r842 r1681 8 8 long lens_get_focus_pos_from_lens() 9 9 { 10 return _GetCurrentTargetDistance(); 11 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 12 11 } 13 12 -
trunk/platform/ixus85_sd770/wrappers.c
r1376 r1681 8 8 long lens_get_focus_pos_from_lens() 9 9 { 10 return _GetCurrentTargetDistance(); 11 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 12 11 } 13 12 -
trunk/platform/ixus860_sd870/wrappers.c
r842 r1681 8 8 long lens_get_focus_pos_from_lens() 9 9 { 10 return _GetCurrentTargetDistance(); 11 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 12 11 } 13 12 -
trunk/platform/ixus870_sd880/platform_camera.h
r1656 r1681 28 28 29 29 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 30 #define CAM_BITMAP_PALETTE 131 30 #define CAM_BRACKETING 1 // XXX 32 31 #define CAM_CAN_SD_OVER_NOT_IN_MF 1 -
trunk/platform/ixus870_sd880/wrappers.c
r842 r1681 3 3 long lens_get_focus_pos() 4 4 { 5 //return _GetFocusLensSubjectDistance(); // returns plaintext, calls GetCurrentTargetDistance to get value 6 return _GetCurrentTargetDistance(); 5 return _GetFocusLensSubjectDistance(); 7 6 } 8 7 9 8 long lens_get_focus_pos_from_lens() 10 9 { 11 return _GetCurrentTargetDistance(); 12 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 13 11 } 14 12 -
trunk/platform/ixus90_sd790/wrappers.c
r1376 r1681 8 8 long lens_get_focus_pos_from_lens() 9 9 { 10 return _GetCurrentTargetDistance(); 11 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 12 11 } 13 14 12 15 13 long lens_get_target_distance() -
trunk/platform/ixus95_sd1200/wrappers.c
r1665 r1681 3 3 long lens_get_focus_pos() 4 4 { 5 //return _GetFocusLensSubjectDistance(); // returns plaintext, calls GetCurrentTargetDistance to get value 6 return _GetCurrentTargetDistance(); 5 return _GetFocusLensSubjectDistance(); 7 6 } 8 7 9 8 long lens_get_focus_pos_from_lens() 10 9 { 11 return _GetCurrentTargetDistance(); 12 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 13 11 } 14 12 15 13 long lens_get_target_distance() 16 14 { 17 15 return _GetCurrentTargetDistance(); 18 16 } 19 17 20 //VERIFY_SD780 Only one arg? 21 long OpLog_Get(long i) 22 { 18 long OpLog_Get(long i) 19 { 23 20 extern int _OpLog_Get(int); 24 25 }21 return _OpLog_Get(i); 22 } -
trunk/platform/ixus960_sd950/wrappers.c
r842 r1681 1 1 #include "../generic/wrappers.c" 2 2 3 long lens_get_focus_pos() 3 4 { … … 6 7 long lens_get_focus_pos_from_lens() 7 8 { 8 return _GetCurrentTargetDistance(); 9 //return _GetFocusLensSubjectDistanceFromLens(); 9 return _GetFocusLensSubjectDistanceFromLens(); 10 10 } 11 11 long lens_get_target_distance() -
trunk/platform/ixus970_sd890/wrappers.c
r1377 r1681 8 8 long lens_get_focus_pos_from_lens() 9 9 { 10 return _GetCurrentTargetDistance(); 11 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 12 11 } 13 12 -
trunk/platform/s90/wrappers.c
r1675 r1681 13 13 long lens_get_target_distance() 14 14 { 15 16 //return _GetCurrentTargetDistance(); 17 return 0; 15 return _GetCurrentTargetDistance(); 18 16 } -
trunk/platform/s95/platform_camera.h
r1675 r1681 58 58 59 59 #undef CAM_BITMAP_PALETTE 60 #define CAM_BITMAP_PALETTE 760 #define CAM_BITMAP_PALETTE 9 61 61 62 62 #undef EDGE_HMARGIN -
trunk/platform/sx120is/wrappers.c
r1675 r1681 3 3 long lens_get_focus_pos() 4 4 { 5 //return _GetFocusLensSubjectDistance(); // returns plaintext, calls GetCurrentTargetDistance to get value 6 return _GetCurrentTargetDistance(); 5 return _GetFocusLensSubjectDistance(); 7 6 } 8 7 9 8 long lens_get_focus_pos_from_lens() 10 9 { 11 return _GetCurrentTargetDistance(); 12 //return _GetFocusLensSubjectDistanceFromLens(); 10 return _GetFocusLensSubjectDistanceFromLens(); 13 11 } 14 12 -
trunk/platform/sx220hs/platform_camera.h
r1675 r1681 78 78 79 79 #undef CAM_BITMAP_PALETTE 80 #define CAM_BITMAP_PALETTE 980 #define CAM_BITMAP_PALETTE 10 81 81 #undef CAM_HAS_ERASE_BUTTON 82 82 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 -
trunk/platform/sx230hs/platform_camera.h
r1675 r1681 78 78 79 79 #undef CAM_BITMAP_PALETTE 80 #define CAM_BITMAP_PALETTE 980 #define CAM_BITMAP_PALETTE 10 81 81 #undef CAM_HAS_ERASE_BUTTON 82 82 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 -
trunk/platform/sx230hs/wrappers.c
r1328 r1681 15 15 return _GetCurrentTargetDistance(); 16 16 } 17 18 #ifdef CAM_HAS_GPS 19 void GPS_UpdateData() { 20 _GPS_UpdateData(); 21 } 22 #endif 23 -
trunk/platform/sx30/platform_camera.h
r1663 r1681 93 93 94 94 #undef CAM_BITMAP_PALETTE 95 #define CAM_BITMAP_PALETTE 1 295 #define CAM_BITMAP_PALETTE 13 96 96 97 97 -
trunk/platform/sx40hs/platform_camera.h
r1672 r1681 94 94 95 95 #undef CAM_BITMAP_PALETTE 96 #define CAM_BITMAP_PALETTE 1296 #define CAM_BITMAP_PALETTE 13 97 97 98 98 #undef EDGE_HMARGIN
Note: See TracChangeset
for help on using the changeset viewer.
