Changeset 876 for trunk/core/gui_osd.c

Timestamp:

03/13/10 14:19:04 (3 years ago)

Author:

fe50

Message:

• added new camera: ixus100_sd780 1.00c BETA by HarpoMa?, from ​http://chdk.setepontos.com/index.php/topic,3995.msg47355.html#msg47355
• there's no zebra support in this beta version !
• camera.h & modemaps needs a cleanup

• updated greek language file from ​http://chdk.setepontos.com/index.php/topic,3994.msg47066.html#msg47066 (by peregrine)

File:

• trunk/core/gui_osd.c (modified) (4 diffs)

trunk/core/gui_osd.c

@@ -57 +57 @@
 #define ZEBRA_CANONOSD_BORDER_RESTORE   1
 
-#if defined (CAMERA_sx200is) || defined(CAMERA_g11)
+#if defined (CAMERA_sx200is) || defined(CAMERA_g11) || defined (CAMERA_ixus100_sd780)
   //there are no memory for that (the screen buffer is big): 960x270
   //TODO use a buffer of screen dimensions
@@ -76 +76 @@
 static int timer = 0;
 static unsigned char *buf = NULL;
-#if defined (CAMERA_sx200is) || defined(CAMERA_g11)
+#if defined (CAMERA_sx200is) || defined(CAMERA_g11) || defined (CAMERA_ixus100_sd780)
 static int buffer_size;
 #endif
@@ -241 +241 @@
         if (!buf) {
             timer = 0;
-            #if defined (CAMERA_sx200is) || defined (CAMERA_g11) //nandoide sept-2009
+            #if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) //nandoide sept-2009
                buffer_size=screen_buffer_size-ZEBRA_HMARGIN0*screen_buffer_width;
                buf = malloc(buffer_size);
@@ -372 +372 @@
 // reyalp - TODO this SHOULD NOT BE CAMERA SPECIFIC. Should be generalized to work with all cameras
 // having a copy/paste/modified version for individual cameras will be a maintenance nightmare.
-#if defined (CAMERA_sx200is) || defined (CAMERA_g11)
+#if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780)
 //nandoide sept-2009 
 // viewport is 360x240 and screen buffer 960x270, we need to expand the x coordinate