mirror of
https://github.com/Suwayomi/Suwayomi-Server.git
synced 2026-07-02 10:24:35 -05:00
Implement Bitmap.copy, text layouting (#1455)
* Bitmap: Use provided config * Bitmap: implement copy * Bitmap: Simplify getPixels This also fixes a bug where the returned data may not be in the correct format Android getPixels(): > The returned colors are non-premultiplied ARGB values in the sRGB color space. BufferedImage getRGB(): > Returns an array of integer pixels in the default RGB color model (TYPE_INT_ARGB) and default sRGB color space * Stub TextPaint and Paint * Paint: Implement some required functions * Stub StaticLayout and Layout * Implement some Paint support * Draw Bounds * WebP write support * First text rendering * Paint: Fix text size, font metrics * Paint: Fix not copying new properties Fixes font size in draw * Canvas: Stroke add cap/join for better aliasing Otherwise we get bad artifacts on sharp corners Based on https://stackoverflow.com/a/35222059/ * Remove logs * Canvas: Implement other drawText methods * Bitmap: support erase * Layout: Fix text direction Should be LTR, otherwise 0 is read, which is automatically interpreted as RTL without explicit check * Bitmap: scale to destination rectangle * Canvas: drawBitmap with just x/y * Bitmap: Convert image on JPEG export to RGB JPEG does not support alpha, so will throw "bogus color space" * Switch to newer fork
This commit is contained in:
Constantin Piber
@@ -1,21 +1,184 @@
|
||||
package android.graphics;
|
||||
|
||||
import android.annotation.NonNull;
|
||||
import android.util.Log;
|
||||
import java.awt.BasicStroke;
|
||||
import java.awt.Font;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Rectangle;
|
||||
import java.awt.RenderingHints;
|
||||
import java.awt.Shape;
|
||||
import java.awt.font.GlyphVector;
|
||||
import java.awt.geom.AffineTransform;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import javax.imageio.ImageIO;
|
||||
|
||||
public final class Canvas {
|
||||
private BufferedImage canvasImage;
|
||||
private Graphics2D canvas;
|
||||
private List<AffineTransform> transformStack = new ArrayList<AffineTransform>();
|
||||
|
||||
private static final String TAG = "Canvas";
|
||||
|
||||
public Canvas(Bitmap bitmap) {
|
||||
canvasImage = bitmap.getImage();
|
||||
canvas = canvasImage.createGraphics();
|
||||
}
|
||||
|
||||
public void drawBitmap(Bitmap sourceBitmap, Rect src, Rect dst, Paint paint) {
|
||||
public void drawBitmap(Bitmap sourceBitmap, Rect src, Rect dst, Paint paint) {
|
||||
BufferedImage sourceImage = sourceBitmap.getImage();
|
||||
BufferedImage sourceImageCropped = sourceImage.getSubimage(src.left, src.top, src.getWidth(), src.getHeight());
|
||||
canvas.drawImage(sourceImageCropped, null, dst.left, dst.top);
|
||||
canvas.drawImage(sourceImageCropped, dst.left, dst.top, dst.getWidth(), dst.getHeight(), null);
|
||||
}
|
||||
|
||||
public void drawBitmap(Bitmap sourceBitmap, float left, float top, Paint paint) {
|
||||
BufferedImage sourceImage = sourceBitmap.getImage();
|
||||
canvas.drawImage(sourceImage, null, (int) left, (int) top);
|
||||
}
|
||||
|
||||
public void drawText(@NonNull char[] text, int index, int count, float x, float y,
|
||||
@NonNull Paint paint) {
|
||||
drawText(new String(text, index, count), x, y, paint);
|
||||
}
|
||||
|
||||
public void drawText(@NonNull String text, float x, float y, @NonNull Paint paint) {
|
||||
applyPaint(paint);
|
||||
GlyphVector glyphVector = paint.getFont().createGlyphVector(canvas.getFontRenderContext(), text);
|
||||
Shape textShape = glyphVector.getOutline();
|
||||
switch (paint.getStyle()) {
|
||||
case Paint.Style.FILL:
|
||||
canvas.drawString(text, x, y);
|
||||
break;
|
||||
case Paint.Style.STROKE:
|
||||
save();
|
||||
translate(x, y);
|
||||
canvas.draw(textShape);
|
||||
restore();
|
||||
break;
|
||||
case Paint.Style.FILL_AND_STROKE:
|
||||
save();
|
||||
translate(x, y);
|
||||
canvas.draw(textShape);
|
||||
canvas.fill(textShape);
|
||||
restore();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public void drawText(@NonNull String text, int start, int end, float x, float y,
|
||||
@NonNull Paint paint) {
|
||||
drawText(text.substring(start, end), x, y, paint);
|
||||
}
|
||||
|
||||
public void drawText(@NonNull CharSequence text, int start, int end, float x, float y,
|
||||
@NonNull Paint paint) {
|
||||
String str = text.subSequence(start, end).toString();
|
||||
drawText(str, x, y, paint);
|
||||
}
|
||||
|
||||
public void drawRoundRect(@NonNull RectF rect, float rx, float ry, @NonNull Paint paint) {
|
||||
throw new RuntimeException("Stub!");
|
||||
}
|
||||
|
||||
public void drawRoundRect(float left, float top, float right, float bottom, float rx, float ry,
|
||||
@NonNull Paint paint) {
|
||||
throw new RuntimeException("Stub!");
|
||||
}
|
||||
|
||||
public void drawPath(@NonNull Path path, @NonNull Paint paint) {
|
||||
throw new RuntimeException("Stub!");
|
||||
}
|
||||
|
||||
public void translate(float dx, float dy) {
|
||||
if (dx == 0.0f && dy == 0.0f) return;
|
||||
// TODO: check this, should translations stack?
|
||||
canvas.translate(dx, dy);
|
||||
}
|
||||
|
||||
public void scale(float sx, float sy) {
|
||||
if (sx == 1.0f && sy == 1.0f) return;
|
||||
canvas.scale(sx, sy);
|
||||
}
|
||||
|
||||
public final void scale(float sx, float sy, float px, float py) {
|
||||
if (sx == 1.0f && sy == 1.0f) return;
|
||||
translate(px, py);
|
||||
scale(sx, sy);
|
||||
translate(-px, -py);
|
||||
}
|
||||
|
||||
public void rotate(float degrees) {
|
||||
if (degrees == 0.0f) return;
|
||||
canvas.rotate(degrees);
|
||||
}
|
||||
|
||||
public final void rotate(float degrees, float px, float py) {
|
||||
if (degrees == 0.0f) return;
|
||||
canvas.rotate(degrees, px, py);
|
||||
}
|
||||
|
||||
public int getSaveCount() {
|
||||
return transformStack.size();
|
||||
}
|
||||
|
||||
public int save() {
|
||||
transformStack.add(canvas.getTransform());
|
||||
return getSaveCount();
|
||||
}
|
||||
|
||||
public void restoreToCount(int saveCount) {
|
||||
if (saveCount < 1) {
|
||||
throw new IllegalArgumentException(
|
||||
"Underflow in restoreToCount - more restores than saves");
|
||||
}
|
||||
if (saveCount > getSaveCount()) {
|
||||
throw new IllegalArgumentException("Overflow in restoreToCount");
|
||||
|
||||
}
|
||||
AffineTransform ts = transformStack.get(saveCount - 1);
|
||||
canvas.setTransform(ts);
|
||||
while (transformStack.size() >= saveCount) {
|
||||
transformStack.remove(transformStack.size() - 1);
|
||||
}
|
||||
}
|
||||
|
||||
public void restore() {
|
||||
restoreToCount(getSaveCount());
|
||||
}
|
||||
|
||||
public boolean getClipBounds(@NonNull Rect bounds) {
|
||||
Rectangle r = canvas.getClipBounds();
|
||||
if (r == null) {
|
||||
bounds.left = 0;
|
||||
bounds.top = 0;
|
||||
bounds.right = canvasImage.getWidth();
|
||||
bounds.bottom = canvasImage.getHeight();
|
||||
return true;
|
||||
}
|
||||
bounds.left = r.x;
|
||||
bounds.top = r.y;
|
||||
bounds.right = r.x + r.width;
|
||||
bounds.bottom = r.y + r.height;
|
||||
return r.width != 0 && r.height != 0;
|
||||
}
|
||||
|
||||
private void applyPaint(Paint paint) {
|
||||
canvas.setFont(paint.getFont());
|
||||
java.awt.Color color = Color.valueOf(paint.getColorLong()).toJavaColor();
|
||||
canvas.setColor(color);
|
||||
canvas.setStroke(new BasicStroke(paint.getStrokeWidth(), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
|
||||
if (paint.isAntiAlias()) {
|
||||
canvas.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||
} else {
|
||||
canvas.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
|
||||
}
|
||||
if (paint.isDither()) {
|
||||
canvas.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
|
||||
} else {
|
||||
canvas.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
|
||||
}
|
||||
// TODO: use more from paint?
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user