Fix some FindBugs problems.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk@1294474 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
index 8f0047c..b10c749 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
@@ -284,7 +284,7 @@
if (formatCompliance != null)
formatCompliance
.addComment("Unknown Application Extension ("
- + new String(label) + ")", completeCode);
+ + new String(label, "US-ASCII") + ")", completeCode);
// if (label == new String("ICCRGBG1"))
{
@@ -565,7 +565,7 @@
if (block.blockCode == code)
{
byte bytes[] = ((GenericGifBlock) block).appendSubBlocks();
- result.add(new String(bytes));
+ result.add(new String(bytes, "US-ASCII"));
}
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java
index d54f425..7e1a7a1 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java
@@ -40,10 +40,10 @@
int width = src.getWidth();
int height = src.getHeight();
- os.write(("" + width).getBytes());
+ os.write(("" + width).getBytes("US-ASCII"));
os.write(PNM_SEPARATOR);
- os.write(("" + height).getBytes());
+ os.write(("" + height).getBytes("US-ASCII"));
os.write(PNM_NEWLINE);
int bitcache = 0;
@@ -76,7 +76,7 @@
}
} else
{
- os.write(("" + sample).getBytes()); // max component value
+ os.write(("" + sample).getBytes("US-ASCII")); // max component value
os.write(PNM_SEPARATOR);
}
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java
index 1f09daf..f22dcf3 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java
@@ -42,13 +42,13 @@
int width = src.getWidth();
int height = src.getHeight();
- os.write(("" + width).getBytes());
+ os.write(("" + width).getBytes("US-ASCII"));
os.write(PNM_SEPARATOR);
- os.write(("" + height).getBytes());
+ os.write(("" + height).getBytes("US-ASCII"));
os.write(PNM_SEPARATOR);
- os.write(("" + 255).getBytes()); // max component value
+ os.write(("" + 255).getBytes("US-ASCII")); // max component value
os.write(PNM_NEWLINE);
for (int y = 0; y < height; y++)
@@ -66,7 +66,7 @@
}
else
{
- os.write(("" + sample).getBytes()); // max component value
+ os.write(("" + sample).getBytes("US-ASCII")); // max component value
os.write(PNM_SEPARATOR);
}
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java
index 316ac19..4adf81e 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java
@@ -42,13 +42,13 @@
int width = src.getWidth();
int height = src.getHeight();
- os.write(("" + width).getBytes());
+ os.write(("" + width).getBytes("US-ASCII"));
os.write(PNM_SEPARATOR);
- os.write(("" + height).getBytes());
+ os.write(("" + height).getBytes("US-ASCII"));
os.write(PNM_SEPARATOR);
- os.write(("" + 255).getBytes()); // max component value
+ os.write(("" + 255).getBytes("US-ASCII")); // max component value
os.write(PNM_NEWLINE);
for (int y = 0; y < height; y++)
@@ -67,11 +67,11 @@
}
else
{
- os.write(("" + red).getBytes()); // max component value
+ os.write(("" + red).getBytes("US-ASCII")); // max component value
os.write(PNM_SEPARATOR);
- os.write(("" + green).getBytes()); // max component value
+ os.write(("" + green).getBytes("US-ASCII")); // max component value
os.write(PNM_SEPARATOR);
- os.write(("" + blue).getBytes()); // max component value
+ os.write(("" + blue).getBytes("US-ASCII")); // max component value
os.write(PNM_SEPARATOR);
}
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
index d4118a3..566f775 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
@@ -347,7 +347,7 @@
return tag.getValue(field);
}
- public final class ImageDataElement extends TiffElement
+ public static final class ImageDataElement extends TiffElement
{
public ImageDataElement(int offset, int length)
{
diff --git a/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java b/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
index 0d1b673..a64e192 100644
--- a/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
+++ b/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
@@ -445,7 +445,7 @@
}
}
- private class ColorGroupCut
+ private static class ColorGroupCut
{
public final ColorGroup less, more;
public final int mode, limit;
@@ -486,7 +486,7 @@
}
- public class MedianCutPalette extends SimplePalette
+ public static class MedianCutPalette extends SimplePalette
{
private final ColorGroup root;
