Ignore:
Timestamp:
2017-10-30T22:46:09+01:00 (8 years ago)
Author:
Don-vip
Message:

fix #15505 - update to metadata-extractor 2.10.1

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/com/drew/metadata/exif/makernotes/OlympusMakernoteDirectory.java

    r10862 r13061  
    11/*
    2  * Copyright 2002-2016 Drew Noakes
     2 * Copyright 2002-2017 Drew Noakes
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");
    … …  
    3434 * @author Drew Noakes https://drewnoakes.com
    3535 */
     36@SuppressWarnings("WeakerAccess")
    3637public class OlympusMakernoteDirectory extends Directory
    3738{
    … …  
    117118
    118119    /** Zoom Factor (0 or 1 = normal) */
    119     public static final int TAG_DIGI_ZOOM_RATIO = 0x0204;
     120    public static final int TAG_DIGITAL_ZOOM = 0x0204;
    120121    public static final int TAG_FOCAL_PLANE_DIAGONAL = 0x0205;
    121122    public static final int TAG_LENS_DISTORTION_PARAMETERS = 0x0206;
    122     public static final int TAG_FIRMWARE_VERSION = 0x0207;
     123    public static final int TAG_CAMERA_TYPE = 0x0207;
    123124    public static final int TAG_PICT_INFO = 0x0208;
    124125    public static final int TAG_CAMERA_ID = 0x0209;
    … …  
    146147    public static final int TAG_WHITE_BALANCE_BIAS = 0x0304;
    147148    public static final int TAG_SCENE_MODE = 0x0403;
    148     public static final int TAG_FIRMWARE = 0x0404;
     149    public static final int TAG_SERIAL_NUMBER_1 = 0x0404;
     150    public static final int TAG_FIRMWARE = 0x0405;
    149151
    150152    /**
    … …  
    176178    public static final int TAG_COLOUR_MATRIX = 0x1011;
    177179    public static final int TAG_BLACK_LEVEL = 0x1012;
    178 //    public static final int TAG_ = 0x1013;
    179 //    public static final int TAG_ = 0x1014;
    180     public static final int TAG_WHITE_BALANCE = 0x1015;
     180    public static final int TAG_COLOR_TEMPERATURE_BG = 0x1013;
     181    public static final int TAG_COLOR_TEMPERATURE_RG = 0x1014;
     182    public static final int TAG_WB_MODE = 0x1015;
    181183//    public static final int TAG_ = 0x1016;
    182     public static final int TAG_RED_BIAS = 0x1017;
    183     public static final int TAG_BLUE_BIAS = 0x1018;
     184    public static final int TAG_RED_BALANCE = 0x1017;
     185    public static final int TAG_BLUE_BALANCE = 0x1018;
    184186    public static final int TAG_COLOR_MATRIX_NUMBER = 0x1019;
    185     public static final int TAG_SERIAL_NUMBER = 0x101A;
    186 //    public static final int TAG_ = 0x101B;
    187 //    public static final int TAG_ = 0x101C;
    188 //    public static final int TAG_ = 0x101D;
    189 //    public static final int TAG_ = 0x101E;
    190 //    public static final int TAG_ = 0x101F;
    191 //    public static final int TAG_ = 0x1020;
    192 //    public static final int TAG_ = 0x1021;
    193 //    public static final int TAG_ = 0x1022;
     187    public static final int TAG_SERIAL_NUMBER_2 = 0x101A;
     188
     189    public static final int TAG_EXTERNAL_FLASH_AE1_0 = 0x101B;
     190    public static final int TAG_EXTERNAL_FLASH_AE2_0 = 0x101C;
     191    public static final int TAG_INTERNAL_FLASH_AE1_0 = 0x101D;
     192    public static final int TAG_INTERNAL_FLASH_AE2_0 = 0x101E;
     193    public static final int TAG_EXTERNAL_FLASH_AE1 = 0x101F;
     194    public static final int TAG_EXTERNAL_FLASH_AE2 = 0x1020;
     195    public static final int TAG_INTERNAL_FLASH_AE1 = 0x1021;
     196    public static final int TAG_INTERNAL_FLASH_AE2 = 0x1022;
     197
    194198    public static final int TAG_FLASH_BIAS = 0x1023;
    195 //    public static final int TAG_ = 0x1024;
    196 //    public static final int TAG_ = 0x1025;
     199    public static final int TAG_INTERNAL_FLASH_TABLE = 0x1024;
     200    public static final int TAG_EXTERNAL_FLASH_G_VALUE = 0x1025;
    197201    public static final int TAG_EXTERNAL_FLASH_BOUNCE = 0x1026;
    198202    public static final int TAG_EXTERNAL_FLASH_ZOOM = 0x1027;
    … …  
    203207    public static final int TAG_VALID_BITS = 0x102C;
    204208    public static final int TAG_CORING_FILTER = 0x102D;
    205     public static final int TAG_FINAL_WIDTH = 0x102E;
    206     public static final int TAG_FINAL_HEIGHT = 0x102F;
    207 //    public static final int TAG_ = 0x1030;
    208 //    public static final int TAG_ = 0x1031;
     209    public static final int TAG_OLYMPUS_IMAGE_WIDTH = 0x102E;
     210    public static final int TAG_OLYMPUS_IMAGE_HEIGHT = 0x102F;
     211    public static final int TAG_SCENE_DETECT = 0x1030;
     212    public static final int TAG_SCENE_AREA = 0x1031;
    209213//    public static final int TAG_ = 0x1032;
    210 //    public static final int TAG_ = 0x1033;
     214    public static final int TAG_SCENE_DETECT_DATA = 0x1033;
    211215    public static final int TAG_COMPRESSION_RATIO = 0x1034;
    212     public static final int TAG_THUMBNAIL = 0x1035;
    213     public static final int TAG_THUMBNAIL_OFFSET = 0x1036;
    214     public static final int TAG_THUMBNAIL_LENGTH = 0x1037;
    215 //    public static final int TAG_ = 0x1038;
     216    public static final int TAG_PREVIEW_IMAGE_VALID = 0x1035;
     217    public static final int TAG_PREVIEW_IMAGE_START = 0x1036;
     218    public static final int TAG_PREVIEW_IMAGE_LENGTH = 0x1037;
     219    public static final int TAG_AF_RESULT = 0x1038;
    216220    public static final int TAG_CCD_SCAN_MODE = 0x1039;
    217221    public static final int TAG_NOISE_REDUCTION = 0x103A;
    218222    public static final int TAG_INFINITY_LENS_STEP = 0x103B;
    219223    public static final int TAG_NEAR_LENS_STEP = 0x103C;
     224    public static final int TAG_LIGHT_VALUE_CENTER = 0x103D;
     225    public static final int TAG_LIGHT_VALUE_PERIPHERY = 0x103E;
     226    public static final int TAG_FIELD_COUNT = 0x103F;
    220227    public static final int TAG_EQUIPMENT = 0x2010;
    221228    public static final int TAG_CAMERA_SETTINGS = 0x2020;
    … …  
    225232    public static final int TAG_FOCUS_INFO = 0x2050;
    226233    public static final int TAG_RAW_INFO = 0x3000;
     234    public static final int TAG_MAIN_INFO = 0x4000;
    227235
    228236    public final static class CameraSettings
    … …  
    302310        _tagNameMap.put(TAG_MACRO_MODE, "Macro");
    303311        _tagNameMap.put(TAG_BW_MODE, "BW Mode");
    304         _tagNameMap.put(TAG_DIGI_ZOOM_RATIO, "DigiZoom Ratio");
     312        _tagNameMap.put(TAG_DIGITAL_ZOOM, "Digital Zoom");
    305313        _tagNameMap.put(TAG_FOCAL_PLANE_DIAGONAL, "Focal Plane Diagonal");
    306314        _tagNameMap.put(TAG_LENS_DISTORTION_PARAMETERS, "Lens Distortion Parameters");
    307         _tagNameMap.put(TAG_FIRMWARE_VERSION, "Firmware Version");
     315        _tagNameMap.put(TAG_CAMERA_TYPE, "Camera Type");
    308316        _tagNameMap.put(TAG_PICT_INFO, "Pict Info");
    309317        _tagNameMap.put(TAG_CAMERA_ID, "Camera Id");
    … …  
    318326        _tagNameMap.put(TAG_WHITE_BALANCE_BIAS, "White Balance Bias");
    319327        _tagNameMap.put(TAG_SCENE_MODE, "Scene Mode");
     328        _tagNameMap.put(TAG_SERIAL_NUMBER_1, "Serial Number");
    320329        _tagNameMap.put(TAG_FIRMWARE, "Firmware");
    321330        _tagNameMap.put(TAG_PRINT_IMAGE_MATCHING_INFO, "Print Image Matching (PIM) Info");
    … …  
    341350        _tagNameMap.put(TAG_COLOUR_MATRIX, "Colour Matrix");
    342351        _tagNameMap.put(TAG_BLACK_LEVEL, "Black Level");
    343         _tagNameMap.put(TAG_WHITE_BALANCE, "White Balance");
    344         _tagNameMap.put(TAG_RED_BIAS, "Red Bias");
    345         _tagNameMap.put(TAG_BLUE_BIAS, "Blue Bias");
     352        _tagNameMap.put(TAG_COLOR_TEMPERATURE_BG, "Color Temperature BG");
     353        _tagNameMap.put(TAG_COLOR_TEMPERATURE_RG, "Color Temperature RG");
     354        _tagNameMap.put(TAG_WB_MODE, "White Balance Mode");
     355        _tagNameMap.put(TAG_RED_BALANCE, "Red Balance");
     356        _tagNameMap.put(TAG_BLUE_BALANCE, "Blue Balance");
    346357        _tagNameMap.put(TAG_COLOR_MATRIX_NUMBER, "Color Matrix Number");
    347         _tagNameMap.put(TAG_SERIAL_NUMBER, "Serial Number");
     358        _tagNameMap.put(TAG_SERIAL_NUMBER_2, "Serial Number");
     359        _tagNameMap.put(TAG_EXTERNAL_FLASH_AE1_0, "External Flash AE1 0");
     360        _tagNameMap.put(TAG_EXTERNAL_FLASH_AE2_0, "External Flash AE2 0");
     361        _tagNameMap.put(TAG_INTERNAL_FLASH_AE1_0, "Internal Flash AE1 0");
     362        _tagNameMap.put(TAG_INTERNAL_FLASH_AE2_0, "Internal Flash AE2 0");
     363        _tagNameMap.put(TAG_EXTERNAL_FLASH_AE1, "External Flash AE1");
     364        _tagNameMap.put(TAG_EXTERNAL_FLASH_AE2, "External Flash AE2");
     365        _tagNameMap.put(TAG_INTERNAL_FLASH_AE1, "Internal Flash AE1");
     366        _tagNameMap.put(TAG_INTERNAL_FLASH_AE2, "Internal Flash AE2");
    348367        _tagNameMap.put(TAG_FLASH_BIAS, "Flash Bias");
     368        _tagNameMap.put(TAG_INTERNAL_FLASH_TABLE, "Internal Flash Table");
     369        _tagNameMap.put(TAG_EXTERNAL_FLASH_G_VALUE, "External Flash G Value");
    349370        _tagNameMap.put(TAG_EXTERNAL_FLASH_BOUNCE, "External Flash Bounce");
    350371        _tagNameMap.put(TAG_EXTERNAL_FLASH_ZOOM, "External Flash Zoom");
    … …  
    355376        _tagNameMap.put(TAG_VALID_BITS, "Valid Bits");
    356377        _tagNameMap.put(TAG_CORING_FILTER, "Coring Filter");
    357         _tagNameMap.put(TAG_FINAL_WIDTH, "Final Width");
    358         _tagNameMap.put(TAG_FINAL_HEIGHT, "Final Height");
     378        _tagNameMap.put(TAG_OLYMPUS_IMAGE_WIDTH, "Olympus Image Width");
     379        _tagNameMap.put(TAG_OLYMPUS_IMAGE_HEIGHT, "Olympus Image Height");
     380        _tagNameMap.put(TAG_SCENE_DETECT, "Scene Detect");
     381        _tagNameMap.put(TAG_SCENE_AREA, "Scene Area");
     382        _tagNameMap.put(TAG_SCENE_DETECT_DATA, "Scene Detect Data");
    359383        _tagNameMap.put(TAG_COMPRESSION_RATIO, "Compression Ratio");
    360         _tagNameMap.put(TAG_THUMBNAIL, "Thumbnail");
    361         _tagNameMap.put(TAG_THUMBNAIL_OFFSET, "Thumbnail Offset");
    362         _tagNameMap.put(TAG_THUMBNAIL_LENGTH, "Thumbnail Length");
     384        _tagNameMap.put(TAG_PREVIEW_IMAGE_VALID, "Preview Image Valid");
     385        _tagNameMap.put(TAG_PREVIEW_IMAGE_START, "Preview Image Start");
     386        _tagNameMap.put(TAG_PREVIEW_IMAGE_LENGTH, "Preview Image Length");
     387        _tagNameMap.put(TAG_AF_RESULT, "AF Result");
    363388        _tagNameMap.put(TAG_CCD_SCAN_MODE, "CCD Scan Mode");
    364389        _tagNameMap.put(TAG_NOISE_REDUCTION, "Noise Reduction");
    365390        _tagNameMap.put(TAG_INFINITY_LENS_STEP, "Infinity Lens Step");
    366391        _tagNameMap.put(TAG_NEAR_LENS_STEP, "Near Lens Step");
     392        _tagNameMap.put(TAG_LIGHT_VALUE_CENTER, "Light Value Center");
     393        _tagNameMap.put(TAG_LIGHT_VALUE_PERIPHERY, "Light Value Periphery");
     394        _tagNameMap.put(TAG_FIELD_COUNT, "Field Count");
    367395        _tagNameMap.put(TAG_EQUIPMENT, "Equipment");
    368396        _tagNameMap.put(TAG_CAMERA_SETTINGS, "Camera Settings");
    … …  
    372400        _tagNameMap.put(TAG_FOCUS_INFO, "Focus Info");
    373401        _tagNameMap.put(TAG_RAW_INFO, "Raw Info");
     402        _tagNameMap.put(TAG_MAIN_INFO, "Main Info");
    374403
    375404        _tagNameMap.put(CameraSettings.TAG_EXPOSURE_MODE, "Exposure Mode");
    … …  
    476505        return _tagNameMap;
    477506    }
     507
     508    // <summary>
     509    // These values are currently decoded only for Olympus models.  Models with
     510    // Olympus-style maker notes from other brands such as Acer, BenQ, Hitachi, HP,
     511    // Premier, Konica-Minolta, Maginon, Ricoh, Rollei, SeaLife, Sony, Supra,
     512    // Vivitar are not listed.
     513    // </summary>
     514    // <remarks>
     515    // Converted from Exiftool version 10.33 created by Phil Harvey
     516    // http://www.sno.phy.queensu.ca/~phil/exiftool/
     517    // lib\Image\ExifTool\Olympus.pm
     518    // </remarks>
     519    public static final HashMap<String, String> OlympusCameraTypes = new HashMap<String, String>();
     520
     521    static {
     522        OlympusCameraTypes.put("D4028", "X-2,C-50Z");
     523        OlympusCameraTypes.put("D4029", "E-20,E-20N,E-20P");
     524        OlympusCameraTypes.put("D4034", "C720UZ");
     525        OlympusCameraTypes.put("D4040", "E-1");
     526        OlympusCameraTypes.put("D4041", "E-300");
     527        OlympusCameraTypes.put("D4083", "C2Z,D520Z,C220Z");
     528        OlympusCameraTypes.put("D4106", "u20D,S400D,u400D");
     529        OlympusCameraTypes.put("D4120", "X-1");
     530        OlympusCameraTypes.put("D4122", "u10D,S300D,u300D");
     531        OlympusCameraTypes.put("D4125", "AZ-1");
     532        OlympusCameraTypes.put("D4141", "C150,D390");
     533        OlympusCameraTypes.put("D4193", "C-5000Z");
     534        OlympusCameraTypes.put("D4194", "X-3,C-60Z");
     535        OlympusCameraTypes.put("D4199", "u30D,S410D,u410D");
     536        OlympusCameraTypes.put("D4205", "X450,D535Z,C370Z");
     537        OlympusCameraTypes.put("D4210", "C160,D395");
     538        OlympusCameraTypes.put("D4211", "C725UZ");
     539        OlympusCameraTypes.put("D4213", "FerrariMODEL2003");
     540        OlympusCameraTypes.put("D4216", "u15D");
     541        OlympusCameraTypes.put("D4217", "u25D");
     542        OlympusCameraTypes.put("D4220", "u-miniD,Stylus V");
     543        OlympusCameraTypes.put("D4221", "u40D,S500,uD500");
     544        OlympusCameraTypes.put("D4231", "FerrariMODEL2004");
     545        OlympusCameraTypes.put("D4240", "X500,D590Z,C470Z");
     546        OlympusCameraTypes.put("D4244", "uD800,S800");
     547        OlympusCameraTypes.put("D4256", "u720SW,S720SW");
     548        OlympusCameraTypes.put("D4261", "X600,D630,FE5500");
     549        OlympusCameraTypes.put("D4262", "uD600,S600");
     550        OlympusCameraTypes.put("D4301", "u810/S810"); // (yes, "/".  Olympus is not consistent in the notation)
     551        OlympusCameraTypes.put("D4302", "u710,S710");
     552        OlympusCameraTypes.put("D4303", "u700,S700");
     553        OlympusCameraTypes.put("D4304", "FE100,X710");
     554        OlympusCameraTypes.put("D4305", "FE110,X705");
     555        OlympusCameraTypes.put("D4310", "FE-130,X-720");
     556        OlympusCameraTypes.put("D4311", "FE-140,X-725");
     557        OlympusCameraTypes.put("D4312", "FE150,X730");
     558        OlympusCameraTypes.put("D4313", "FE160,X735");
     559        OlympusCameraTypes.put("D4314", "u740,S740");
     560        OlympusCameraTypes.put("D4315", "u750,S750");
     561        OlympusCameraTypes.put("D4316", "u730/S730");
     562        OlympusCameraTypes.put("D4317", "FE115,X715");
     563        OlympusCameraTypes.put("D4321", "SP550UZ");
     564        OlympusCameraTypes.put("D4322", "SP510UZ");
     565        OlympusCameraTypes.put("D4324", "FE170,X760");
     566        OlympusCameraTypes.put("D4326", "FE200");
     567        OlympusCameraTypes.put("D4327", "FE190/X750"); // (also SX876)
     568        OlympusCameraTypes.put("D4328", "u760,S760");
     569        OlympusCameraTypes.put("D4330", "FE180/X745"); // (also SX875)
     570        OlympusCameraTypes.put("D4331", "u1000/S1000");
     571        OlympusCameraTypes.put("D4332", "u770SW,S770SW");
     572        OlympusCameraTypes.put("D4333", "FE240/X795");
     573        OlympusCameraTypes.put("D4334", "FE210,X775");
     574        OlympusCameraTypes.put("D4336", "FE230/X790");
     575        OlympusCameraTypes.put("D4337", "FE220,X785");
     576        OlympusCameraTypes.put("D4338", "u725SW,S725SW");
     577        OlympusCameraTypes.put("D4339", "FE250/X800");
     578        OlympusCameraTypes.put("D4341", "u780,S780");
     579        OlympusCameraTypes.put("D4343", "u790SW,S790SW");
     580        OlympusCameraTypes.put("D4344", "u1020,S1020");
     581        OlympusCameraTypes.put("D4346", "FE15,X10");
     582        OlympusCameraTypes.put("D4348", "FE280,X820,C520");
     583        OlympusCameraTypes.put("D4349", "FE300,X830");
     584        OlympusCameraTypes.put("D4350", "u820,S820");
     585        OlympusCameraTypes.put("D4351", "u1200,S1200");
     586        OlympusCameraTypes.put("D4352", "FE270,X815,C510");
     587        OlympusCameraTypes.put("D4353", "u795SW,S795SW");
     588        OlympusCameraTypes.put("D4354", "u1030SW,S1030SW");
     589        OlympusCameraTypes.put("D4355", "SP560UZ");
     590        OlympusCameraTypes.put("D4356", "u1010,S1010");
     591        OlympusCameraTypes.put("D4357", "u830,S830");
     592        OlympusCameraTypes.put("D4359", "u840,S840");
     593        OlympusCameraTypes.put("D4360", "FE350WIDE,X865");
     594        OlympusCameraTypes.put("D4361", "u850SW,S850SW");
     595        OlympusCameraTypes.put("D4362", "FE340,X855,C560");
     596        OlympusCameraTypes.put("D4363", "FE320,X835,C540");
     597        OlympusCameraTypes.put("D4364", "SP570UZ");
     598        OlympusCameraTypes.put("D4366", "FE330,X845,C550");
     599        OlympusCameraTypes.put("D4368", "FE310,X840,C530");
     600        OlympusCameraTypes.put("D4370", "u1050SW,S1050SW");
     601        OlympusCameraTypes.put("D4371", "u1060,S1060");
     602        OlympusCameraTypes.put("D4372", "FE370,X880,C575");
     603        OlympusCameraTypes.put("D4374", "SP565UZ");
     604        OlympusCameraTypes.put("D4377", "u1040,S1040");
     605        OlympusCameraTypes.put("D4378", "FE360,X875,C570");
     606        OlympusCameraTypes.put("D4379", "FE20,X15,C25");
     607        OlympusCameraTypes.put("D4380", "uT6000,ST6000");
     608        OlympusCameraTypes.put("D4381", "uT8000,ST8000");
     609        OlympusCameraTypes.put("D4382", "u9000,S9000");
     610        OlympusCameraTypes.put("D4384", "SP590UZ");
     611        OlympusCameraTypes.put("D4385", "FE3010,X895");
     612        OlympusCameraTypes.put("D4386", "FE3000,X890");
     613        OlympusCameraTypes.put("D4387", "FE35,X30");
     614        OlympusCameraTypes.put("D4388", "u550WP,S550WP");
     615        OlympusCameraTypes.put("D4390", "FE5000,X905");
     616        OlympusCameraTypes.put("D4391", "u5000");
     617        OlympusCameraTypes.put("D4392", "u7000,S7000");
     618        OlympusCameraTypes.put("D4396", "FE5010,X915");
     619        OlympusCameraTypes.put("D4397", "FE25,X20");
     620        OlympusCameraTypes.put("D4398", "FE45,X40");
     621        OlympusCameraTypes.put("D4401", "XZ-1");
     622        OlympusCameraTypes.put("D4402", "uT6010,ST6010");
     623        OlympusCameraTypes.put("D4406", "u7010,S7010 / u7020,S7020");
     624        OlympusCameraTypes.put("D4407", "FE4010,X930");
     625        OlympusCameraTypes.put("D4408", "X560WP");
     626        OlympusCameraTypes.put("D4409", "FE26,X21");
     627        OlympusCameraTypes.put("D4410", "FE4000,X920,X925");
     628        OlympusCameraTypes.put("D4411", "FE46,X41,X42");
     629        OlympusCameraTypes.put("D4412", "FE5020,X935");
     630        OlympusCameraTypes.put("D4413", "uTough-3000");
     631        OlympusCameraTypes.put("D4414", "StylusTough-6020");
     632        OlympusCameraTypes.put("D4415", "StylusTough-8010");
     633        OlympusCameraTypes.put("D4417", "u5010,S5010");
     634        OlympusCameraTypes.put("D4418", "u7040,S7040");
     635        OlympusCameraTypes.put("D4419", "u9010,S9010");
     636        OlympusCameraTypes.put("D4423", "FE4040");
     637        OlympusCameraTypes.put("D4424", "FE47,X43");
     638        OlympusCameraTypes.put("D4426", "FE4030,X950");
     639        OlympusCameraTypes.put("D4428", "FE5030,X965,X960");
     640        OlympusCameraTypes.put("D4430", "u7030,S7030");
     641        OlympusCameraTypes.put("D4432", "SP600UZ");
     642        OlympusCameraTypes.put("D4434", "SP800UZ");
     643        OlympusCameraTypes.put("D4439", "FE4020,X940");
     644        OlympusCameraTypes.put("D4442", "FE5035");
     645        OlympusCameraTypes.put("D4448", "FE4050,X970");
     646        OlympusCameraTypes.put("D4450", "FE5050,X985");
     647        OlympusCameraTypes.put("D4454", "u-7050");
     648        OlympusCameraTypes.put("D4464", "T10,X27");
     649        OlympusCameraTypes.put("D4470", "FE5040,X980");
     650        OlympusCameraTypes.put("D4472", "TG-310");
     651        OlympusCameraTypes.put("D4474", "TG-610");
     652        OlympusCameraTypes.put("D4476", "TG-810");
     653        OlympusCameraTypes.put("D4478", "VG145,VG140,D715");
     654        OlympusCameraTypes.put("D4479", "VG130,D710");
     655        OlympusCameraTypes.put("D4480", "VG120,D705");
     656        OlympusCameraTypes.put("D4482", "VR310,D720");
     657        OlympusCameraTypes.put("D4484", "VR320,D725");
     658        OlympusCameraTypes.put("D4486", "VR330,D730");
     659        OlympusCameraTypes.put("D4488", "VG110,D700");
     660        OlympusCameraTypes.put("D4490", "SP-610UZ");
     661        OlympusCameraTypes.put("D4492", "SZ-10");
     662        OlympusCameraTypes.put("D4494", "SZ-20");
     663        OlympusCameraTypes.put("D4496", "SZ-30MR");
     664        OlympusCameraTypes.put("D4498", "SP-810UZ");
     665        OlympusCameraTypes.put("D4500", "SZ-11");
     666        OlympusCameraTypes.put("D4504", "TG-615");
     667        OlympusCameraTypes.put("D4508", "TG-620");
     668        OlympusCameraTypes.put("D4510", "TG-820");
     669        OlympusCameraTypes.put("D4512", "TG-1");
     670        OlympusCameraTypes.put("D4516", "SH-21");
     671        OlympusCameraTypes.put("D4519", "SZ-14");
     672        OlympusCameraTypes.put("D4520", "SZ-31MR");
     673        OlympusCameraTypes.put("D4521", "SH-25MR");
     674        OlympusCameraTypes.put("D4523", "SP-720UZ");
     675        OlympusCameraTypes.put("D4529", "VG170");
     676        OlympusCameraTypes.put("D4531", "XZ-2");
     677        OlympusCameraTypes.put("D4535", "SP-620UZ");
     678        OlympusCameraTypes.put("D4536", "TG-320");
     679        OlympusCameraTypes.put("D4537", "VR340,D750");
     680        OlympusCameraTypes.put("D4538", "VG160,X990,D745");
     681        OlympusCameraTypes.put("D4541", "SZ-12");
     682        OlympusCameraTypes.put("D4545", "VH410");
     683        OlympusCameraTypes.put("D4546", "XZ-10"); //IB
     684        OlympusCameraTypes.put("D4547", "TG-2");
     685        OlympusCameraTypes.put("D4548", "TG-830");
     686        OlympusCameraTypes.put("D4549", "TG-630");
     687        OlympusCameraTypes.put("D4550", "SH-50");
     688        OlympusCameraTypes.put("D4553", "SZ-16,DZ-105");
     689        OlympusCameraTypes.put("D4562", "SP-820UZ");
     690        OlympusCameraTypes.put("D4566", "SZ-15");
     691        OlympusCameraTypes.put("D4572", "STYLUS1");
     692        OlympusCameraTypes.put("D4574", "TG-3");
     693        OlympusCameraTypes.put("D4575", "TG-850");
     694        OlympusCameraTypes.put("D4579", "SP-100EE");
     695        OlympusCameraTypes.put("D4580", "SH-60");
     696        OlympusCameraTypes.put("D4581", "SH-1");
     697        OlympusCameraTypes.put("D4582", "TG-835");
     698        OlympusCameraTypes.put("D4585", "SH-2 / SH-3");
     699        OlympusCameraTypes.put("D4586", "TG-4");
     700        OlympusCameraTypes.put("D4587", "TG-860");
     701        OlympusCameraTypes.put("D4591", "TG-870");
     702        OlympusCameraTypes.put("D4809", "C2500L");
     703        OlympusCameraTypes.put("D4842", "E-10");
     704        OlympusCameraTypes.put("D4856", "C-1");
     705        OlympusCameraTypes.put("D4857", "C-1Z,D-150Z");
     706        OlympusCameraTypes.put("DCHC", "D500L");
     707        OlympusCameraTypes.put("DCHT", "D600L / D620L");
     708        OlympusCameraTypes.put("K0055", "AIR-A01");
     709        OlympusCameraTypes.put("S0003", "E-330");
     710        OlympusCameraTypes.put("S0004", "E-500");
     711        OlympusCameraTypes.put("S0009", "E-400");
     712        OlympusCameraTypes.put("S0010", "E-510");
     713        OlympusCameraTypes.put("S0011", "E-3");
     714        OlympusCameraTypes.put("S0013", "E-410");
     715        OlympusCameraTypes.put("S0016", "E-420");
     716        OlympusCameraTypes.put("S0017", "E-30");
     717        OlympusCameraTypes.put("S0018", "E-520");
     718        OlympusCameraTypes.put("S0019", "E-P1");
     719        OlympusCameraTypes.put("S0023", "E-620");
     720        OlympusCameraTypes.put("S0026", "E-P2");
     721        OlympusCameraTypes.put("S0027", "E-PL1");
     722        OlympusCameraTypes.put("S0029", "E-450");
     723        OlympusCameraTypes.put("S0030", "E-600");
     724        OlympusCameraTypes.put("S0032", "E-P3");
     725        OlympusCameraTypes.put("S0033", "E-5");
     726        OlympusCameraTypes.put("S0034", "E-PL2");
     727        OlympusCameraTypes.put("S0036", "E-M5");
     728        OlympusCameraTypes.put("S0038", "E-PL3");
     729        OlympusCameraTypes.put("S0039", "E-PM1");
     730        OlympusCameraTypes.put("S0040", "E-PL1s");
     731        OlympusCameraTypes.put("S0042", "E-PL5");
     732        OlympusCameraTypes.put("S0043", "E-PM2");
     733        OlympusCameraTypes.put("S0044", "E-P5");
     734        OlympusCameraTypes.put("S0045", "E-PL6");
     735        OlympusCameraTypes.put("S0046", "E-PL7"); //IB
     736        OlympusCameraTypes.put("S0047", "E-M1");
     737        OlympusCameraTypes.put("S0051", "E-M10");
     738        OlympusCameraTypes.put("S0052", "E-M5MarkII"); //IB
     739        OlympusCameraTypes.put("S0059", "E-M10MarkII");
     740        OlympusCameraTypes.put("S0061", "PEN-F"); //forum7005
     741        OlympusCameraTypes.put("S0065", "E-PL8");
     742        OlympusCameraTypes.put("S0067", "E-M1MarkII");
     743        OlympusCameraTypes.put("SR45", "D220");
     744        OlympusCameraTypes.put("SR55", "D320L");
     745        OlympusCameraTypes.put("SR83", "D340L");
     746        OlympusCameraTypes.put("SR85", "C830L,D340R");
     747        OlympusCameraTypes.put("SR852", "C860L,D360L");
     748        OlympusCameraTypes.put("SR872", "C900Z,D400Z");
     749        OlympusCameraTypes.put("SR874", "C960Z,D460Z");
     750        OlympusCameraTypes.put("SR951", "C2000Z");
     751        OlympusCameraTypes.put("SR952", "C21");
     752        OlympusCameraTypes.put("SR953", "C21T.commu");
     753        OlympusCameraTypes.put("SR954", "C2020Z");
     754        OlympusCameraTypes.put("SR955", "C990Z,D490Z");
     755        OlympusCameraTypes.put("SR956", "C211Z");
     756        OlympusCameraTypes.put("SR959", "C990ZS,D490Z");
     757        OlympusCameraTypes.put("SR95A", "C2100UZ");
     758        OlympusCameraTypes.put("SR971", "C100,D370");
     759        OlympusCameraTypes.put("SR973", "C2,D230");
     760        OlympusCameraTypes.put("SX151", "E100RS");
     761        OlympusCameraTypes.put("SX351", "C3000Z / C3030Z");
     762        OlympusCameraTypes.put("SX354", "C3040Z");
     763        OlympusCameraTypes.put("SX355", "C2040Z");
     764        OlympusCameraTypes.put("SX357", "C700UZ");
     765        OlympusCameraTypes.put("SX358", "C200Z,D510Z");
     766        OlympusCameraTypes.put("SX374", "C3100Z,C3020Z");
     767        OlympusCameraTypes.put("SX552", "C4040Z");
     768        OlympusCameraTypes.put("SX553", "C40Z,D40Z");
     769        OlympusCameraTypes.put("SX556", "C730UZ");
     770        OlympusCameraTypes.put("SX558", "C5050Z");
     771        OlympusCameraTypes.put("SX571", "C120,D380");
     772        OlympusCameraTypes.put("SX574", "C300Z,D550Z");
     773        OlympusCameraTypes.put("SX575", "C4100Z,C4000Z");
     774        OlympusCameraTypes.put("SX751", "X200,D560Z,C350Z");
     775        OlympusCameraTypes.put("SX752", "X300,D565Z,C450Z");
     776        OlympusCameraTypes.put("SX753", "C750UZ");
     777        OlympusCameraTypes.put("SX754", "C740UZ");
     778        OlympusCameraTypes.put("SX755", "C755UZ");
     779        OlympusCameraTypes.put("SX756", "C5060WZ");
     780        OlympusCameraTypes.put("SX757", "C8080WZ");
     781        OlympusCameraTypes.put("SX758", "X350,D575Z,C360Z");
     782        OlympusCameraTypes.put("SX759", "X400,D580Z,C460Z");
     783        OlympusCameraTypes.put("SX75A", "AZ-2ZOOM");
     784        OlympusCameraTypes.put("SX75B", "D595Z,C500Z");
     785        OlympusCameraTypes.put("SX75C", "X550,D545Z,C480Z");
     786        OlympusCameraTypes.put("SX75D", "IR-300");
     787        OlympusCameraTypes.put("SX75F", "C55Z,C5500Z");
     788        OlympusCameraTypes.put("SX75G", "C170,D425");
     789        OlympusCameraTypes.put("SX75J", "C180,D435");
     790        OlympusCameraTypes.put("SX771", "C760UZ");
     791        OlympusCameraTypes.put("SX772", "C770UZ");
     792        OlympusCameraTypes.put("SX773", "C745UZ");
     793        OlympusCameraTypes.put("SX774", "X250,D560Z,C350Z");
     794        OlympusCameraTypes.put("SX775", "X100,D540Z,C310Z");
     795        OlympusCameraTypes.put("SX776", "C460ZdelSol");
     796        OlympusCameraTypes.put("SX777", "C765UZ");
     797        OlympusCameraTypes.put("SX77A", "D555Z,C315Z");
     798        OlympusCameraTypes.put("SX851", "C7070WZ");
     799        OlympusCameraTypes.put("SX852", "C70Z,C7000Z");
     800        OlympusCameraTypes.put("SX853", "SP500UZ");
     801        OlympusCameraTypes.put("SX854", "SP310");
     802        OlympusCameraTypes.put("SX855", "SP350");
     803        OlympusCameraTypes.put("SX873", "SP320");
     804        OlympusCameraTypes.put("SX875", "FE180/X745"); // (also D4330)
     805        OlympusCameraTypes.put("SX876", "FE190/X750"); // (also D4327)
     806
     807        //   other brands
     808        //    4MP9Q3", "Camera 4MP-9Q3'
     809        //    4MP9T2", "BenQ DC C420 / Camera 4MP-9T2'
     810        //    5MP9Q3", "Camera 5MP-9Q3" },
     811        //    5MP9X9", "Camera 5MP-9X9" },
     812        //   '5MP-9T'=> 'Camera 5MP-9T3" },
     813        //   '5MP-9Y'=> 'Camera 5MP-9Y2" },
     814        //   '6MP-9U'=> 'Camera 6MP-9U9" },
     815        //    7MP9Q3", "Camera 7MP-9Q3" },
     816        //   '8MP-9U'=> 'Camera 8MP-9U4" },
     817        //    CE5330", "Acer CE-5330" },
     818        //   'CP-853'=> 'Acer CP-8531" },
     819        //    CS5531", "Acer CS5531" },
     820        //    DC500 ", "SeaLife DC500" },
     821        //    DC7370", "Camera 7MP-9GA" },
     822        //    DC7371", "Camera 7MP-9GM" },
     823        //    DC7371", "Hitachi HDC-751E" },
     824        //    DC7375", "Hitachi HDC-763E / Rollei RCP-7330X / Ricoh Caplio RR770 / Vivitar ViviCam 7330" },
     825        //   'DC E63'=> 'BenQ DC E63+" },
     826        //   'DC P86'=> 'BenQ DC P860" },
     827        //    DS5340", "Maginon Performic S5 / Premier 5MP-9M7" },
     828        //    DS5341", "BenQ E53+ / Supra TCM X50 / Maginon X50 / Premier 5MP-9P8" },
     829        //    DS5346", "Premier 5MP-9Q2" },
     830        //    E500  ", "Konica Minolta DiMAGE E500" },
     831        //    MAGINO", "Maginon X60" },
     832        //    Mz60  ", "HP Photosmart Mz60" },
     833        //    Q3DIGI", "Camera 5MP-9Q3" },
     834        //    SLIMLI", "Supra Slimline X6" },
     835        //    V8300s", "Vivitar V8300s" },
     836    }
    478837}
Note: See TracChangeset for help on using the changeset viewer.