Ignore:
Timestamp:
2015-04-21T00:42:50+02:00 (10 years ago)
Author:
Don-vip
Message:

fix #11359 - update to metadata-extractor 2.8.1

Location:
trunk/src/com/drew/metadata/exif/makernotes
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r8132 r8243  
    8282            case CameraSettings.TAG_EXPOSURE_MODE:
    8383                return getExposureModeDescription();
     84            case CameraSettings.TAG_LENS_TYPE:
     85                return getLensTypeDescription();
    8486            case CameraSettings.TAG_LONG_FOCAL_LENGTH:
    8587                return getLongFocalLengthDescription();
    … …  
    451453
    452454    @Nullable
     455    public String getLensTypeDescription() {
     456        Integer value = _directory.getInteger(CameraSettings.TAG_LENS_TYPE);
     457        if (value == null)
     458            return null;
     459
     460        return "Lens type: " + Integer.toString(value);
     461    }
     462
     463    @Nullable
    453464    public String getAfPointSelectedDescription()
    454465    {

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

    r8132 r8243  
    245245        public static final int TAG_EXPOSURE_MODE = OFFSET + 0x14;
    246246        public static final int TAG_UNKNOWN_7 = OFFSET + 0x15;
    247         public static final int TAG_UNKNOWN_8 = OFFSET + 0x16;
     247        public static final int TAG_LENS_TYPE = OFFSET + 0x16;
    248248        public static final int TAG_LONG_FOCAL_LENGTH = OFFSET + 0x17;
    249249        public static final int TAG_SHORT_FOCAL_LENGTH = OFFSET + 0x18;
    … …  
    519519        _tagNameMap.put(CameraSettings.TAG_FOCUS_TYPE, "Focus Type");
    520520        _tagNameMap.put(CameraSettings.TAG_UNKNOWN_7, "Unknown Camera Setting 7");
    521         _tagNameMap.put(CameraSettings.TAG_UNKNOWN_8, "Unknown Camera Setting 8");
     521        _tagNameMap.put(CameraSettings.TAG_LENS_TYPE, "Lens Type");
    522522        _tagNameMap.put(CameraSettings.TAG_UNKNOWN_9, "Unknown Camera Setting 9");
    523523        _tagNameMap.put(CameraSettings.TAG_UNKNOWN_10, "Unknown Camera Setting 10");

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

    r8132 r8243  
    5151    public static final int TAG_MINOLTA_THUMBNAIL_LENGTH = 0x0089;
    5252
     53    public static final int TAG_THUMBNAIL_IMAGE = 0x0100;
     54
    5355    /**
    5456     * Used by Konica / Minolta cameras
    … …  
    8385    public static final int TAG_IMAGE_QUALITY_2 = 0x0103;
    8486
     87    public static final int TAG_BODY_FIRMWARE_VERSION = 0x0104;
    8588
    8689    /**
    … …  
    136139    public static final int TAG_ORIGINAL_MANUFACTURER_MODEL = 0x020D;
    137140
     141    public static final int TAG_PREVIEW_IMAGE = 0x0280;
     142    public static final int TAG_PRE_CAPTURE_FRAMES = 0x0300;
     143    public static final int TAG_WHITE_BOARD = 0x0301;
     144    public static final int TAG_ONE_TOUCH_WB = 0x0302;
     145    public static final int TAG_WHITE_BALANCE_BRACKET = 0x0303;
     146    public static final int TAG_WHITE_BALANCE_BIAS = 0x0304;
     147    public static final int TAG_SCENE_MODE = 0x0403;
     148    public static final int TAG_FIRMWARE = 0x0404;
     149
    138150    /**
    139151     * See the PIM specification here:
    … …  
    142154    public static final int TAG_PRINT_IMAGE_MATCHING_INFO = 0x0E00;
    143155
    144     public static final int TAG_DATA_DUMP = 0x0F00;
     156    public static final int TAG_DATA_DUMP_1 = 0x0F00;
     157    public static final int TAG_DATA_DUMP_2 = 0x0F01;
    145158
    146159    public static final int TAG_SHUTTER_SPEED_VALUE = 0x1000;
    … …  
    149162    public static final int TAG_BRIGHTNESS_VALUE = 0x1003;
    150163    public static final int TAG_FLASH_MODE = 0x1004;
     164    public static final int TAG_FLASH_DEVICE = 0x1005;
    151165    public static final int TAG_BRACKET = 0x1006;
     166    public static final int TAG_SENSOR_TEMPERATURE = 0x1007;
     167    public static final int TAG_LENS_TEMPERATURE = 0x1008;
     168    public static final int TAG_LIGHT_CONDITION = 0x1009;
    152169    public static final int TAG_FOCUS_RANGE = 0x100A;
    153170    public static final int TAG_FOCUS_MODE = 0x100B;
    … …  
    156173    public static final int TAG_MACRO_FOCUS = 0x100E;
    157174    public static final int TAG_SHARPNESS = 0x100F;
     175    public static final int TAG_FLASH_CHARGE_LEVEL = 0x1010;
    158176    public static final int TAG_COLOUR_MATRIX = 0x1011;
    159177    public static final int TAG_BLACK_LEVEL = 0x1012;
     178//    public static final int TAG_ = 0x1013;
     179//    public static final int TAG_ = 0x1014;
    160180    public static final int TAG_WHITE_BALANCE = 0x1015;
     181//    public static final int TAG_ = 0x1016;
    161182    public static final int TAG_RED_BIAS = 0x1017;
    162183    public static final int TAG_BLUE_BIAS = 0x1018;
     184    public static final int TAG_COLOR_MATRIX_NUMBER = 0x1019;
    163185    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;
    164194    public static final int TAG_FLASH_BIAS = 0x1023;
     195//    public static final int TAG_ = 0x1024;
     196//    public static final int TAG_ = 0x1025;
     197    public static final int TAG_EXTERNAL_FLASH_BOUNCE = 0x1026;
     198    public static final int TAG_EXTERNAL_FLASH_ZOOM = 0x1027;
     199    public static final int TAG_EXTERNAL_FLASH_MODE = 0x1028;
    165200    public static final int TAG_CONTRAST = 0x1029;
    166201    public static final int TAG_SHARPNESS_FACTOR = 0x102A;
    … …  
    170205    public static final int TAG_FINAL_WIDTH = 0x102E;
    171206    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_ = 0x1032;
     210//    public static final int TAG_ = 0x1033;
    172211    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_CCD_SCAN_MODE = 0x1039;
     217    public static final int TAG_NOISE_REDUCTION = 0x103A;
     218    public static final int TAG_INFINITY_LENS_STEP = 0x103B;
     219    public static final int TAG_NEAR_LENS_STEP = 0x103C;
     220    public static final int TAG_EQUIPMENT = 0x2010;
     221    public static final int TAG_CAMERA_SETTINGS = 0x2020;
     222    public static final int TAG_RAW_DEVELOPMENT = 0x2030;
     223    public static final int TAG_RAW_DEVELOPMENT_2 = 0x2031;
     224    public static final int TAG_IMAGE_PROCESSING = 0x2040;
     225    public static final int TAG_FOCUS_INFO = 0x2050;
     226    public static final int TAG_RAW_INFO = 0x3000;
    173227
    174228    public final static class CameraSettings
    … …  
    191245        public static final int TAG_EXPOSURE_COMPENSATION = OFFSET + 14;
    192246        public static final int TAG_BRACKET_STEP = OFFSET + 15;
    193 
     247        // 16 missing
    194248        public static final int TAG_INTERVAL_LENGTH = OFFSET + 17;
    195249        public static final int TAG_INTERVAL_NUMBER = OFFSET + 18;
    … …  
    200254        public static final int TAG_TIME = OFFSET + 23;
    201255        public static final int TAG_MAX_APERTURE_AT_FOCAL_LENGTH = OFFSET + 24;
    202 
     256        // 25, 26 missing
    203257        public static final int TAG_FILE_NUMBER_MEMORY = OFFSET + 27;
    204258        public static final int TAG_LAST_FILE_NUMBER = OFFSET + 28;
    … …  
    232286
    233287    static {
     288        _tagNameMap.put(TAG_MAKERNOTE_VERSION, "Makernote Version");
     289        _tagNameMap.put(TAG_CAMERA_SETTINGS_1, "Camera Settings");
     290        _tagNameMap.put(TAG_CAMERA_SETTINGS_2, "Camera Settings");
     291        _tagNameMap.put(TAG_COMPRESSED_IMAGE_SIZE, "Compressed Image Size");
     292        _tagNameMap.put(TAG_MINOLTA_THUMBNAIL_OFFSET_1, "Thumbnail Offset");
     293        _tagNameMap.put(TAG_MINOLTA_THUMBNAIL_OFFSET_2, "Thumbnail Offset");
     294        _tagNameMap.put(TAG_MINOLTA_THUMBNAIL_LENGTH, "Thumbnail Length");
     295        _tagNameMap.put(TAG_THUMBNAIL_IMAGE, "Thumbnail Image");
     296        _tagNameMap.put(TAG_COLOUR_MODE, "Colour Mode");
     297        _tagNameMap.put(TAG_IMAGE_QUALITY_1, "Image Quality");
     298        _tagNameMap.put(TAG_IMAGE_QUALITY_2, "Image Quality");
     299        _tagNameMap.put(TAG_BODY_FIRMWARE_VERSION, "Body Firmware Version");
    234300        _tagNameMap.put(TAG_SPECIAL_MODE, "Special Mode");
    235301        _tagNameMap.put(TAG_JPEG_QUALITY, "JPEG Quality");
    … …  
    242308        _tagNameMap.put(TAG_PICT_INFO, "Pict Info");
    243309        _tagNameMap.put(TAG_CAMERA_ID, "Camera Id");
    244         _tagNameMap.put(TAG_DATA_DUMP, "Data Dump");
    245         _tagNameMap.put(TAG_MAKERNOTE_VERSION, "Makernote Version");
    246         _tagNameMap.put(TAG_CAMERA_SETTINGS_1, "Camera Settings");
    247         _tagNameMap.put(TAG_CAMERA_SETTINGS_2, "Camera Settings");
    248         _tagNameMap.put(TAG_COMPRESSED_IMAGE_SIZE, "Compressed Image Size");
    249         _tagNameMap.put(TAG_MINOLTA_THUMBNAIL_OFFSET_1, "Thumbnail Offset");
    250         _tagNameMap.put(TAG_MINOLTA_THUMBNAIL_OFFSET_2, "Thumbnail Offset");
    251         _tagNameMap.put(TAG_MINOLTA_THUMBNAIL_LENGTH, "Thumbnail Length");
    252         _tagNameMap.put(TAG_COLOUR_MODE, "Colour Mode");
    253         _tagNameMap.put(TAG_IMAGE_QUALITY_1, "Image Quality");
    254         _tagNameMap.put(TAG_IMAGE_QUALITY_2, "Image Quality");
     310        _tagNameMap.put(TAG_IMAGE_WIDTH, "Image Width");
    255311        _tagNameMap.put(TAG_IMAGE_HEIGHT, "Image Height");
    256         _tagNameMap.put(TAG_IMAGE_WIDTH, "Image Width");
    257312        _tagNameMap.put(TAG_ORIGINAL_MANUFACTURER_MODEL, "Original Manufacturer Model");
     313        _tagNameMap.put(TAG_PREVIEW_IMAGE, "Preview Image");
     314        _tagNameMap.put(TAG_PRE_CAPTURE_FRAMES, "Pre Capture Frames");
     315        _tagNameMap.put(TAG_WHITE_BOARD, "White Board");
     316        _tagNameMap.put(TAG_ONE_TOUCH_WB, "One Touch WB");
     317        _tagNameMap.put(TAG_WHITE_BALANCE_BRACKET, "White Balance Bracket");
     318        _tagNameMap.put(TAG_WHITE_BALANCE_BIAS, "White Balance Bias");
     319        _tagNameMap.put(TAG_SCENE_MODE, "Scene Mode");
     320        _tagNameMap.put(TAG_FIRMWARE, "Firmware");
    258321        _tagNameMap.put(TAG_PRINT_IMAGE_MATCHING_INFO, "Print Image Matching (PIM) Info");
    259 
     322        _tagNameMap.put(TAG_DATA_DUMP_1, "Data Dump");
     323        _tagNameMap.put(TAG_DATA_DUMP_2, "Data Dump 2");
    260324        _tagNameMap.put(TAG_SHUTTER_SPEED_VALUE, "Shutter Speed Value");
    261325        _tagNameMap.put(TAG_ISO_VALUE, "ISO Value");
    … …  
    263327        _tagNameMap.put(TAG_BRIGHTNESS_VALUE, "Brightness Value");
    264328        _tagNameMap.put(TAG_FLASH_MODE, "Flash Mode");
     329        _tagNameMap.put(TAG_FLASH_DEVICE, "Flash Device");
    265330        _tagNameMap.put(TAG_BRACKET, "Bracket");
     331        _tagNameMap.put(TAG_SENSOR_TEMPERATURE, "Sensor Temperature");
     332        _tagNameMap.put(TAG_LENS_TEMPERATURE, "Lens Temperature");
     333        _tagNameMap.put(TAG_LIGHT_CONDITION, "Light Condition");
    266334        _tagNameMap.put(TAG_FOCUS_RANGE, "Focus Range");
    267335        _tagNameMap.put(TAG_FOCUS_MODE, "Focus Mode");
    … …  
    270338        _tagNameMap.put(TAG_MACRO_FOCUS, "Macro Focus");
    271339        _tagNameMap.put(TAG_SHARPNESS, "Sharpness");
     340        _tagNameMap.put(TAG_FLASH_CHARGE_LEVEL, "Flash Charge Level");
    272341        _tagNameMap.put(TAG_COLOUR_MATRIX, "Colour Matrix");
    273342        _tagNameMap.put(TAG_BLACK_LEVEL, "Black Level");
    … …  
    275344        _tagNameMap.put(TAG_RED_BIAS, "Red Bias");
    276345        _tagNameMap.put(TAG_BLUE_BIAS, "Blue Bias");
     346        _tagNameMap.put(TAG_COLOR_MATRIX_NUMBER, "Color Matrix Number");
    277347        _tagNameMap.put(TAG_SERIAL_NUMBER, "Serial Number");
    278348        _tagNameMap.put(TAG_FLASH_BIAS, "Flash Bias");
     349        _tagNameMap.put(TAG_EXTERNAL_FLASH_BOUNCE, "External Flash Bounce");
     350        _tagNameMap.put(TAG_EXTERNAL_FLASH_ZOOM, "External Flash Zoom");
     351        _tagNameMap.put(TAG_EXTERNAL_FLASH_MODE, "External Flash Mode");
    279352        _tagNameMap.put(TAG_CONTRAST, "Contrast");
    280353        _tagNameMap.put(TAG_SHARPNESS_FACTOR, "Sharpness Factor");
    … …  
    285358        _tagNameMap.put(TAG_FINAL_HEIGHT, "Final Height");
    286359        _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");
     363        _tagNameMap.put(TAG_CCD_SCAN_MODE, "CCD Scan Mode");
     364        _tagNameMap.put(TAG_NOISE_REDUCTION, "Noise Reduction");
     365        _tagNameMap.put(TAG_INFINITY_LENS_STEP, "Infinity Lens Step");
     366        _tagNameMap.put(TAG_NEAR_LENS_STEP, "Near Lens Step");
     367        _tagNameMap.put(TAG_EQUIPMENT, "Equipment");
     368        _tagNameMap.put(TAG_CAMERA_SETTINGS, "Camera Settings");
     369        _tagNameMap.put(TAG_RAW_DEVELOPMENT, "Raw Development");
     370        _tagNameMap.put(TAG_RAW_DEVELOPMENT_2, "Raw Development 2");
     371        _tagNameMap.put(TAG_IMAGE_PROCESSING, "Image Processing");
     372        _tagNameMap.put(TAG_FOCUS_INFO, "Focus Info");
     373        _tagNameMap.put(TAG_RAW_INFO, "Raw Info");
    287374
    288375        _tagNameMap.put(CameraSettings.TAG_EXPOSURE_MODE, "Exposure Mode");

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

    r8132 r8243  
    3535 * Describes tags specific to Panasonic and Leica cameras.
    3636 *
    37  * @author Drew Noakes https://drewnoakes.com, Philipp Sandhaus
     37 * @author Drew Noakes https://drewnoakes.com
     38 * @author Philipp Sandhaus
    3839 */
    3940public class PanasonicMakernoteDirectory extends Directory
Note: See TracChangeset for help on using the changeset viewer.