Ignore:
Timestamp:
2017-10-30T22:46:09+01:00 (6 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/PanasonicMakernoteDirectory.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");
    … …  
    3838 * @author Philipp Sandhaus
    3939 */
     40@SuppressWarnings("WeakerAccess")
    4041public class PanasonicMakernoteDirectory extends Directory
    4142{
    … …  
    354355    public static final int TAG_FILM_MODE = 0x0042;
    355356
    356     /**
    357          * WB adjust AB. Positive is a shift toward blue.
    358          */
    359         public static final int TAG_WB_ADJUST_AB = 0x0046;
    360     /**
    361          * WB adjust GM. Positive is a shift toward green.
    362          */
    363         public static final int TAG_WB_ADJUST_GM = 0x0047;
    364 
    365 
     357    public static final int TAG_COLOR_TEMP_KELVIN = 0x0044;
     358    public static final int TAG_BRACKET_SETTINGS = 0x0045;
     359
     360    /**
     361    * WB adjust AB. Positive is a shift toward blue.
     362    */
     363    public static final int TAG_WB_ADJUST_AB = 0x0046;
     364    /**
     365    * WB adjust GM. Positive is a shift toward green.
     366    */
     367    public static final int TAG_WB_ADJUST_GM = 0x0047;
     368
     369    public static final int TAG_FLASH_CURTAIN = 0x0048;
     370    public static final int TAG_LONG_EXPOSURE_NOISE_REDUCTION = 0x0049;
     371
     372    public static final int TAG_PANASONIC_IMAGE_WIDTH = 0x004b;
     373    public static final int TAG_PANASONIC_IMAGE_HEIGHT = 0x004c;
    366374    public static final int TAG_AF_POINT_POSITION = 0x004d;
    367375
    … …  
    384392    public static final int TAG_LENS_SERIAL_NUMBER = 0x0052;
    385393    public static final int TAG_ACCESSORY_TYPE = 0x0053;
     394    public static final int TAG_ACCESSORY_SERIAL_NUMBER = 0x0054;
    386395
    387396    /**
    … …  
    403412    public static final int TAG_INTELLIGENT_EXPOSURE = 0x005d;
    404413
    405     /**
    406           * Info at http://www.ozhiker.com/electronics/pjmt/jpeg_info/pim.html
    407      */
    408         public static final int TAG_PRINT_IMAGE_MATCHING_INFO = 0x0E00;
     414    public static final int TAG_LENS_FIRMWARE_VERSION = 0x0060;
     415    public static final int TAG_BURST_SPEED = 0x0077;
     416    public static final int TAG_INTELLIGENT_D_RANGE = 0x0079;
     417    public static final int TAG_CLEAR_RETOUCH = 0x007c;
     418    public static final int TAG_CITY2 = 0x0080;
     419    public static final int TAG_PHOTO_STYLE = 0x0089;
     420    public static final int TAG_SHADING_COMPENSATION = 0x008a;
     421
     422    public static final int TAG_ACCELEROMETER_Z = 0x008c;
     423    public static final int TAG_ACCELEROMETER_X = 0x008d;
     424    public static final int TAG_ACCELEROMETER_Y = 0x008e;
     425    public static final int TAG_CAMERA_ORIENTATION = 0x008f;
     426    public static final int TAG_ROLL_ANGLE = 0x0090;
     427    public static final int TAG_PITCH_ANGLE = 0x0091;
     428    public static final int TAG_SWEEP_PANORAMA_DIRECTION = 0x0093;
     429    public static final int TAG_SWEEP_PANORAMA_FIELD_OF_VIEW = 0x0094;
     430    public static final int TAG_TIMER_RECORDING = 0x0096;
     431
     432    public static final int TAG_INTERNAL_ND_FILTER = 0x009d;
     433    public static final int TAG_HDR = 0x009e;
     434    public static final int TAG_SHUTTER_TYPE = 0x009f;
     435
     436    public static final int TAG_CLEAR_RETOUCH_VALUE = 0x00a3;
     437    public static final int TAG_TOUCH_AE = 0x00ab;
     438
     439    /**
     440    * Info at http://www.ozhiker.com/electronics/pjmt/jpeg_info/pim.html
     441    */
     442    public static final int TAG_PRINT_IMAGE_MATCHING_INFO = 0x0E00;
    409443
    410444    /**
    … …  
    434468    public static final int TAG_RECOGNIZED_FACE_FLAGS = 0x0063;
    435469    public static final int TAG_TITLE = 0x0065;
    436         public static final int TAG_BABY_NAME = 0x0066;
    437         public static final int TAG_LOCATION = 0x0067;
    438         public static final int TAG_COUNTRY = 0x0069;
     470    public static final int TAG_BABY_NAME = 0x0066;
     471    public static final int TAG_LOCATION = 0x0067;
     472    public static final int TAG_COUNTRY = 0x0069;
    439473    public static final int TAG_STATE = 0x006b;
    440474    public static final int TAG_CITY = 0x006d;
    … …  
    455489    public static final int TAG_FLASH_FIRED = 0x8007;
    456490    public static final int TAG_TEXT_STAMP_2 = 0x8008;
    457         public static final int TAG_TEXT_STAMP_3 = 0x8009;
    458         public static final int TAG_BABY_AGE_1 = 0x8010;
     491    public static final int TAG_TEXT_STAMP_3 = 0x8009;
     492    public static final int TAG_BABY_AGE_1 = 0x8010;
    459493
    460494        /**
    … …  
    506540        _tagNameMap.put(TAG_TEXT_STAMP, "Text Stamp");
    507541        _tagNameMap.put(TAG_PROGRAM_ISO, "Program ISO");
    508                 _tagNameMap.put(TAG_ADVANCED_SCENE_MODE, "Advanced Scene Mode");
     542        _tagNameMap.put(TAG_ADVANCED_SCENE_MODE, "Advanced Scene Mode");
    509543        _tagNameMap.put(TAG_PRINT_IMAGE_MATCHING_INFO, "Print Image Matching (PIM) Info");
    510544        _tagNameMap.put(TAG_FACES_DETECTED, "Number of Detected Faces");
    … …  
    512546        _tagNameMap.put(TAG_SHARPNESS, "Sharpness");
    513547        _tagNameMap.put(TAG_FILM_MODE, "Film Mode");
     548        _tagNameMap.put(TAG_COLOR_TEMP_KELVIN, "Color Temp Kelvin");
     549        _tagNameMap.put(TAG_BRACKET_SETTINGS, "Bracket Settings");
    514550        _tagNameMap.put(TAG_WB_ADJUST_AB, "White Balance Adjust (AB)");
    515                 _tagNameMap.put(TAG_WB_ADJUST_GM, "White Balance Adjust (GM)");
    516                 _tagNameMap.put(TAG_AF_POINT_POSITION, "Af Point Position");
     551        _tagNameMap.put(TAG_WB_ADJUST_GM, "White Balance Adjust (GM)");
     552
     553        _tagNameMap.put(TAG_FLASH_CURTAIN, "Flash Curtain");
     554        _tagNameMap.put(TAG_LONG_EXPOSURE_NOISE_REDUCTION, "Long Exposure Noise Reduction");
     555        _tagNameMap.put(TAG_PANASONIC_IMAGE_WIDTH, "Panasonic Image Width");
     556        _tagNameMap.put(TAG_PANASONIC_IMAGE_HEIGHT, "Panasonic Image Height");
     557
     558        _tagNameMap.put(TAG_AF_POINT_POSITION, "Af Point Position");
    517559        _tagNameMap.put(TAG_FACE_DETECTION_INFO, "Face Detection Info");
    518560        _tagNameMap.put(TAG_LENS_TYPE, "Lens Type");
    519561        _tagNameMap.put(TAG_LENS_SERIAL_NUMBER, "Lens Serial Number");
    520562        _tagNameMap.put(TAG_ACCESSORY_TYPE, "Accessory Type");
     563        _tagNameMap.put(TAG_ACCESSORY_SERIAL_NUMBER, "Accessory Serial Number");
    521564        _tagNameMap.put(TAG_TRANSFORM, "Transform");
    522565        _tagNameMap.put(TAG_INTELLIGENT_EXPOSURE, "Intelligent Exposure");
     566        _tagNameMap.put(TAG_LENS_FIRMWARE_VERSION, "Lens Firmware Version");
    523567        _tagNameMap.put(TAG_FACE_RECOGNITION_INFO, "Face Recognition Info");
    524568        _tagNameMap.put(TAG_FLASH_WARNING, "Flash Warning");
    525569        _tagNameMap.put(TAG_RECOGNIZED_FACE_FLAGS, "Recognized Face Flags");
    526                 _tagNameMap.put(TAG_TITLE, "Title");
    527                 _tagNameMap.put(TAG_BABY_NAME, "Baby Name");
    528                 _tagNameMap.put(TAG_LOCATION, "Location");
    529                 _tagNameMap.put(TAG_COUNTRY, "Country");
     570        _tagNameMap.put(TAG_TITLE, "Title");
     571        _tagNameMap.put(TAG_BABY_NAME, "Baby Name");
     572        _tagNameMap.put(TAG_LOCATION, "Location");
     573        _tagNameMap.put(TAG_COUNTRY, "Country");
    530574        _tagNameMap.put(TAG_STATE, "State");
    531575        _tagNameMap.put(TAG_CITY, "City");
    532576        _tagNameMap.put(TAG_LANDMARK, "Landmark");
    533577        _tagNameMap.put(TAG_INTELLIGENT_RESOLUTION, "Intelligent Resolution");
     578        _tagNameMap.put(TAG_BURST_SPEED, "Burst Speed");
     579        _tagNameMap.put(TAG_INTELLIGENT_D_RANGE, "Intelligent D-Range");
     580        _tagNameMap.put(TAG_CLEAR_RETOUCH, "Clear Retouch");
     581        _tagNameMap.put(TAG_CITY2, "City 2");
     582        _tagNameMap.put(TAG_PHOTO_STYLE, "Photo Style");
     583        _tagNameMap.put(TAG_SHADING_COMPENSATION, "Shading Compensation");
     584
     585        _tagNameMap.put(TAG_ACCELEROMETER_Z, "Accelerometer Z");
     586        _tagNameMap.put(TAG_ACCELEROMETER_X, "Accelerometer X");
     587        _tagNameMap.put(TAG_ACCELEROMETER_Y, "Accelerometer Y");
     588        _tagNameMap.put(TAG_CAMERA_ORIENTATION, "Camera Orientation");
     589        _tagNameMap.put(TAG_ROLL_ANGLE, "Roll Angle");
     590        _tagNameMap.put(TAG_PITCH_ANGLE, "Pitch Angle");
     591        _tagNameMap.put(TAG_SWEEP_PANORAMA_DIRECTION, "Sweep Panorama Direction");
     592        _tagNameMap.put(TAG_SWEEP_PANORAMA_FIELD_OF_VIEW, "Sweep Panorama Field Of View");
     593        _tagNameMap.put(TAG_TIMER_RECORDING, "Timer Recording");
     594
     595        _tagNameMap.put(TAG_INTERNAL_ND_FILTER, "Internal ND Filter");
     596        _tagNameMap.put(TAG_HDR, "HDR");
     597        _tagNameMap.put(TAG_SHUTTER_TYPE, "Shutter Type");
     598        _tagNameMap.put(TAG_CLEAR_RETOUCH_VALUE, "Clear Retouch Value");
     599        _tagNameMap.put(TAG_TOUCH_AE, "Touch AE");
     600
    534601        _tagNameMap.put(TAG_MAKERNOTE_VERSION, "Makernote Version");
    535602        _tagNameMap.put(TAG_SCENE_MODE, "Scene Mode");
    … …  
    538605        _tagNameMap.put(TAG_WB_BLUE_LEVEL, "White Balance (Blue)");
    539606        _tagNameMap.put(TAG_FLASH_FIRED, "Flash Fired");
    540                 _tagNameMap.put(TAG_TEXT_STAMP_1, "Text Stamp 1");
    541                 _tagNameMap.put(TAG_TEXT_STAMP_2, "Text Stamp 2");
    542                 _tagNameMap.put(TAG_TEXT_STAMP_3, "Text Stamp 3");
    543                 _tagNameMap.put(TAG_BABY_AGE_1, "Baby Age 1");
    544                 _tagNameMap.put(TAG_TRANSFORM_1, "Transform 1");
     607        _tagNameMap.put(TAG_TEXT_STAMP_1, "Text Stamp 1");
     608        _tagNameMap.put(TAG_TEXT_STAMP_2, "Text Stamp 2");
     609        _tagNameMap.put(TAG_TEXT_STAMP_3, "Text Stamp 3");
     610        _tagNameMap.put(TAG_BABY_AGE_1, "Baby Age 1");
     611        _tagNameMap.put(TAG_TRANSFORM_1, "Transform 1");
    545612    }
    546613
Note: See TracChangeset for help on using the changeset viewer.