diff --git a/image.png b/image.png index cf91532..b9e60bd 100644 Binary files a/image.png and b/image.png differ diff --git a/rectangle0.png b/rectangle0.png index 13ab621..b947c49 100644 Binary files a/rectangle0.png and b/rectangle0.png differ diff --git a/rectangle1.png b/rectangle1.png index e522c62..41992d1 100644 Binary files a/rectangle1.png and b/rectangle1.png differ diff --git a/rectangle2.png b/rectangle2.png index 862f600..804baa1 100644 Binary files a/rectangle2.png and b/rectangle2.png differ diff --git a/rectangle3.png b/rectangle3.png index b8f8448..3f8e9b2 100644 Binary files a/rectangle3.png and b/rectangle3.png differ diff --git a/rectangle4.png b/rectangle4.png index 7b59b4e..3c16c43 100644 Binary files a/rectangle4.png and b/rectangle4.png differ diff --git a/src/main/java/com/example/demo/Controller.java b/src/main/java/com/example/demo/Controller.java index 0d74828..349b155 100644 --- a/src/main/java/com/example/demo/Controller.java +++ b/src/main/java/com/example/demo/Controller.java @@ -149,9 +149,10 @@ public class Controller { /*downloadFileFromUrl(url,"temp"); //BufferedImage img = ImageUtils.toBufferedImage(ImageIO.read(new File("temp")).getScaledInstance(1227, 690, Image.SCALE_SMOOTH)); f = new File("temp");*/ - img = ImageIO.read(new URL(url)); - f = new File("temp"); - ImageIO.write(img,"jpg",f); + img = ImageIO.read(new URL(url+":orig")); + img = ImageIO.read(new URL(url+":orig")); + f = new File("temp.png"); + ImageIO.write(img,"png",f); } img = CropFutureToneImage(img); diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java index a211d37..2866dda 100644 --- a/src/main/java/com/example/demo/DemoApplication.java +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -73,6 +73,8 @@ public class DemoApplication { for (String s : str) { FTsongs.add(new SongData(s)); } + RunTest("test10.jpg","どりーみんチュチュ",456,207,31,11,18,71.06f,false,"EX","",96,544610,false); + RunTest("test9.jpg","アゲアゲアゲイン",436,217,24,3,38,72.49f,false,"EX","",82,552330,false); RunTest("test8.png","メテオ",478,57,2,0,1,100.19f,false,"EX","",229,695618,false); RunTest("test6.png","ありふれたせかいせいふく",586,161,6,5,9,85.75f,false,"EX","",425,672452,false); RunTest("test5.png","ZIGG-ZAGG",88,18,1,2,13,11.87f,true,"EXEX","HS",28,88935,false); diff --git a/test.png b/test.png index 6fd1556..b9e60bd 100644 Binary files a/test.png and b/test.png differ diff --git a/typeface.png b/typeface.png index fb64732..2daca69 100644 Binary files a/typeface.png and b/typeface.png differ