Menu
▾
▴
[libexif-cvs] libexif/libexif/canon mnote-canon-entry.c,1.11,1.12 mnote-canon-tag.c,1.6,1.7
|
From: Lutz M. <lu...@us...> - 2005-08-24 18:16:00
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3854 Modified Files: mnote-canon-entry.c mnote-canon-tag.c Log Message: Index: mnote-canon-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- mnote-canon-tag.c 22 Aug 2005 22:59:58 -0000 1.6 +++ mnote-canon-tag.c 24 Aug 2005 18:15:52 -0000 1.7 @@ -63,12 +63,17 @@ static struct { {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("Focus type")}, {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("AF point selected")}, {MNOTE_CANON_TAG_SETTINGS_1, 20, N_("Exposure mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 22, N_("Lens type")}, {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Long focal length of lens")}, {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Short focal length of lens")}, {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Focal units per mm")}, + {MNOTE_CANON_TAG_SETTINGS_1, 26, N_("Maximal aperture")}, {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash activity")}, {MNOTE_CANON_TAG_SETTINGS_1, 29, N_("Flash details")}, {MNOTE_CANON_TAG_SETTINGS_1, 32, N_("Focus mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 36, N_("Zoomed resolution")}, + {MNOTE_CANON_TAG_SETTINGS_1, 37, N_("Zoomed resolution base")}, + {MNOTE_CANON_TAG_SETTINGS_1, 42, N_("Color tone")}, {MNOTE_CANON_TAG_SETTINGS_2, 7, N_("White balance")}, {MNOTE_CANON_TAG_SETTINGS_2, 9, N_("Sequence number")}, {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("AF point used")}, Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- mnote-canon-entry.c 24 Aug 2005 17:54:08 -0000 1.11 +++ mnote-canon-entry.c 24 Aug 2005 18:15:52 -0000 1.12 @@ -97,45 +97,96 @@ static struct { {10, 1, N_("medium")}, {10, 2, N_("small")}, {11, 0, N_("full auto")}, - {11, 1, N_("manual")}, - {11, 2, N_("landscape")}, - {11, 3, N_("fast shutter")}, - {11, 4, N_("slow shutter")}, - {11, 5, N_("night")}, - {11, 6, N_("Black & White")}, - {11, 7, N_("Sepia")}, - {11, 8, N_("Portrait")}, - {11, 9, N_("Sports")}, - {11, 10, N_("Macro / Close-Up")}, - {11, 11, N_("Pan Focus")}, - {13, 0xffff, N_("low")}, - {13, 0x0000, N_("normal")}, - {13, 0x0001, N_("high")}, - {14, 0xffff, N_("low")}, - {14, 0x0000, N_("normal")}, - {14, 0x0001, N_("high")}, - {15, 0xffff, N_("low")}, - {15, 0x0000, N_("normal")}, - {15, 0x0001, N_("high")}, - {16, 15, N_("auto")}, - {16, 16, N_("50")}, - {16, 17, N_("100")}, - {16, 18, N_("200")}, - {16, 19, N_("400")}, - {17, 3, N_("evaluative")}, - {17, 4, N_("partial")}, - {17, 5, N_("center-weighted")}, - {19, 0x3000, N_("none (manual focus)")}, - {19, 0x3001, N_("auto-selected")}, - {19, 0x3002, N_("right")}, - {19, 0x3003, N_("center")}, - {19, 0x3004, N_("left")}, - {20, 0, N_("easy shooting")}, - {20, 1, N_("program")}, - {20, 2, N_("Tv-priority")}, - {20, 3, N_("Av-priority")}, - {20, 4, N_("manual")}, - {20, 5, N_("A-DEP")}, + {11, 1, N_("manual")}, + {11, 2, N_("landscape")}, + {11, 3, N_("fast shutter")}, + {11, 4, N_("slow shutter")}, + {11, 5, N_("night")}, + {11, 6, N_("Black & White")}, + {11, 7, N_("Sepia")}, + {11, 8, N_("Portrait")}, + {11, 9, N_("Sports")}, + {11, 10, N_("Macro / Close-Up")}, + {11, 11, N_("Pan Focus")}, + {13, 0xffff, N_("low")}, + {13, 0x0000, N_("normal")}, + {13, 0x0001, N_("high")}, + {14, 0xffff, N_("low")}, + {14, 0x0000, N_("normal")}, + {14, 0x0001, N_("high")}, + {15, 0xffff, N_("low")}, + {15, 0x0000, N_("normal")}, + {15, 0x0001, N_("high")}, + {16, 15, N_("auto")}, + {16, 16, N_("50")}, + {16, 17, N_("100")}, + {16, 18, N_("200")}, + {16, 19, N_("400")}, + {17, 3, N_("evaluative")}, + {17, 4, N_("partial")}, + {17, 5, N_("center-weighted")}, + {19, 0x3000, N_("none (manual focus)")}, + {19, 0x3001, N_("auto-selected")}, + {19, 0x3002, N_("right")}, + {19, 0x3003, N_("center")}, + {19, 0x3004, N_("left")}, + {20, 0, N_("easy shooting")}, + {20, 1, N_("program")}, + {20, 2, N_("Tv-priority")}, + {20, 3, N_("Av-priority")}, + {20, 4, N_("manual")}, + {20, 5, N_("A-DEP")}, + {22, 0x001, N_("Canon EF 50mm f/1.8")}, + {22, 0x002, N_("Canon EF 28mm f/2.8")}, + {22, 0x004, N_("Sigma UC Zoom 35-135mm f/4-5.6")}, + {22, 0x006, N_("Tokina AF193-2 19-35mm f/3.5-4.5")}, + {22, 0x010, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")}, + {22, 0x011, N_("Canon EF 35mm f/2")}, + {22, 0x013, N_("Canon EF 15mm f/2.8")}, + {22, 0x021, N_("Canon EF 80-200mm f/2.8L")}, + {22, 0x026, N_("Cosina 100mm f/3.5 Macro AF")}, + {22, 0x028, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")}, + {22, 0x029, N_("Canon EF 50mm f/1.8 MkII")}, + {22, 0x039, N_("Canon EF 75-300mm f/4-5.6")}, + {22, 0x040, N_("Canon EF 28-80mm f/3.5-5.6")}, + {22, 0x124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")}, + {22, 0x125, N_("Canon TS-E 24mm f/3.5L")}, + {22, 0x131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")}, + {22, 0x135, N_("Canon EF 200mm f/1.8L")}, + {22, 0x136, N_("Canon EF 300mm f/2.8L")}, + {22, 0x139, N_("Canon EF 400mm f/2.8L")}, + {22, 0x141, N_("Canon EF 500mm f/4.5L")}, + {22, 0x149, N_("Canon EF 100mm f/2")}, + {22, 0x150, N_("Sigma 20mm EX f/1.8")}, + {22, 0x151, N_("Canon EF 200mm f/2.8L")}, + {22, 0x153, N_("Canon EF 35-350mm f/3.5-5.6L")}, + {22, 0x155, N_("Canon EF 85mm f/1.8 USM")}, + {22, 0x156, N_("Canon EF 28-105mm f/3.5-4.5 USM")}, + {22, 0x160, N_("Canon EF 20-35mm f/3.5-4.5 USM")}, + {22, 0x161, N_("Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8")}, + {22, 0x165, N_("Canon EF 70-200mm f/2.8 L")}, + {22, 0x166, N_("Canon EF 70-200mm f/2.8 L + x1.4")}, + {22, 0x167, N_("Canon EF 70-200mm f/2.8 L + x2")}, + {22, 0x169, N_("Sigma 15-30mm f/3.5-4.5 EX DG Aspherical")}, + {22, 0x170, N_("Canon EF 200mm f/2.8L II")}, + {22, 0x173, N_("Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5")}, + {22, 0x174, N_("Canon EF 135mm f/2L")}, + {22, 0x176, N_("Canon EF 24-85mm f/3.5-4.5 USM")}, + {22, 0x177, N_("Canon EF 300mm f/4L IS")}, + {22, 0x178, N_("Canon EF 28-135mm f/3.5-5.6 IS")}, + {22, 0x180, N_("Canon EF 35mm f/1.4L")}, + {22, 0x182, N_("Canon EF 100-400mm f/4.5-5.6L IS + x2")}, + {22, 0x183, N_("Canon EF 100-400mm f/4.5-5.6L IS")}, + {22, 0x186, N_("Canon EF 70-200mm f/4L")}, + {22, 0x190, N_("Canon EF 100mm f/2.8 Macro")}, + {22, 0x191, N_("Canon EF 400mm f/4 DO IS")}, + {22, 0x197, N_("Canon EF 75-300mm f/4-5.6 IS")}, + {22, 0x198, N_("Canon EF 50mm f/1.4")}, + {22, 0x202, N_("Canon EF 28-80 f/3.5-5.6 USM IV")}, + {22, 0x213, N_("Canon EF 90-300mm f/4.5-5.6")}, + {22, 0x229, N_("Canon EF 16-35mm f/2.8L")}, + {22, 0x230, N_("Canon EF 24-70mm f/2.8L")}, + {22, 0x231, N_("Canon EF 17-40mm f/4L")}, {32, 0, N_("single")}, {32, 1, N_("continuous")}, { 0, 0, NULL} |
