mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.5.4.1
This commit is contained in:
@@ -24,7 +24,7 @@ import java.net.URL;
|
||||
public class IconAdp {
|
||||
public Icon UnderIcon() {return icon;} final Icon icon;
|
||||
public Image XtoImage() {return ((ImageIcon)icon).getImage();}
|
||||
public Io_url Url() {return url;} Io_url url = Io_url_.Null;
|
||||
public Io_url Url() {return url;} Io_url url = Io_url_.Empty;
|
||||
IconAdp(Icon icon) {this.icon = icon;}
|
||||
public static IconAdp new_(Icon icon) {return new IconAdp(icon);}
|
||||
public static IconAdp file_(Io_url url) {
|
||||
|
||||
@@ -42,9 +42,9 @@ class ImageAdp_txt implements ImageAdp {
|
||||
public void Rls() {disposed = true;}
|
||||
public void SaveAsBmp(Io_url url) {SaveAs(url, ".bmp");}
|
||||
public void SaveAsPng(Io_url url) {SaveAs(url, ".png");}
|
||||
void SaveAs(Io_url url, String ext) {Io_mgr._.SaveFilStr(url.GenNewExt(ext), size.XtoStr());}
|
||||
void SaveAs(Io_url url, String ext) {Io_mgr.I.SaveFilStr(url.GenNewExt(ext), size.XtoStr());}
|
||||
public ImageAdp Extract_image(RectAdp src_rect, SizeAdp trg_size) {return Extract_image(src_rect.X(), src_rect.Y(), src_rect.Width(), src_rect.Height(), trg_size.Width(), trg_size.Height());}
|
||||
public ImageAdp Extract_image(int src_x, int src_y, int src_w, int src_h, int trg_w, int trg_h) {return ImageAdp_.txt_mem_(Io_url_.Null, SizeAdp_.new_(trg_w, trg_h));}
|
||||
public ImageAdp Resize(int width, int height) {return ImageAdp_.txt_mem_(Io_url_.Null, SizeAdp_.new_(width, height));}
|
||||
public ImageAdp Extract_image(int src_x, int src_y, int src_w, int src_h, int trg_w, int trg_h) {return ImageAdp_.txt_mem_(Io_url_.Empty, SizeAdp_.new_(trg_w, trg_h));}
|
||||
public ImageAdp Resize(int width, int height) {return ImageAdp_.txt_mem_(Io_url_.Empty, SizeAdp_.new_(width, height));}
|
||||
public ImageAdp_txt(Io_url url, SizeAdp size) {this.url = url; this.size = size;}
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ public class ImageAdp_ {
|
||||
}
|
||||
public static ImageAdp txt_mem_(Io_url url, SizeAdp size) {return new ImageAdp_txt(url, size);}
|
||||
public static ImageAdp txt_fil_(Io_url url) {
|
||||
String raw = Io_mgr._.LoadFilStr(url);
|
||||
String raw = Io_mgr.I.LoadFilStr(url);
|
||||
SizeAdp size = null;
|
||||
if (String_.Eq(raw, "")) size = SizeAdp_.Zero;
|
||||
else if (String_.Eq(url.Ext(), ".svg")) size = SizeOf_svg(url);
|
||||
@@ -51,7 +51,7 @@ public class ImageAdp_ {
|
||||
public static ImageAdp file_(Io_url url) {
|
||||
if (url.EqNull()) throw Err_.new_("cannot load image from null url");
|
||||
if (String_.Eq(url.Info().Key(), IoUrlInfo_.Mem.Key())) return txt_fil_(url);
|
||||
if (!Io_mgr._.ExistsFil(url)) return Null;
|
||||
if (!Io_mgr.I.ExistsFil(url)) return Null;
|
||||
|
||||
BufferedImage img = null;
|
||||
try {
|
||||
@@ -104,7 +104,7 @@ class Gfui_svg_util {
|
||||
public static SizeAdp QuerySize(Io_url url) {
|
||||
try {
|
||||
// NOTE: not using XmlDoc b/c invalid doctypes can cause xml to hang; <?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"><!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns="http://www.w3.org/2000/svg"
|
||||
String xml = Io_mgr._.LoadFilStr(url);
|
||||
String xml = Io_mgr.I.LoadFilStr(url);
|
||||
int pos = String_.FindFwd(xml, "<svg", 0); if (pos == -1) return null;
|
||||
Int_obj_ref pos_ref = Int_obj_ref.new_(pos);
|
||||
double w = ParseAtr(xml, pos_ref, "width");
|
||||
|
||||
@@ -36,7 +36,7 @@ public class ImageAdp_base implements ImageAdp, RlsAble {
|
||||
} SizeAdp size = null;
|
||||
public int Width() {return under.getWidth(null);}
|
||||
public int Height() {return under.getHeight(null);}
|
||||
public Io_url Url() {return url;} public ImageAdp Url_(Io_url v) {url = v; return this;} Io_url url = Io_url_.Null;
|
||||
public Io_url Url() {return url;} public ImageAdp Url_(Io_url v) {url = v; return this;} Io_url url = Io_url_.Empty;
|
||||
public Object Under() {return under;} Image under;
|
||||
public boolean Disposed() {return disposed;} private boolean disposed = false;
|
||||
|
||||
@@ -44,7 +44,7 @@ public class ImageAdp_base implements ImageAdp, RlsAble {
|
||||
public void SaveAsBmp(Io_url url) {SaveAs(url, "bmp");}
|
||||
public void SaveAsPng(Io_url url) {SaveAs(url, "png");}
|
||||
void SaveAs(Io_url url, String fmtStr) {
|
||||
Io_mgr._.CreateDirIfAbsent(url.OwnerDir());
|
||||
Io_mgr.I.CreateDirIfAbsent(url.OwnerDir());
|
||||
File fil = new File(url.Xto_api());
|
||||
// String[] formatNames = ImageIO.getWriterFormatNames();
|
||||
// for (String s : formatNames)
|
||||
|
||||
@@ -21,7 +21,7 @@ public class ImageAdp_null implements ImageAdp {
|
||||
public SizeAdp Size() {return SizeAdp_.Zero;}
|
||||
public int Width() {return 0;}
|
||||
public int Height() {return 0;}
|
||||
public Io_url Url() {return Io_url_.Null;} public ImageAdp Url_(Io_url v) {return this;}
|
||||
public Io_url Url() {return Io_url_.Empty;} public ImageAdp Url_(Io_url v) {return this;}
|
||||
public Object Under() {return null;}
|
||||
public boolean Disposed() {return disposed;} private boolean disposed = false;
|
||||
public void Rls() {disposed = true;}
|
||||
|
||||
Reference in New Issue
Block a user