Changeset 13061 in josm for trunk/src/com/drew/metadata/jpeg


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

fix #15505 - update to metadata-extractor 2.10.1

Location:
trunk/src/com/drew/metadata/jpeg
Files:
5 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/com/drew/metadata/jpeg/JpegCommentDescriptor.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");
    … …  
    3030 * @author Drew Noakes https://drewnoakes.com
    3131 */
     32@SuppressWarnings("WeakerAccess")
    3233public class JpegCommentDescriptor extends TagDescriptor<JpegCommentDirectory>
    3334{

  • trunk/src/com/drew/metadata/jpeg/JpegCommentDirectory.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");
    … …  
    3131 * @author Drew Noakes https://drewnoakes.com
    3232 */
     33@SuppressWarnings("WeakerAccess")
    3334public class JpegCommentDirectory extends Directory
    3435{

  • trunk/src/com/drew/metadata/jpeg/JpegCommentReader.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");
    … …  
    2525import com.drew.lang.annotations.NotNull;
    2626import com.drew.metadata.Metadata;
     27import com.drew.metadata.StringValue;
    2728
    2829import java.util.Collections;
    … …  
    4950
    5051            // The entire contents of the directory are the comment
    51             directory.setString(JpegCommentDirectory.TAG_COMMENT, new String(segmentBytes));
     52            directory.setStringValue(JpegCommentDirectory.TAG_COMMENT, new StringValue(segmentBytes, null));
    5253        }
    5354    }

  • trunk/src/com/drew/metadata/jpeg/JpegComponent.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");
    … …  
    8989        return _samplingFactorByte & 0x0F;
    9090    }
     91
     92    @NotNull
     93    @Override
     94    public String toString() {
     95        return String.format(
     96            "Quantization table %d, Sampling factors %d horiz/%d vert",
     97            _quantizationTableNumber,
     98            getHorizontalSamplingFactor(),
     99            getVerticalSamplingFactor()
     100        );
     101    }
    91102}

  • trunk/src/com/drew/metadata/jpeg/JpegDescriptor.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");
    … …  
    3333 * @author Drew Noakes https://drewnoakes.com
    3434 */
     35@SuppressWarnings("WeakerAccess")
    3536public class JpegDescriptor extends TagDescriptor<JpegDirectory>
    3637{
    … …  
    124125            return null;
    125126
    126         return value.getComponentName() + " component: Quantization table " + value.getQuantizationTableNumber()
    127             + ", Sampling factors " + value.getHorizontalSamplingFactor()
    128             + " horiz/" + value.getVerticalSamplingFactor() + " vert";
     127        return value.getComponentName() + " component: " + value;
    129128    }
    130129}

  • trunk/src/com/drew/metadata/jpeg/JpegDirectory.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");
    … …  
    3333 * @author Darrell Silver http://www.darrellsilver.com and Drew Noakes https://drewnoakes.com
    3434 */
     35@SuppressWarnings("WeakerAccess")
    3536public class JpegDirectory extends Directory
    3637{

  • trunk/src/com/drew/metadata/jpeg/JpegReader.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");
    … …  
    5252            JpegSegmentType.SOF6,
    5353            JpegSegmentType.SOF7,
    54             JpegSegmentType.SOF8,
     54//            JpegSegmentType.JPG,
    5555            JpegSegmentType.SOF9,
    5656            JpegSegmentType.SOF10,
Note: See TracChangeset for help on using the changeset viewer.