mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-03 04:37:06 -08:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
78 lines
2.9 KiB
Diff
78 lines
2.9 KiB
Diff
diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
|
|
--- src/com/l2fprod/tools/ImageUtils.java 2006-01-24 20:09:36.000000000 +0100
|
|
+++ src/com/l2fprod/tools/ImageUtils.java 2006-01-24 20:19:19.000000000 +0100
|
|
@@ -6,15 +6,12 @@
|
|
|
|
import javax.swing.ImageIcon;
|
|
|
|
-import com.ibm.imageconversion.*;
|
|
-import com.sun.jimi.core.*;
|
|
+import javax.imageio.*;
|
|
|
|
public class ImageUtils {
|
|
|
|
public static Component bitmapCreator = new javax.swing.JLabel();
|
|
|
|
- static BMPDecoder decoder = new BMPDecoder();
|
|
- static BMPEncoder encoder = new BMPEncoder();
|
|
|
|
public static Image loadPng(String pathToImage) throws Exception {
|
|
ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
|
|
@@ -22,29 +19,33 @@
|
|
}
|
|
|
|
public static void savePng(Image image, String pathToImage) throws Exception {
|
|
- Jimi.putImage(image, pathToImage);
|
|
+ ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
|
|
}
|
|
|
|
+ private static String getFileFmt(String pathToImage) throws Exception {
|
|
+ String fmt;
|
|
+ if (pathToImage.toLowerCase().endsWith(".png")) {
|
|
+ return "png";
|
|
+ }
|
|
+ if (pathToImage.toLowerCase().endsWith(".gif")) {
|
|
+ return "gif";
|
|
+ }
|
|
+ if (pathToImage.toLowerCase().endsWith(".bmp")) {
|
|
+ return "bmp";
|
|
+ }
|
|
+ return "";
|
|
+ }
|
|
+
|
|
public static void createPicture(String pathToImage, int index, int maxParts,
|
|
String filename, boolean horizontal) {
|
|
try {
|
|
System.out.println("working with " + pathToImage);
|
|
Image image = null;
|
|
-
|
|
- if (pathToImage.toLowerCase().endsWith(".png") ||
|
|
- pathToImage.toLowerCase().endsWith(".gif")) {
|
|
- image = loadPng(pathToImage);
|
|
- } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
|
|
- decoder.setInputFilename(pathToImage);
|
|
- decoder.triggerAction();
|
|
- image = decoder.getResult();
|
|
- } else {
|
|
- throw new Error("do not know how to load " + pathToImage);
|
|
- }
|
|
+ image = Toolkit.getDefaultToolkit().getImage(pathToImage);
|
|
|
|
// if only one image, dump it as it
|
|
- if (index == 0 && maxParts == 1) {
|
|
- Jimi.putImage(image, filename);
|
|
+ if (index == 0 && maxParts == 1) {
|
|
+ ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
|
|
} else {
|
|
if (horizontal) {
|
|
int partHeight = image.getHeight(bitmapCreator) / maxParts;
|
|
@@ -55,7 +56,7 @@
|
|
image = grab(image, partWidth * index, 0,
|
|
partWidth, image.getHeight(bitmapCreator));
|
|
}
|
|
- Jimi.putImage(image, filename);
|
|
+ ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
|
|
}
|
|
} catch (Exception e) {
|
|
System.out.println("error while working with " + pathToImage);
|