summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-01-24 21:05:10 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-01-24 21:05:10 +0000
commit8ad69db3b020e31e72b8b030bb77d00fab6948c3 (patch)
tree612abe945fb22e415cfc0063fb511f56cce63297 /dev-java/skinlf/files
parentDrop ~hppa. (diff)
downloadgentoo-2-8ad69db3b020e31e72b8b030bb77d00fab6948c3.tar.gz
gentoo-2-8ad69db3b020e31e72b8b030bb77d00fab6948c3.tar.bz2
gentoo-2-8ad69db3b020e31e72b8b030bb77d00fab6948c3.zip
patch to work without fetch-restricted sun-jimi
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'dev-java/skinlf/files')
-rw-r--r--dev-java/skinlf/files/digest-skinlf-1.2.12-r11
-rw-r--r--dev-java/skinlf/files/skinlf-1.2.12-image-utils-without-jimi.patch77
2 files changed, 78 insertions, 0 deletions
diff --git a/dev-java/skinlf/files/digest-skinlf-1.2.12-r1 b/dev-java/skinlf/files/digest-skinlf-1.2.12-r1
new file mode 100644
index 000000000000..ae3f50d0cc61
--- /dev/null
+++ b/dev-java/skinlf/files/digest-skinlf-1.2.12-r1
@@ -0,0 +1 @@
+MD5 e29a1316c58ede48c3ecdafb281a1e4c skinlf-1.2.12-20051009.zip 836773
diff --git a/dev-java/skinlf/files/skinlf-1.2.12-image-utils-without-jimi.patch b/dev-java/skinlf/files/skinlf-1.2.12-image-utils-without-jimi.patch
new file mode 100644
index 000000000000..02670136667d
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-1.2.12-image-utils-without-jimi.patch
@@ -0,0 +1,77 @@
+diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
+--- skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java 2006-01-24 20:09:36.000000000 +0100
++++ skinlf-1.2.12/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);