Changeset 496


Ignore:
Timestamp:
09/01/08 23:49:20 (5 years ago)
Author:
phyrephox
Message:
  • changed Grid readme (thx to anonymous wiki editor)

+ added syscurves.scv to zipfile again (funny i didnt notice that it was missing before!)

  • changed makefile - "copy duplicate" firmware stuff moved to the bottom (is cleaner now, also i hope this "unbreaks" chdk shell by whim)
  • reverted zebra patch from 486 / 0.3.6 for the time being until we figure out another way to use Zebra AND the canon OSD (without flickering) - see ​http://chdk.setepontos.com/index.php/topic,1849.msg20777.html#msg20777 (there might be a patch that is working, however i cannot test it right now)
  • added comment in russian.lng files (they are NOT compatible to juciphox!)
Location:
branches/juciphox
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/juciphox/CHDK/GRIDS/readme.txt

    r469 r496  
    1010All numbers can be either decimal or hex. 
    1111 
    12 find more grids here: http://chdk.wikia.com/wiki/Grids 
     12Find more grids here: http://chdk.wikia.com/wiki/Grids 
     13 
     14 
     15Included are some sample Grid files, these are: 
     16 
     173to2grid.grd 
     18  Match your EVF/LCD display to a 3:2 crop-ratio for prints matching that ratio, 6" x 4" prints. 
     19   
     203to8grid.grd 
     21  <i>(Usage Unknown, I'm not sure why this one was included, perhaps someone else can clarify?)</i> 
     22   
     23golden1.grd 
     24  Compose your subject placement in accordance with the "Golden Ratio". A composition ratio deemed most pleasing to the human-eye. This version is based on "golden-triangles". Place your subject where the two lines meet or aligned along their axes. (This grid may be used in reflections and flips, affording 3 more locations, do it mentally, or edit the grid file to reflect all 4 golden-triangle intersections.) 
     25   
     26golden2.grd 
     27  Same as above, but showing you one more of the 4 total intersection/alignment possibilities. 
     28   
     29id.grd 
     30  This grid is based on ISO/IEC 19794-5:2005 values required for administrative identity photo (passports, identity cards, driving licence...). A large red face shape represent the maximum size accepted, whereas the smaller green shape is the minimal size allowed. A grey area represent where eyes have to be. A vertical axis and two horizontal rulers should help for positioning the subject. The picture afterwards has to be resized to 35 x 45 mm before being printed. The best is to make a composition of 6 (2 lines, 3 rows) photo on a 10 x 13 cm format or 8 (2 lines, 4 rows) photo on a 10x15 format. The reprint should be done by a professional, not by your personnal printer...otherwise it might be refused by the administration staff. 
     31   
     32rulecross.grd 
     33  Fashioned after some aerial-photography and photomicrography grids. Horizontal and vertical rulers bisecting your FOV. Divided horizontally in 4 units of measure and vertically in 3 units of measure. With half and 1/10th unit tic-marks. Small crosshairs in the open areas at 1/2 and 1-unit intervals. May be extremely handy for macro-photography when trying to keep the subject size the same in landscape or portrait orientations. Or when comparing subject size to one another when reframing or refocusing. 
     34   
     35rulers.grd 
     36  As above, but without the crosshairs in the clear areas. 
     37   
     38sports.grd 
     39  A "Sports Finder" grid. This grid was designed around the available image sizes of an "S3 IS" camera. When shooting in highest resolution of "L", 2816 x 2112 pixels, this grid displays the cropping areas as if you were using the "M1" - 2271 x 1704 pixels, the "M2" - 1600 x 1200 pixels, and the "S" - 640 x 480 pixel image sizes. This way you can view the full-frame in the viewfinder, but plan ahead for cropping to one of the other available resolutions. You can then watch for any activity outside of those image-resolution boundaries and be better able to follow any fast action in your viewfinder that might be entering or leaving the final-crop image area. One more pair of lines was included to show the "W" - 2816 x 1584 wide-angle FOV so when planning to crop for that resolution you can still watch for activity above and below your final image area, instead of just blacking out those areas as the camera normally does. It is worth noting, that even a 1600 x 1200 resolution image will still print quite nicely even at 7"x5" print size. For that little-league game this might be just the thing you need for following the action and still having photos to print out for relatives and friends. 
     40   
     41stolen.grd 
     42  Load this grid before putting your camera down and you don't want anyone else to use it. When turning on your camera only the words "STOLEN CAMERA!" will show in the display. The view blacked-out, making subject viewing/framing useless. Unless they know how to turn off CHDK features. :) This is part of an experiment on using CHDK as a theft-deterent. Using this grid combined with an auto-running script file which flashes all your LED lights and triggers all the warning-beep sound-events in your camera, it might be a quite effective way to see/hear if someone is picking up your camera and turning it on without your permission, as well as rendering the camera useless to anyone without CHDK knowledge. 
     43   
     44third_h.grd 
     45  Divides your FOV into 3rds horizontally. Based on the "Rule of Thirds" composition concept. (A simplified version of the "Golden Ratio" concept.) 
     46   
     47third_v.grd 
     48  As above but dividing your FOV into 3rds vertically. 

  • branches/juciphox/CHDK/LANG/russian.lng

    r469 r496  
     1//Note: This russian lang file is actually NOT compatible with the "juciphox" release. Please send us an up-to-date file! 
    12// Êîäîâàÿ ñòðàíèöà Win1251 
    23// CHDK ÿçûêîâîé ôàéë 

  • branches/juciphox/CHDK/LANG/russian_bigfonts.lng

    r469 r496  
     1//Note: This russian lang file is actually NOT compatible with the "juciphox" release. Please send us an up-to-date file! 
    12// Êîäîâàÿ ñòðàíèöà Win1251 
    23// CHDK ÿçûêîâîé ôàéë 

  • branches/juciphox/Makefile

    r495 r496  
    9595        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/SCRIPTS/*  > $(DEVNULL) 
    9696        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/SCRIPTS/examples/*         > $(DEVNULL) 
     97        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/syscurves.CVF      > $(DEVNULL) 
    9798        zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)doc/version.txt  > $(DEVNULL) 
    9899        zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER).zip $(topdir)doc/version.txt  > $(DEVNULL) 
    … …  
    124125batch-zip: version 
    125126        $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub 
    126         cp $(topdir)bin/$(VER)-a610-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a610-100d-$(BUILD_NUMBER).zip 
    127127        $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 
    128128        $(MAKE) -s --no-print-directory PLATFORM=a620 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 
    … …  
    134134        $(MAKE) -s --no-print-directory PLATFORM=s2is PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 
    135135        $(MAKE) -s --no-print-directory PLATFORM=s2is PLATFORMSUB=100g NO_INC_BUILD=1 firzipsub 
    136         cp $(topdir)bin/$(VER)-s2is-100g-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s2is-100i-$(BUILD_NUMBER).zip 
    137136        $(MAKE) -s --no-print-directory PLATFORM=s3is PLATFORMSUB=100a NO_INC_BUILD=1 firzipsub 
    138137        $(MAKE) -s --no-print-directory PLATFORM=g7   PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub 
    … …  
    149148        $(MAKE) -s --no-print-directory PLATFORM=ixus700_sd500   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 
    150149        $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 
    151         cp $(topdir)bin/$(VER)-ixus800_sd700-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus800_sd700-101a-$(BUILD_NUMBER).zip 
    152150        $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700   PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
    153151        $(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800   PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub 
    154         cp $(topdir)bin/$(VER)-ixus850_sd800-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus850_sd800-100d-$(BUILD_NUMBER).zip 
    155152        $(MAKE) -s --no-print-directory PLATFORM=ixus860_sd870   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    156153        $(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub       
    … …  
    164161        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    165162        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 
    166         cp $(topdir)bin/$(VER)-ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus70_sd1000-101a-$(BUILD_NUMBER).zip 
    167163        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=102a NO_INC_BUILD=1 firzipsub 
    168164        #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430     PLATFORMSUB=110a NO_INC_BUILD=1 firzipsub 
    … …  
    184180        $(MAKE) -s --no-print-directory PLATFORM=ixus960_sd950  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub 
    185181        @echo "**** All firmwares created successfully" 
     182        @echo "**** Copying duplicate Firmwares" 
     183        cp $(topdir)bin/$(VER)-a610-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a610-100d-$(BUILD_NUMBER).zip 
     184        cp $(topdir)bin/$(VER)-s2is-100g-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s2is-100i-$(BUILD_NUMBER).zip 
     185        cp $(topdir)bin/$(VER)-ixus800_sd700-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus800_sd700-101a-$(BUILD_NUMBER).zip 
     186        cp $(topdir)bin/$(VER)-ixus850_sd800-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus850_sd800-100d-$(BUILD_NUMBER).zip 
     187        cp $(topdir)bin/$(VER)-ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus70_sd1000-101a-$(BUILD_NUMBER).zip 
     188        @echo "**** Done Copying duplicate Firmwares" 
    186189 
    187190batch-zip-complete: version 
    188191        $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete 
    189         cp $(topdir)bin/a610-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/a610-100d-$(BUILD_NUMBER)-full.zip 
    190         cp $(topdir)bin/a610-100e-$(BUILD_NUMBER).zip $(topdir)bin/a610-100d-$(BUILD_NUMBER).zip 
    191192        $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 
    192193        $(MAKE) -s --no-print-directory PLATFORM=a620 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 
    … …  
    198199        $(MAKE) -s --no-print-directory PLATFORM=s2is PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 
    199200        $(MAKE) -s --no-print-directory PLATFORM=s2is PLATFORMSUB=100g NO_INC_BUILD=1 firzipsubcomplete 
    200         cp $(topdir)bin/s2is-100g-$(BUILD_NUMBER)-full.zip $(topdir)bin/s2is-100i-$(BUILD_NUMBER)-full.zip 
    201         cp $(topdir)bin/s2is-100g-$(BUILD_NUMBER).zip $(topdir)bin/s2is-100i-$(BUILD_NUMBER).zip 
    202201        $(MAKE) -s --no-print-directory PLATFORM=s3is PLATFORMSUB=100a NO_INC_BUILD=1 firzipsubcomplete 
    203202        $(MAKE) -s --no-print-directory PLATFORM=g7   PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete 
    … …  
    214213        $(MAKE) -s --no-print-directory PLATFORM=ixus700_sd500   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsubcomplete 
    215214        $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsubcomplete 
    216         cp $(topdir)bin/ixus800_sd700-101b-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus800_sd700-101a-$(BUILD_NUMBER)-full.zip 
    217         cp $(topdir)bin/ixus800_sd700-101b-$(BUILD_NUMBER).zip $(topdir)bin/ixus800_sd700-101a-$(BUILD_NUMBER).zip 
    218215        $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700   PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
    219216        $(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800   PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete 
    220         cp $(topdir)bin/ixus850_sd800-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus850_sd800-100d-$(BUILD_NUMBER)-full.zip 
    221         cp $(topdir)bin/ixus850_sd800-100e-$(BUILD_NUMBER).zip $(topdir)bin/ixus850_sd800-100d-$(BUILD_NUMBER).zip 
    222217        $(MAKE) -s --no-print-directory PLATFORM=ixus860_sd870   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    223218        $(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete       
    … …  
    231226        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    232227        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsubcomplete 
    233         cp $(topdir)bin/ixus70_sd1000-101b-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus70_sd1000-101a-$(BUILD_NUMBER)-full.zip 
    234         cp $(topdir)bin/ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/ixus70_sd1000-101a-$(BUILD_NUMBER).zip 
    235228        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=102a NO_INC_BUILD=1 firzipsubcomplete 
    236229        #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430     PLATFORMSUB=110a NO_INC_BUILD=1 firzipsubcomplete 
    … …  
    252245        $(MAKE) -s --no-print-directory PLATFORM=ixus960_sd950  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsubcomplete 
    253246        @echo "**** All zipfiles including firmwares and extra stuff created successfully" 
     247        @echo "**** Copying duplicate Firmwares" 
     248        cp $(topdir)bin/a610-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/a610-100d-$(BUILD_NUMBER)-full.zip 
     249        cp $(topdir)bin/a610-100e-$(BUILD_NUMBER).zip $(topdir)bin/a610-100d-$(BUILD_NUMBER).zip 
     250        cp $(topdir)bin/s2is-100g-$(BUILD_NUMBER)-full.zip $(topdir)bin/s2is-100i-$(BUILD_NUMBER)-full.zip 
     251        cp $(topdir)bin/s2is-100g-$(BUILD_NUMBER).zip $(topdir)bin/s2is-100i-$(BUILD_NUMBER).zip 
     252        cp $(topdir)bin/ixus800_sd700-101b-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus800_sd700-101a-$(BUILD_NUMBER)-full.zip 
     253        cp $(topdir)bin/ixus800_sd700-101b-$(BUILD_NUMBER).zip $(topdir)bin/ixus800_sd700-101a-$(BUILD_NUMBER).zip 
     254        cp $(topdir)bin/ixus850_sd800-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus850_sd800-100d-$(BUILD_NUMBER)-full.zip 
     255        cp $(topdir)bin/ixus850_sd800-100e-$(BUILD_NUMBER).zip $(topdir)bin/ixus850_sd800-100d-$(BUILD_NUMBER).zip 
     256        cp $(topdir)bin/ixus70_sd1000-101b-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus70_sd1000-101a-$(BUILD_NUMBER)-full.zip 
     257        cp $(topdir)bin/ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/ixus70_sd1000-101a-$(BUILD_NUMBER).zip 
     258        @echo "**** Done Copying duplicate Firmwares" 
    254259 
    255260 

  • branches/juciphox/core/gui_draw.c

    r486 r496  
    4141//------------------------------------------------------------------- 
    4242void draw_pixel(coord x, coord y, color cl) { 
    43     if (x < 0 || y < 0 || x >= screen_width || y >= screen_height) return; 
     43    if (x >= screen_width || y >= screen_height) return; 
    4444    else { 
    4545        register unsigned int offset = y * screen_buffer_width + x; 
    … …  
    196196    // XXX optimize. probably use 4bit -> 32bit lookup table 
    197197    // so 4(8) pixels were drawn at a time 
    198     for (i=-1; i<=FONT_HEIGHT; i++){ 
    199         for (ii=-1; ii<=FONT_WIDTH; ii++){ 
    200             int inside_box = (i>=0 && i<FONT_HEIGHT && ii>=0 && ii<FONT_WIDTH); 
    201             if(inside_box && sym[i] & (0x80>>ii)) { 
    202                 draw_pixel(x+ii ,y+i, cl&0xff); 
    203             } else { 
    204                 if     (i>0             && (sym[i-1] & (0x80>>ii)))   draw_pixel(x+ii, y+i, COLOR_BLACK); 
    205                 else if(i<FONT_HEIGHT-1 && (sym[i+1] & (0x80>>ii)))   draw_pixel(x+ii, y+i, COLOR_BLACK); 
    206                 else if(ii>0            && (sym[i] & (0x80>>(ii-1)))) draw_pixel(x+ii, y+i, COLOR_BLACK); 
    207                 else if(ii<FONT_WIDTH-1 && (sym[i] & (0x80>>(ii+1)))) draw_pixel(x+ii, y+i, COLOR_BLACK); 
    208                 else if(inside_box && cl>>8!=COLOR_TRANSPARENT)       draw_pixel(x+ii ,y+i, cl>>8); 
    209             } 
     198    for (i=0; i<FONT_HEIGHT; i++){ 
     199        for (ii=0; ii<FONT_WIDTH; ii++){ 
     200            draw_pixel(x+ii ,y+i, (sym[i] & (0x80>>ii))? cl&0xff : cl>>8); 
    210201        } 
    211202    } 

  • branches/juciphox/core/gui_osd.c

    r488 r496  
    5050 
    5151static int step; 
    52 static unsigned char *img_buf, *scr_buf, *cur_buf; 
     52static unsigned char *img_buf, *scr_buf; 
    5353static int timer = 0; 
    5454static char *buf = NULL; 
    … …  
    198198} 
    199199 
    200 int draw_guard_pixel() { 
    201     unsigned char* buffer1 = vid_get_bitmap_fb()+screen_buffer_size/2; 
    202     unsigned char* buffer2 = buffer1+screen_buffer_size; 
    203     int has_disappeared=0; 
    204  
    205     if(*buffer1!=COLOR_GREEN) has_disappeared=1; 
    206     if(*buffer2!=COLOR_GREEN) has_disappeared=2; 
    207     *buffer1 = *buffer2 = COLOR_GREEN; 
    208     return has_disappeared; 
    209 } 
    210  
    211  
    212200//------------------------------------------------------------------- 
    213201static void gui_osd_draw_zebra_osd() { 
    214     color old_osd_color=conf.osd_color; 
    215     conf.osd_color=MAKE_COLOR(COLOR_TRANSPARENT, conf.osd_color); 
    216202    switch (conf.zebra_draw_osd) { 
    217203        case ZEBRA_DRAW_NONE: 
    … …  
    258244            break; 
    259245    } 
    260     conf.osd_color=old_osd_color; 
    261246} 
    262247 
    … …  
    285270        buf = malloc(screen_buffer_size); 
    286271        scr_buf = vid_get_bitmap_fb(); 
    287         cur_buf = malloc(screen_buffer_size); 
    288272    } 
    289273 
    290274    if (buf) { 
    291         if(timer==0) { 
    292             draw_guard_pixel(); 
    293             timer=1; 
    294             return 0; 
    295         } 
    296         if(timer==1) { 
    297             short ready; 
    298             static int n=0; 
    299             get_property_case(PROPCASE_SHOOTING, &ready, 4); 
    300             n=draw_guard_pixel(); 
    301             if(!ready || n==0) return 0; 
    302             if(n==1) memcpy(cur_buf, scr_buf, screen_buffer_size); 
    303             else memcpy(cur_buf, scr_buf+screen_buffer_size, screen_buffer_size); 
    304         } 
    305275        ++timer; 
    306276        img_buf=((mode_get()&MODE_MASK) == MODE_PLAY)?vid_get_viewport_fb_d():vid_get_viewport_fb(); 
    … …  
    317287                break; 
    318288            case ZEBRA_MODE_BLINKED_1: 
    319                 f = timer&1;  
     289                f = timer&2;  
    320290                break; 
    321291            case ZEBRA_MODE_BLINKED_3: 
    322                 f = timer&4;  
     292                f = timer&8;  
    323293                break; 
    324294            case ZEBRA_MODE_BLINKED_2: 
    325295            default: 
    326                 f = timer&2;  
     296                f = timer&4;  
    327297                break; 
    328298        } 
    … …  
    349319                        else if (((conf.zebra_mode == ZEBRA_MODE_ZEBRA_1 || conf.zebra_mode == ZEBRA_MODE_ZEBRA_2) && (y-x-timer)&f)) buf[s]=COLOR_TRANSPARENT; 
    350320                             else buf[s]=(yy>over)?cl_over:(yy<conf.zebra_under)?cl_under:COLOR_TRANSPARENT; 
    351                        if (buf[s] != COLOR_TRANSPARENT && !zebra_drawn) zebra_drawn = 1; 
    352                         if(cur_buf[s]!=COLOR_TRANSPARENT) buf[s]=cur_buf[s]; 
    353                         if(conf.zebra_multichannel && cur_buf[s+1]!=COLOR_TRANSPARENT) buf[s+1]=cur_buf[s+1]; 
     321                        if (buf[s] != COLOR_TRANSPARENT && !zebra_drawn) zebra_drawn = 1; 
    354322                    } 
    355323                    s+=screen_buffer_width-screen_width; 
    … …  
    366334                    draw_restore(); 
    367335                } else { 
    368                     memcpy(buf, cur_buf, screen_buffer_size); 
     336                    memset(buf, COLOR_TRANSPARENT, screen_buffer_size); 
    369337                    gui_osd_draw_zebra_osd(); 
    370338                    memcpy(scr_buf, buf, screen_buffer_size); 
    … …  
    427395//------------------------------------------------------------------- 
    428396void gui_osd_draw_histo() { 
    429     static long old_histo_magnification=0; 
    430397    switch (conf.histo_layout) { 
    431398        case OSD_HISTO_LAYOUT_Y: 
    … …  
    478445    } 
    479446    if ((conf.show_overexp ) && kbd_is_key_pressed(KEY_SHOOT_HALF) && (under_exposed || over_exposed)) 
    480       draw_string(conf.histo_pos.x+HISTO_WIDTH-FONT_WIDTH*3, conf.histo_pos.y-FONT_HEIGHT, "EXP", conf.osd_color); 
     447      draw_string(conf.histo_pos.x+HISTO_WIDTH-FONT_WIDTH*3, conf.histo_pos.y-FONT_HEIGHT, "EXP", conf.histo_color); 
    481448    if (conf.histo_auto_ajust){ 
    482449      if (histo_magnification) { 
    483450        sprintf(osd_buf, " %d.%02dx ", histo_magnification/1000, histo_magnification/10%100); 
    484         draw_string(conf.histo_pos.x, conf.histo_pos.y-FONT_HEIGHT, osd_buf, conf.osd_color); 
     451        draw_string(conf.histo_pos.x, conf.histo_pos.y-FONT_HEIGHT, osd_buf, conf.histo_color); 
    485452      } else if (gui_get_mode()==GUI_MODE_OSD){ 
    486453        draw_string(conf.histo_pos.x, conf.histo_pos.y-FONT_HEIGHT, " 9.99x ", conf.histo_color); 
    487       } else if (old_histo_magnification) { 
     454      } else { 
    488455        draw_filled_rect(conf.histo_pos.x, conf.histo_pos.y-FONT_HEIGHT, conf.histo_pos.x+8*FONT_WIDTH, conf.histo_pos.y-1, MAKE_COLOR(COLOR_TRANSPARENT, COLOR_TRANSPARENT)); 
    489456      } 
    490457    } 
    491     old_histo_magnification=histo_magnification; 
    492458} 
    493459 

  • branches/juciphox/doc/version.txt

    r495 r496  
    55 
    66log 
     7 
     80.4.3 / PP 
     9 
     10* changed Grid readme (thx to anonymous wiki editor) 
     11+ added syscurves.scv to zipfile again (funny i didnt notice that it was missing before!) 
     12* changed makefile - "copy duplicate" firmware stuff moved to the bottom (is cleaner now, also i hope this "unbreaks" chdk shell by whim) 
     13* reverted zebra patch from 486 / 0.3.6 for the time being until we figure out another way to use Zebra AND the canon OSD (without flickering) - see http://chdk.setepontos.com/index.php/topic,1849.msg20777.html#msg20777 (there might be a patch that is working, however i cannot test it right now) 
     14* added comment in russian.lng files (they are NOT compatible to juciphox!) 
    715 
    8160.4.2 / PP 

  • branches/juciphox/version.inc

    r495 r496  
    1 BUILD_NUMBER := 0.4.2 
     1BUILD_NUMBER := 0.4.3 
Note: See TracChangeset for help on using the changeset viewer.