You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2021/05/12 21:46:35 UTC
[commons-imaging] branch master updated (678ffcc -> 535a83e)
This is an automated email from the ASF dual-hosted git repository.
kinow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git.
from 678ffcc Merge branch 'pr-148'
new 8da56ad [IMAGING-305] Replace Collections.sort with list.sort.
new 1bff0fd [IMAGING-305] Changelog
new 535a83e Merge branch 'pr-150'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/changes/changes.xml | 3 +++
.../commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java | 3 +--
.../org/apache/commons/imaging/formats/tiff/TiffContents.java | 2 +-
.../floatingpoint/PhotometricInterpreterFloat.java | 5 ++---
.../imaging/formats/tiff/write/TiffImageWriterBase.java | 2 +-
.../imaging/formats/tiff/write/TiffImageWriterLossless.java | 10 +++++-----
.../imaging/formats/tiff/write/TiffOutputDirectory.java | 2 +-
.../apache/commons/imaging/palette/LongestAxisMedianCut.java | 5 ++---
.../commons/imaging/palette/MostPopulatedBoxesMedianCut.java | 5 ++---
.../org/apache/commons/imaging/palette/PaletteFactory.java | 3 +--
10 files changed, 19 insertions(+), 21 deletions(-)
[commons-imaging] 03/03: Merge branch 'pr-150'
Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 535a83e7ca598678114617697aa81cd2d4b558f0
Merge: 678ffcc 1bff0fd
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Thu May 13 09:45:46 2021 +1200
Merge branch 'pr-150'
This closes #150
src/changes/changes.xml | 3 +++
.../commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java | 3 +--
.../org/apache/commons/imaging/formats/tiff/TiffContents.java | 2 +-
.../floatingpoint/PhotometricInterpreterFloat.java | 5 ++---
.../imaging/formats/tiff/write/TiffImageWriterBase.java | 2 +-
.../imaging/formats/tiff/write/TiffImageWriterLossless.java | 10 +++++-----
.../imaging/formats/tiff/write/TiffOutputDirectory.java | 2 +-
.../apache/commons/imaging/palette/LongestAxisMedianCut.java | 5 ++---
.../commons/imaging/palette/MostPopulatedBoxesMedianCut.java | 5 ++---
.../org/apache/commons/imaging/palette/PaletteFactory.java | 3 +--
10 files changed, 19 insertions(+), 21 deletions(-)
[commons-imaging] 01/03: [IMAGING-305] Replace Collections.sort
with list.sort.
Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 8da56adc67b6a934b7a75526d0fad52457d49fa0
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Wed May 12 22:19:50 2021 +0200
[IMAGING-305] Replace Collections.sort with list.sort.
---
.../commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java | 3 +--
.../org/apache/commons/imaging/formats/tiff/TiffContents.java | 2 +-
.../floatingpoint/PhotometricInterpreterFloat.java | 5 ++---
.../imaging/formats/tiff/write/TiffImageWriterBase.java | 2 +-
.../imaging/formats/tiff/write/TiffImageWriterLossless.java | 10 +++++-----
.../imaging/formats/tiff/write/TiffOutputDirectory.java | 2 +-
.../apache/commons/imaging/palette/LongestAxisMedianCut.java | 5 ++---
.../commons/imaging/palette/MostPopulatedBoxesMedianCut.java | 5 ++---
.../org/apache/commons/imaging/palette/PaletteFactory.java | 3 +--
9 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
index 734562b..c8f99b8 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.imaging.formats.jpeg;
-import java.util.Collections;
import java.util.List;
import org.apache.commons.imaging.common.GenericImageMetadata;
@@ -33,7 +32,7 @@ public class JpegPhotoshopMetadata extends GenericImageMetadata {
this.photoshopApp13Data = photoshopApp13Data;
final List<IptcRecord> records = photoshopApp13Data.getRecords();
- Collections.sort(records, IptcRecord.COMPARATOR);
+ records.sort(IptcRecord.COMPARATOR);
for (final IptcRecord element : records) {
if (element.iptcType != IptcTypes.RECORD_VERSION) {
add(element.getIptcTypeName(), element.getValue());
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
index 39e8eaf..0a662e6 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
@@ -76,7 +76,7 @@ public class TiffContents {
public void dissect() throws ImageReadException {
final List<TiffElement> elements = getElements();
- Collections.sort(elements, TiffElement.COMPARATOR);
+ elements.sort(TiffElement.COMPARATOR);
long lastEnd = 0;
for (final TiffElement element : elements) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloat.java b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloat.java
index e06c1d0..f96f6e7 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloat.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloat.java
@@ -19,7 +19,6 @@ package org.apache.commons.imaging.formats.tiff.photometricinterpreters.floating
import java.awt.Color;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -159,8 +158,8 @@ public class PhotometricInterpreterFloat extends PhotometricInterpreter {
return Double.compare(o1.getLowerBound(), o2.getLowerBound());
};
- Collections.sort(rangePaletteEntries, comparator);
- Collections.sort(singleValuePaletteEntries, comparator);
+ rangePaletteEntries.sort(comparator);
+ singleValuePaletteEntries.sort(comparator);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
index adb9deb..775ecd2 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
@@ -605,7 +605,7 @@ public abstract class TiffImageWriterBase {
private void combineUserExifIntoFinalExif(final TiffOutputSet userExif,
final TiffOutputSet outputSet) throws ImageWriteException {
final List<TiffOutputDirectory> outputDirectories = outputSet.getDirectories();
- Collections.sort(outputDirectories, TiffOutputDirectory.COMPARATOR);
+ outputDirectories.sort(TiffOutputDirectory.COMPARATOR);
for (final TiffOutputDirectory userDirectory : userExif.getDirectories()) {
final int location = Collections.binarySearch(outputDirectories,
userDirectory, TiffOutputDirectory.COMPARATOR);
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
index 3e5ec4a..46d9f64 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
@@ -100,7 +100,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
}
}
- Collections.sort(elements, TiffElement.COMPARATOR);
+ elements.sort(TiffElement.COMPARATOR);
final List<TiffElement> rewritableElements = new ArrayList<>();
final int TOLERANCE = 3;
@@ -191,7 +191,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
final List<TiffElement> unusedElements = new ArrayList<>(analysis);
// should already be in order of offset, but make sure.
- Collections.sort(unusedElements, TiffElement.COMPARATOR);
+ unusedElements.sort(TiffElement.COMPARATOR);
Collections.reverse(unusedElements);
// any items that represent a gap at the end of the exif segment, can be
// discarded.
@@ -206,13 +206,13 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
unusedElements.remove(0);
}
- Collections.sort(unusedElements, ELEMENT_SIZE_COMPARATOR);
+ unusedElements.sort(ELEMENT_SIZE_COMPARATOR);
Collections.reverse(unusedElements);
// make copy.
final List<TiffOutputItem> unplacedItems = new ArrayList<>(
outputItems);
- Collections.sort(unplacedItems, ITEM_SIZE_COMPARATOR);
+ unplacedItems.sort(ITEM_SIZE_COMPARATOR);
Collections.reverse(unplacedItems);
while (!unplacedItems.isEmpty()) {
@@ -250,7 +250,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
unusedElements.add(new TiffElement.Stub(excessOffset,
excessLength));
// make sure the new element is in the correct order.
- Collections.sort(unusedElements, ELEMENT_SIZE_COMPARATOR);
+ unusedElements.sort(ELEMENT_SIZE_COMPARATOR);
Collections.reverse(unusedElements);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
index 4913878..a26916e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
@@ -592,7 +592,7 @@ public final class TiffOutputDirectory extends TiffOutputItem {
}
return e1.getSortHint() - e2.getSortHint();
};
- Collections.sort(fields, comparator);
+ fields.sort(comparator);
}
public String description() {
diff --git a/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java b/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
index 0c62797..56e9ddc 100644
--- a/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
+++ b/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
@@ -17,7 +17,6 @@
package org.apache.commons.imaging.palette;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -34,7 +33,7 @@ public class LongestAxisMedianCut implements MedianCut {
@Override
public boolean performNextMedianCut(final List<ColorGroup> colorGroups, final boolean ignoreAlpha)
throws ImageWriteException {
- Collections.sort(colorGroups, COMPARATOR);
+ colorGroups.sort(COMPARATOR);
final ColorGroup colorGroup = colorGroups.get(0);
if (colorGroup.maxDiff == 0) {
@@ -60,7 +59,7 @@ public class LongestAxisMedianCut implements MedianCut {
final List<ColorGroup> colorGroups, final boolean ignoreAlpha) throws ImageWriteException {
final List<ColorCount> colorCounts = colorGroup.getColorCounts();
- Collections.sort(colorCounts, new ColorCountComparator(mode));
+ colorCounts.sort(new ColorCountComparator(mode));
final int countHalf = (int) Math.round((double) colorGroup.totalPoints / 2);
int oldCount = 0;
int newCount = 0;
diff --git a/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java b/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
index 91e0f37..adc24c3 100644
--- a/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
+++ b/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
@@ -17,7 +17,6 @@
package org.apache.commons.imaging.palette;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.commons.imaging.ImageWriteException;
@@ -50,7 +49,7 @@ public class MostPopulatedBoxesMedianCut implements MedianCut {
if (ignoreAlpha && colorComponent == ColorComponent.ALPHA) {
continue;
}
- Collections.sort(colorCounts, new ColorCountComparator(colorComponent));
+ colorCounts.sort(new ColorCountComparator(colorComponent));
final int countHalf = (int) Math.round((double) colorGroup.totalPoints / 2);
int oldCount = 0;
int newCount = 0;
@@ -98,7 +97,7 @@ public class MostPopulatedBoxesMedianCut implements MedianCut {
return false;
}
- Collections.sort(colorCounts, new ColorCountComparator(bestColorComponent));
+ colorCounts.sort(new ColorCountComparator(bestColorComponent));
final List<ColorCount> lowerColors = new ArrayList<>(
colorCounts.subList(0, bestMedianIndex + 1));
final List<ColorCount> upperColors = new ArrayList<>(
diff --git a/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java b/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
index cd14c58..9068c80 100644
--- a/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
+++ b/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
@@ -21,7 +21,6 @@ import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -377,7 +376,7 @@ public class PaletteFactory {
}
}
- Collections.sort(subsets, ColorSpaceSubset.RGB_COMPARATOR);
+ subsets.sort(ColorSpaceSubset.RGB_COMPARATOR);
return new QuantizedPalette(subsets, precision);
}
[commons-imaging] 02/03: [IMAGING-305] Changelog
Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 1bff0fdd2a84424540de0a8df054ad98d76333ed
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Thu May 13 09:45:37 2021 +1200
[IMAGING-305] Changelog
---
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f637367..649c9e9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -138,6 +138,9 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="IMAGING-303" dev="kinow" type="update" due-to="Arturo Bernal">
Simplify If-else conditions
</action>
+ <action issue="IMAGING-305" dev="kinow" type="update" due-to="Arturo Bernal">
+ Replace Collections.sort with list.sort
+ </action>
</release>
<release version="1.0-alpha2" date="2020-08-01" description="Second 1.0 alpha release">
<action issue="IMAGING-258" dev="kinow" type="update" due-to="Gary Lucas">