Changeset 15217 in josm for trunk/src/com/drew/imaging


Ignore:
Timestamp:
2019-07-07T01:56:46+02:00 (6 years ago)
Author:
Don-vip
Message:

see #17848 - update to metadata-extractor 2.12.0

Location:
trunk/src/com/drew/imaging
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/com/drew/imaging/ImageProcessingException.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");

  • trunk/src/com/drew/imaging/PhotographicConversions.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");

  • trunk/src/com/drew/imaging/jpeg/JpegMetadataReader.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");
    … …  
    3535//import com.drew.metadata.adobe.AdobeJpegReader;
    3636import com.drew.metadata.exif.ExifReader;
    37 import com.drew.metadata.file.FileMetadataReader;
     37import com.drew.metadata.file.FileSystemMetadataReader;
    3838//import com.drew.metadata.icc.IccReader;
    3939import com.drew.metadata.iptc.IptcReader;
    … …  
    9595            inputStream.close();
    9696        }
    97         new FileMetadataReader().read(file, metadata);
     97        new FileSystemMetadataReader().read(file, metadata);
    9898        return metadata;
    9999    }

  • trunk/src/com/drew/imaging/jpeg/JpegProcessingException.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");

  • trunk/src/com/drew/imaging/jpeg/JpegSegmentData.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");

  • trunk/src/com/drew/imaging/jpeg/JpegSegmentReader.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");
    … …  
    153153                segmentData.addSegment(segmentType, segmentBytes);
    154154            } else {
    155                 // Some if the JPEG is truncated, just return what data we've already gathered
     155                // Skip this segment
    156156                if (!reader.trySkip(segmentLength)) {
     157                    // If skipping failed, just return the segments we found so far
    157158                    return segmentData;
    158159                }

  • trunk/src/com/drew/imaging/jpeg/JpegSegmentType.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");

  • trunk/src/com/drew/imaging/tiff/TiffDataFormat.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");

  • trunk/src/com/drew/imaging/tiff/TiffHandler.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");

  • trunk/src/com/drew/imaging/tiff/TiffProcessingException.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");

  • trunk/src/com/drew/imaging/tiff/TiffReader.java

    r13061 r15217  
    11/*
    2  * Copyright 2002-2017 Drew Noakes
     2 * Copyright 2002-2019 Drew Noakes and contributors
    33 *
    44 *    Licensed under the Apache License, Version 2.0 (the "License");
Note: See TracChangeset for help on using the changeset viewer.