KEY_TYPED events do not have a keyLocation; this value
+ * is used instead.
+ * @since 1.4
+ */
+ int KEY_LOCATION_UNKNOWN = 0;
+
+ /**
+ * A constant indicating that the key pressed or released
+ * is not distinguished as the left or right version of a key,
+ * and did not originate on the numeric keypad (or did not
+ * originate with a virtual key corresponding to the numeric
+ * keypad).
+ * @since 1.4
+ */
+ int KEY_LOCATION_STANDARD = 1;
+
+ /**
+ * A constant indicating that the key pressed or released is in
+ * the left key location (there is more than one possible location
+ * for this key). Example: the left shift key.
+ * @since 1.4
+ */
+ int KEY_LOCATION_LEFT = 2;
+
+ /**
+ * A constant indicating that the key pressed or released is in
+ * the right key location (there is more than one possible location
+ * for this key). Example: the right shift key.
+ * @since 1.4
+ */
+ int KEY_LOCATION_RIGHT = 3;
+
+ /**
+ * A constant indicating that the key event originated on the
+ * numeric keypad or with a virtual key corresponding to the
+ * numeric keypad.
+ * @since 1.4
+ */
+ int KEY_LOCATION_NUMPAD = 4;
+}
diff --git a/core/src/main/java/it/cavallium/warppi/device/PIHardwareDisplay.java b/core/src/main/java/it/cavallium/warppi/device/PIHardwareDisplay.java
index 8a506681..f652581e 100644
--- a/core/src/main/java/it/cavallium/warppi/device/PIHardwareDisplay.java
+++ b/core/src/main/java/it/cavallium/warppi/device/PIHardwareDisplay.java
@@ -13,7 +13,7 @@ public class PIHardwareDisplay implements HardwareDisplay {
@Override
public void setBrightness(final double value) {
- if (Engine.getPlatform().getSettings().isDebugEnabled() == false) {
+ if (Engine.getPlatform().isRunningOnRaspberry()) {
Engine.getPlatform().getGpio().pwmWrite(12, (int) Math.ceil(value * 1024f));
// SoftPwm.softPwmWrite(12, (int)(Math.ceil(brightness*10)));
} else {
diff --git a/core/src/main/java/it/cavallium/warppi/device/graphicengine/RAWFont.java b/core/src/main/java/it/cavallium/warppi/device/graphicengine/RAWFont.java
index 1be75b02..d344d79a 100644
--- a/core/src/main/java/it/cavallium/warppi/device/graphicengine/RAWFont.java
+++ b/core/src/main/java/it/cavallium/warppi/device/graphicengine/RAWFont.java
@@ -1,7 +1,5 @@
package it.cavallium.warppi.device.graphicengine;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferInt;
import java.io.File;
import java.io.IOException;
import java.lang.ref.WeakReference;
@@ -9,8 +7,6 @@ import java.net.URL;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.imageio.ImageIO;
-
import it.cavallium.warppi.Engine;
import it.cavallium.warppi.util.ClassUtils;
import it.cavallium.warppi.util.Utils;
@@ -135,18 +131,6 @@ public class RAWFont {
return indexes;
}
- @SuppressWarnings("unused")
- private void saveArray(final int[] screen, final String coutputpng) {
- final BufferedImage bi = new BufferedImage(300, 200, BufferedImage.TYPE_INT_RGB);
- final int[] a = ((DataBufferInt) bi.getRaster().getDataBuffer()).getData();
- System.arraycopy(screen, 0, a, 0, screen.length);
- try {
- ImageIO.write(bi, "PNG", new File(coutputpng));
- } catch (final IOException ex) {
- Logger.getLogger(RAWFont.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
-
public void drawText(final int[] screen, final int[] screenSize, final int x, final int y, final int[] text,
final int color) {
final int screenLength = screen.length;
diff --git a/core/src/main/java/it/cavallium/warppi/extra/mario/MarioScreen.java b/core/src/main/java/it/cavallium/warppi/extra/mario/MarioScreen.java
index 70f9a000..a7a310f1 100644
--- a/core/src/main/java/it/cavallium/warppi/extra/mario/MarioScreen.java
+++ b/core/src/main/java/it/cavallium/warppi/extra/mario/MarioScreen.java
@@ -7,6 +7,7 @@ import it.cavallium.warppi.StaticVars;
import it.cavallium.warppi.Platform.ConsoleUtils;
import it.cavallium.warppi.device.Keyboard;
import it.cavallium.warppi.event.KeyPressedEvent;
+import it.cavallium.warppi.event.KeyReleasedEvent;
import it.cavallium.warppi.gui.HistoryBehavior;
import it.cavallium.warppi.gui.graphicengine.BinaryFont;
import it.cavallium.warppi.gui.graphicengine.Skin;
@@ -43,6 +44,43 @@ public class MarioScreen extends Screen {
historyBehavior = HistoryBehavior.ALWAYS_KEEP_IN_HISTORY;
}
+ @Override
+ public void graphicInitialized() {
+ try {
+ if (MarioScreen.skin == null) {
+ MarioScreen.skin = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadSkin("/marioskin.png");
+ }
+ if (MarioScreen.groundskin == null) {
+ MarioScreen.groundskin = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadSkin("/marioground.png");
+ }
+ if (MarioScreen.gpuTest2 == null) {
+ try {
+ MarioScreen.gpuTest2 = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadFont("N:\\gputest\\gputest2");
+ } catch (final Exception ex) {}
+ }
+ if (MarioScreen.gpuTest1 == null) {
+ try {
+ MarioScreen.gpuTest1 = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadFont("N:\\gputest\\gputest12");
+ MarioScreen.gpuTest12 = true;
+ } catch (final Exception ex) {
+ MarioScreen.gpuTest12 = false;
+ try {
+ MarioScreen.gpuTest1 = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadFont("N:\\gputest\\gputest1");
+ } catch (final Exception ex2) {}
+ }
+ }
+ if (MarioScreen.gpuTest3 == null) {
+ try {
+ MarioScreen.gpuTest3 = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadSkin("N:\\gputest\\font_gputest3.png");
+ } catch (final Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ } catch (final IOException e) {
+ e.printStackTrace();
+ }
+ }
+
@Override
public void initialized() {
try {
@@ -87,12 +125,49 @@ public class MarioScreen extends Screen {
}
}
+ boolean rightPressed, leftPressed, jumpPressed;
+
+ @Override
+ public boolean onKeyPressed(KeyPressedEvent k) {
+ switch(k.getKey()) {
+ case OK:
+ case SIMPLIFY:
+ case STEP:
+ jumpPressed = true;
+ return true;
+ case LEFT:
+ leftPressed = true;
+ return true;
+ case RIGHT:
+ rightPressed = true;
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ @Override
+ public boolean onKeyReleased(KeyReleasedEvent k) {
+ switch(k.getKey()) {
+ case OK:
+ case SIMPLIFY:
+ case STEP:
+ jumpPressed = false;
+ return true;
+ case LEFT:
+ leftPressed = false;
+ return true;
+ case RIGHT:
+ rightPressed = false;
+ return true;
+ default:
+ return false;
+ }
+ }
+
@Override
public void beforeRender(final float dt) {
if (!errored) {
- final boolean rightPressed = Keyboard.isKeyDown(2, 5);
- final boolean leftPressed = Keyboard.isKeyDown(2, 3);
- final boolean jumpPressed = Keyboard.isKeyDown(2, 1);
final boolean upPressed = false, downPressed = false, runPressed = false;
g.gameTick(dt, upPressed, downPressed, leftPressed, rightPressed, jumpPressed, runPressed);
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/BlockType.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/BlockColor.java
similarity index 62%
rename from core/src/main/java/it/cavallium/warppi/extra/tetris/BlockType.java
rename to core/src/main/java/it/cavallium/warppi/extra/tetris/BlockColor.java
index c359f9dd..cc784d60 100644
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/BlockType.java
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/BlockColor.java
@@ -1,10 +1,11 @@
-package it.cavallium.warppi.extra.tetris;
-
-public enum BlockType {
- RED,
- GREEN,
- YELLOW,
- BLUE,
- ORANGE,
- VIOLET
-}
+package it.cavallium.warppi.extra.tetris;
+
+public enum BlockColor {
+ RED,
+ GREEN,
+ BLUE,
+ YELLOW,
+ ORANGE,
+ PURPLE,
+ CYAN
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/ButtonInfo.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/ButtonInfo.java
new file mode 100644
index 00000000..33ec0ddc
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/ButtonInfo.java
@@ -0,0 +1,38 @@
+package it.cavallium.warppi.extra.tetris;
+
+public class ButtonInfo {
+
+ public volatile int pressedCount = 0;
+ public volatile int releasedCount = 0;
+ public volatile int unreadCount = 0;
+
+ public ButtonInfo() {
+
+ }
+
+ public void press() {
+ if (pressedCount <= releasedCount) {
+ pressedCount = releasedCount + 1;
+ unreadCount++;
+ }
+ }
+
+ public void release() {
+ releasedCount++;
+ pressedCount = releasedCount;
+ }
+
+ public int readPressed() {
+ int val = unreadCount;
+ unreadCount = 0;
+ return val;
+ }
+
+ public boolean hasUnreadData() {
+ return unreadCount > 0;
+ }
+
+ public boolean isPressedNow() {
+ return pressedCount > releasedCount;
+ }
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioBlock.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioBlock.java
deleted file mode 100644
index d463e236..00000000
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioBlock.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package it.cavallium.warppi.extra.tetris;
-
-public class MarioBlock {
- private final int x;
- private final int y;
- private final byte id;
-
- public MarioBlock(final int x, final int y, final byte b) {
- this.x = x;
- this.y = y;
- id = b;
- }
-
- public boolean isSolid() {
- return MarioBlock.isSolid(id);
- }
-
- public byte getID() {
- return id;
- }
-
- public int getX() {
- return x;
- }
-
- public int getY() {
- return y;
- }
-
- public static boolean isSolid(final byte id) {
- return id != 0b0;
- }
-}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEnemy.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEnemy.java
deleted file mode 100644
index e6b5c120..00000000
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEnemy.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package it.cavallium.warppi.extra.tetris;
-
-public class MarioEnemy extends MarioEntity {
-
- public MarioEnemy(final double x, final double y, final double forceX, final double forceY, final boolean onGround, final boolean subjectToGravity) {
- super(x, y, forceX, forceY, onGround, subjectToGravity);
- }
-
-}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEntity.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEntity.java
deleted file mode 100644
index c563449f..00000000
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEntity.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package it.cavallium.warppi.extra.tetris;
-
-public class MarioEntity {
- protected double x;
- protected double y;
- public double forceX;
- public double forceY;
- public boolean collisionUp;
- public boolean collisionDown;
- public boolean collisionLeft;
- public boolean collisionRight;
- public boolean subjectToGravity;
-
- public MarioEntity(final double x, final double y, final double forceX, final double forceY, final boolean onGround, final boolean subjectToGravity) {
- this.x = x;
- this.y = y;
- this.forceX = forceX;
- this.forceY = forceY;
- collisionDown = onGround;
- this.subjectToGravity = subjectToGravity;
- }
-
- public void setPosition(final double x, final double y) {
- this.x = x;
- this.y = y;
- }
-
- public void setPosition(final double x, final double y, final boolean onGround) {
- this.x = x;
- this.y = y;
- collisionDown = onGround;
- }
-
- public double getX() {
- return x;
- }
-
- public double getY() {
- return y;
- }
-
- public boolean isOnGround() {
- return collisionDown;
- }
-
- public void setOnGround(final boolean onGround) {
- collisionDown = onGround;
- }
-
- public void gameTick(final double dt) {
- x = computeFutureDX(dt);
- y = computeFutureDY(dt);
- forceX = computeFutureForceDX(dt);
- forceY = computeFutureForceDY(dt);
- }
-
- public double computeFutureDX(final double dt) {
- return x + dt * forceX - x;
- }
-
- public double computeFutureDY(final double dt) {
- final double forceY = this.forceY;
- double y = this.y;
- if (!collisionDown) {
- y += dt * forceY;
- }
- return y - this.y;
- }
-
- public double computeFutureForceDX(final double dt) {
- double forceX = this.forceX;
- forceX *= 0.75;
- return forceX - this.forceX;
- }
-
- public double computeFutureForceDY(final double dt) {
- double forceY = this.forceY;
- if (subjectToGravity && !collisionDown) {
- forceY -= dt * 1569.6 / 16f;
- } else {
- forceY *= 0.75;
- }
- return forceY - this.forceY;
- }
-}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEvent.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEvent.java
deleted file mode 100644
index 9a2023c5..00000000
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioEvent.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package it.cavallium.warppi.extra.tetris;
-
-public class MarioEvent {
-
-}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioWorld.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioWorld.java
deleted file mode 100644
index 5166e236..00000000
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/MarioWorld.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package it.cavallium.warppi.extra.tetris;
-
-public class MarioWorld {
-
- private final int[] spawnPoint;
- private final int width;
- private final int height;
- private final byte[][] data;
- @SuppressWarnings("unused")
- private final MarioEvent[] events;
- private final MarioEntity[] entities;
-
- /**
- * @param width
- * @param height
- * @param data
- * @param events
- * @param marioEnemies
- */
- public MarioWorld(final int[] spawnPoint, final int width, final int height, final byte[][] data, final MarioEvent[] events, final MarioEntity[] entities) {
- this.spawnPoint = spawnPoint;
- this.width = width;
- this.height = height;
- this.data = data;
- this.events = events;
- this.entities = entities;
- }
-
- public byte getBlockIdAt(final int x, final int y) {
- final int idy = height - 1 - y;
- if (idy < 0 || idy >= data.length) {
- return 0b0;
- }
- final int idx = x;
- if (idx < 0 || idx >= data[0].length) {
- return 0b0;
- }
- return data[idy][idx];
- }
-
- public MarioBlock getBlockAt(final int x, final int y) {
- return new MarioBlock(x, y, getBlockIdAt(x, y));
- }
-
- public int getWidth() {
- return width;
- }
-
- public int getHeight() {
- return height;
- }
-
- public void reset() {
-
- }
-
- public double getSpawnPointX() {
- return spawnPoint[0];
- }
-
- public double getSpawnPointY() {
- return spawnPoint[1];
- }
-
- public MarioEntity[] getEntities() {
- return entities;
- }
-
-}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/PlayerEntity.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/PlayerEntity.java
deleted file mode 100644
index e74655b1..00000000
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/PlayerEntity.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package it.cavallium.warppi.extra.tetris;
-
-public class PlayerEntity extends MarioEntity {
-
- @SuppressWarnings("unused")
- private final int life;
- public float walkAnimation = 0;
- public float jumptime = 0;
- public boolean walking = false;
- public boolean running = false;
- public boolean jumping = false;
- public boolean flipped = false;
- public int[] marioSkinPos = new int[] { 0, 0 };
- private double controllerDX;
- private double controllerDY;
-
- public PlayerEntity(final double x, final double y, final int life) {
- super(x, y, 0, 0, true, true);
- this.life = life;
- }
-
- @Override
- public void gameTick(final double dt) {
- walkAnimation += dt;
- x += computeFutureDX(dt);
- y += computeFutureDY(dt);
- forceX += computeFutureForceDX(dt);
- forceY += computeFutureForceDY(dt);
- if (controllerDX == 0) {
- walking = false;
- walkAnimation = 0;
- } else {
- if (controllerDX > 0) { //RIGHT
- walking = true;
- flipped = false;
- }
- if (controllerDX < 0) { //LEFT
- walking = true;
- flipped = true;
- }
- }
- if (controllerDY > 0) { //JUMP
- if (collisionUp) {
- jumptime = Float.MAX_VALUE;
- jumping = false;
- }
- jumptime += dt;
- if (jumptime <= 0.5f && !jumping && collisionDown) {
- jumping = true;
- collisionDown = false;
- } else if (jumptime <= 0.5f) {} else {
- jumping = false;
- }
- } else {
- jumping = false;
- if (collisionDown) {
- jumptime = 0;
- } else {
- jumptime = Float.MAX_VALUE;
- }
- }
- if (!walking & !running & !jumping) {
- marioSkinPos[0] = 0;
- marioSkinPos[1] = 0;
- } else if (collisionDown & walking & !running & !jumping && walkAnimation >= 0.08) {
- while (walkAnimation > 0.08) {
- walkAnimation -= 0.08;
- if (marioSkinPos[0] == 1 & marioSkinPos[1] == 0) {
- marioSkinPos[0] += 2;
- } else if (marioSkinPos[0] == 3 & marioSkinPos[1] == 0) {
- marioSkinPos[0] -= 1;
- } else if (marioSkinPos[0] == 2 & marioSkinPos[1] == 0) {
- marioSkinPos[0] -= 1;
- } else {
- marioSkinPos[0] = 1;
- marioSkinPos[1] = 0;
- }
- }
- } else if (jumping) {
- marioSkinPos[0] = 5;
- marioSkinPos[1] = 1;
- }
- }
-
- @Override
- public double computeFutureDX(final double dt) {
- return super.computeFutureDX(dt);
- }
-
- public double computeFuturedDY(final double dt) {
- return super.computeFutureDY(dt);
- }
-
- @Override
- public double computeFutureForceDX(final double dt) {
- double forceX = this.forceX;
- if (controllerDX == 0) {} else {
- if (controllerDX > 0) {
- if (forceX < 500f / 16f) {
- forceX += dt * 500f / 16f;
- }
- }
- if (controllerDX < 0) {
- if (forceX > -500f / 16f) {
- forceX -= dt * 500f / 16f;
- }
- }
- }
-
- return forceX + super.computeFutureForceDX(dt) - this.forceX;
- }
-
- @Override
- public double computeFutureForceDY(final double dt) {
- float jumptime = this.jumptime;
- double forceY = this.forceY;
- if (controllerDY > 0) { //JUMP
- if (collisionUp) {
- jumptime = Float.MAX_VALUE;
- }
- jumptime += dt;
- if (jumptime <= 0.5f && !jumping && collisionDown) {
- forceY = dt * (4 * 1569.6f) / 16f;
- } else if (jumptime <= 0.5f) {
- forceY = dt * (4 * 1569.6f) / 16f;
- }
- }
- return forceY + super.computeFutureForceDY(dt) - this.forceY;
- }
-
- public void move(final float dt, final double dX, final double dY) {
- walkAnimation += dt;
-
- controllerDX = dX;
- controllerDY = dY;
- }
-
-}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/PositionEvent.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/PositionEvent.java
deleted file mode 100644
index ad8ebd03..00000000
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/PositionEvent.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package it.cavallium.warppi.extra.tetris;
-
-public class PositionEvent extends MarioEvent {
-
-}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrisGame.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrisGame.java
index 3a3bc5a9..505d71c2 100644
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrisGame.java
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrisGame.java
@@ -1,21 +1,234 @@
package it.cavallium.warppi.extra.tetris;
+import java.util.Arrays;
+
public class TetrisGame {
- private static final int WIDTH = 10, HEIGHT = 22;
- private BlockType[] grid;
- private BlockType[] hovergrid;
- private GameStatus gameStatus = GameStatus.INITIAL;
- private int score = 0;
-
+ public static final int WIDTH = 10, HEIGHT = 22;
+ public static final double TICK_TIME = 0.25, DOWN_TIME = 0.10, MOVE_TIMER = 0.125;
+ private double tickTimer, downTimer, leftTimer, rightTimer, upTimer;
+ private BlockColor[] grid;
+ private BlockColor[] hovergrid;
+ private volatile BlockColor[] renderedGrid;
+ private GameStatus gameStatus;
+ private int score;
+ private double currentTime;
+ private Tetromino currentTetromino;
+ private Tetromino nextTetromino;
+
public TetrisGame() {
-
+ resetVariables();
}
- private void playAgain() {
- grid = new BlockType[WIDTH * HEIGHT];
- hovergrid = new BlockType[WIDTH * HEIGHT];
- score = 0;
+ void playAgain() {
+ resetVariables();
gameStatus = GameStatus.PLAYING;
+ placeNextTetromino();
+ }
+
+ private void resetVariables() {
+ grid = new BlockColor[WIDTH * HEIGHT];
+ hovergrid = new BlockColor[WIDTH * HEIGHT];
+ renderedGrid = new BlockColor[WIDTH * HEIGHT];
+ score = 0;
+ currentTime = 0;
+ tickTimer = 0;
+ gameStatus = GameStatus.INITIAL;
+ currentTetromino = null;
+ nextTetromino = generateRandomTetromino();
+ nextTetromino.fixInitialPosition();
+ }
+
+ public void update(float dt, ButtonInfo leftPressed, ButtonInfo rightPressed, ButtonInfo downPressed,
+ ButtonInfo upPressed, ButtonInfo okPressed, ButtonInfo backPressed) {
+ currentTime += dt;
+ tickTimer += dt;
+ leftTimer += dt;
+ rightTimer += dt;
+ downTimer += dt;
+ upTimer += dt;
+ if (leftPressed.hasUnreadData()) {
+ for (int i = leftPressed.readPressed(); i > 0; i--) {
+ move(this.currentTetromino, -1, 0, 0);
+ }
+ leftTimer = -MOVE_TIMER;
+ } else if (leftPressed.isPressedNow()) {
+ while (leftTimer >= MOVE_TIMER) {
+ leftTimer -= MOVE_TIMER;
+ move(this.currentTetromino, -1, 0, 0);
+ }
+ } else {
+ leftTimer = 0;
+ }
+ if (rightPressed.hasUnreadData()) {
+ for (int i = rightPressed.readPressed(); i > 0; i--) {
+ move(this.currentTetromino, 1, 0, 0);
+ }
+ rightTimer = -MOVE_TIMER;
+ } else if (rightPressed.isPressedNow()) {
+ while (rightTimer >= MOVE_TIMER) {
+ rightTimer -= MOVE_TIMER;
+ move(this.currentTetromino, 1, 0, 0);
+ }
+ } else {
+ rightTimer = 0;
+ }
+ if (upPressed.hasUnreadData()) {
+ for (int i = upPressed.readPressed(); i > 0; i--) {
+ move(this.currentTetromino, 0, 0, 1);
+ }
+ upTimer = -MOVE_TIMER;
+ } else if (upPressed.isPressedNow()) {
+ while (upTimer >= MOVE_TIMER) {
+ upTimer -= MOVE_TIMER;
+ move(this.currentTetromino, 0, 0, 1);
+ }
+ } else {
+ upTimer = 0;
+ }
+ if (downPressed.isPressedNow()) {
+ downPressed.readPressed();
+ while (downTimer >= DOWN_TIME) {
+ downTimer -= DOWN_TIME;
+ move(this.currentTetromino, 0, 1, 0);
+ }
+ } else {
+ downTimer = 0;
+ }
+ while (tickTimer >= TICK_TIME) {
+ tickTimer -= TICK_TIME;
+ gameTick(leftPressed, rightPressed, downPressed, okPressed, backPressed);
+ }
+ if (gameStatus == GameStatus.INITIAL) {
+ playAgain();
+ } else {
+
+ }
+ renderGrid();
+ }
+
+ public void gameTick(ButtonInfo leftPressed, ButtonInfo rightPressed, ButtonInfo downPressed, ButtonInfo okPressed,
+ ButtonInfo backPressed) {
+ if (move(this.currentTetromino, 0, 1, 0)) {
+
+ } else {
+ // Spawn new tetromino and write the old to the permanent grid
+ drawCurrentTetromino(grid);
+ checkLines();
+ placeNextTetromino();
+ if (move(this.currentTetromino, 0, 0, 0) == false) {
+ // Lose
+ this.gameStatus = GameStatus.LOST;
+ playAgain();
+ }
+ }
+ }
+
+ private void checkLines() {
+ for (int i = HEIGHT - 1; i >= 0; i--) {
+ boolean scored = true;
+ while (scored) {
+ for (int x = 0; x < WIDTH; x++) {
+ if (this.grid[x + i * WIDTH] == null) {
+ scored = false;
+ break;
+ }
+ }
+ if (scored) {
+ this.score += WIDTH;
+ for (int x = 0; x < WIDTH; x++) {
+ int y = i;
+ while (y > 0) {
+ this.grid[x + (y) * WIDTH] = this.grid[x + (y - 1) * WIDTH];
+ y--;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private boolean move(Tetromino t, int dX, int dY, int dRotation) {
+ byte rot = (byte) ((t.getRotation() + dRotation) % 4);
+ boolean[] block = t.getRenderedBlock(rot);
+ int blockSize = t.getTetrominoGridSize();
+ int half1 = (int) Math.floor(((double) t.getTetrominoGridSize()) / 2d);
+ int half2 = blockSize - half1;
+ byte aX = (byte) (t.getX() + dX), aY = (byte) (t.getY() + dY);
+ int blockX = 0, blockY = 0;
+ for (int x = aX - half1; x < aX + half2; x++) {
+ for (int y = aY - half1; y < aY + half2; y++) {
+ if (block[blockX + blockY * blockSize] == true) {
+ if (x >= 0 & y >= 0 & x < WIDTH & (x + y * WIDTH) < this.grid.length) {
+ if (this.grid[x + y * WIDTH] != null) {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+ blockY++;
+ }
+ blockY = 0;
+ blockX++;
+ }
+ t.setRotation(rot);
+ t.setX(aX);
+ t.setY(aY);
+ return true;
+ }
+
+ public void renderGrid() {
+ this.renderedGrid = Arrays.copyOf(grid, grid.length);
+ drawCurrentTetromino(this.renderedGrid);
+ for (int y = 0; y < HEIGHT; y++) {
+ for (int x = 0; x < WIDTH; x++) {
+ final int offset = x + y * WIDTH;
+ renderedGrid[offset] = hovergrid[offset] != null ? hovergrid[offset] : renderedGrid[offset];
+ }
+ }
+ }
+
+ private void placeNextTetromino() {
+ currentTetromino = nextTetromino;
+ nextTetromino = generateRandomTetromino();
+ nextTetromino.fixInitialPosition();
+ }
+
+ private Tetromino generateRandomTetromino() {
+ int s = (int) (Math.random() * 7);
+ final byte middleX = (byte) ((WIDTH - 1) / 2), middleY = 0, rotation = (byte) (Math.random() * 4);
+ switch (s) {
+ case 0:
+ return new TetrominoICyan(middleX, middleY, rotation);
+ case 1:
+ return new TetrominoJBlue(middleX, middleY, rotation);
+ case 2:
+ return new TetrominoLOrange(middleX, middleY, rotation);
+ case 3:
+ return new TetrominoOYellow(middleX, middleY, rotation);
+ case 4:
+ return new TetrominoSGreen(middleX, middleY, rotation);
+ case 5:
+ return new TetrominoTPurple(middleX, middleY, rotation);
+ default:
+ return new TetrominoZRed(middleX, middleY, rotation);
+ }
+ }
+
+ public Tetromino getNextTetromino() {
+ return this.nextTetromino;
+ }
+
+ private void drawCurrentTetromino(BlockColor[] grid) {
+ currentTetromino.draw(grid, WIDTH);
+ }
+
+ public BlockColor[] getRenderedGrid() {
+ return renderedGrid;
+ }
+
+ public int getScore() {
+ return this.score;
}
}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrisScreen.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrisScreen.java
index 23dae466..64e954d2 100644
--- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrisScreen.java
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrisScreen.java
@@ -5,8 +5,12 @@ import java.io.IOException;
import it.cavallium.warppi.Engine;
import it.cavallium.warppi.StaticVars;
import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.event.KeyPressedEvent;
+import it.cavallium.warppi.event.KeyReleasedEvent;
import it.cavallium.warppi.gui.HistoryBehavior;
import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
import it.cavallium.warppi.gui.graphicengine.Skin;
import it.cavallium.warppi.gui.screens.Screen;
@@ -14,6 +18,22 @@ public class TetrisScreen extends Screen {
private TetrisGame g;
+ private ButtonInfo leftPressed = new ButtonInfo();
+
+ private ButtonInfo rightPressed = new ButtonInfo();
+
+ private ButtonInfo upPressed = new ButtonInfo();
+
+ private ButtonInfo downPressed = new ButtonInfo();
+
+ private ButtonInfo okPressed = new ButtonInfo();
+
+ private ButtonInfo backPressed = new ButtonInfo();
+
+ private GraphicEngine e;
+
+ private Renderer r;
+
private static Skin skin;
public TetrisScreen() {
@@ -23,155 +43,143 @@ public class TetrisScreen extends Screen {
@Override
public void initialized() {
-// try {
-// if (TetrisScreen.skin == null) {
-// TetrisScreen.skin = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadSkin("/marioskin.png");
-// }
-// if (TetrisScreen.groundskin == null) {
-// TetrisScreen.groundskin = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadSkin("/marioground.png");
-// }
-// if (TetrisScreen.gpuTest2 == null) {
-// try {
-// TetrisScreen.gpuTest2 = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadFont("N:\\gputest\\gputest2");
-// } catch (final Exception ex) {}
-// }
-// if (TetrisScreen.gpuTest1 == null) {
-// try {
-// TetrisScreen.gpuTest1 = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadFont("N:\\gputest\\gputest12");
-// TetrisScreen.gpuTest12 = true;
-// } catch (final Exception ex) {
-// TetrisScreen.gpuTest12 = false;
-// try {
-// TetrisScreen.gpuTest1 = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadFont("N:\\gputest\\gputest1");
-// } catch (final Exception ex2) {}
-// }
-// }
-// if (TetrisScreen.gpuTest3 == null) {
-// try {
-// TetrisScreen.gpuTest3 = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadSkin("N:\\gputest\\font_gputest3.png");
-// } catch (final Exception ex) {
-// ex.printStackTrace();
-// }
-// }
-// } catch (final IOException e) {
-// e.printStackTrace();
-// }
+ StaticVars.windowZoom.onNext(2f);
+ }
+
+ @Override
+ public void graphicInitialized() {
+ try {
+ e = d.engine;
+ r = d.renderer;
+ if (TetrisScreen.skin == null) {
+ TetrisScreen.skin = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.loadSkin("/tetrisskin.png");
+ }
+ } catch (final IOException e) {
+ e.printStackTrace();
+ }
}
@Override
public void created() throws InterruptedException {
-// if (!errored) {
-// g = new MarioGame();
-// }
+ g = new TetrisGame();
}
@Override
public void beforeRender(final float dt) {
-// if (!errored) {
-// final boolean rightPressed = Keyboard.isKeyDown(2, 5);
-// final boolean leftPressed = Keyboard.isKeyDown(2, 3);
-// final boolean jumpPressed = Keyboard.isKeyDown(2, 1);
-// final boolean upPressed = false, downPressed = false, runPressed = false;
-// g.gameTick(dt, upPressed, downPressed, leftPressed, rightPressed, jumpPressed, runPressed);
-//
-// gpuTestElapsed += dt;
-// while (gpuTestElapsed >= 0.04) {
-// gpuTestNum = (gpuTestNum + 1) % gpuTestMax;
-// gpuTestElapsed -= 0.04;
-// }
-// gpuCharTestt1Elapsed += dt;
-// while (gpuCharTestt1Elapsed >= 1.5) {
-// gpuCharTest1Num = (gpuCharTest1Num + 1) % gpuCharTest1.length;
-// gpuCharTestt1Elapsed -= 1.5;
-// }
-//
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glClearColor(0xff000000);
-// }
+ Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glClearColor(0xff000000);
+ g.update(dt, leftPressed, rightPressed, downPressed, upPressed, okPressed, backPressed);
}
@Override
public void render() {
-// if (errored) {
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringLeft(0, 20, "ERROR");
-// } else {
-// if (TetrisScreen.groundskin != null) {
-// final double playerX = g.getPlayer().getX();
-// final double playerY = g.getPlayer().getY();
-// TetrisScreen.groundskin.use(Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine);
-// final MarioWorld w = g.getCurrentWorld();
-// final int width = w.getWidth();
-// final int height = w.getHeight();
-// final float screenX = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getWidth() / 2f - 8f;
-// final float screenY = Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() / 2f - 8f;
-// final float shiftX = -8 + 16 * (float) playerX;
-// final float shiftY = -8 + 16 * (height - (float) playerY);
-// int blue = -1;
-// for (int ix = 0; ix < width; ix++) {
-// for (int iy = 0; iy < height; iy++) {
-// final double distX = Math.abs(playerX - ix);
-// final double distY = Math.abs(playerY - iy - 1.5d);
-// if (distX * distX + distY * distY / 2d < 25d) {
-// final byte b = w.getBlockIdAt(ix, iy);
-// if (b == 0) {
-// if (blue != 1) {
-// blue = 1;
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xff9290ff);
-// }
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glFillColor(screenX - shiftX + 16 * ix, screenY - shiftY + 16 * (height - iy), 16, 16);
-// } else {
-// if (blue != 0) {
-// blue = 0;
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xffffffff);
-// }
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glFillRect(screenX - shiftX + 16 * ix, screenY - shiftY + 16 * (height - iy), 16, 16, 0, 0, 16, 16);
-// }
-// }
-// }
-// }
-// if (blue != 0) {
-// blue = 0;
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xffffffff);
-// }
-//
-// //DRAW MARIO
-// TetrisScreen.skin.use(Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glFillRect(screenX - (g.getPlayer().flipped ? 3 : 0), screenY, 35, 27, 35 * (g.getPlayer().marioSkinPos[0] + (g.getPlayer().flipped ? 2 : 1)), 27 * g.getPlayer().marioSkinPos[1], 35 * (g.getPlayer().flipped ? -1 : 1), 27);
-//// PIDisplay.renderer.glDrawSkin(getPosX() - 18, 25 + getPosY(), 35 * (marioSkinPos[0] + (flipped ? 2 : 1)), 27 * marioSkinPos[1], 35 * (marioSkinPos[0] + (flipped ? 1 : 2)), 27 * (marioSkinPos[1] + 1), true);
-// }
-//
-//// GPU PERFORMANCE TEST
-// if (TetrisScreen.gpuTest1 != null) {
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor3f(1, 1, 1);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glFillColor(Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getWidth() - (TetrisScreen.gpuTest12 ? 512 : 256), Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() / 2 - (TetrisScreen.gpuTest12 ? 256 : 128), TetrisScreen.gpuTest12 ? 512 : 256, TetrisScreen.gpuTest12 ? 512 : 256);
-// TetrisScreen.gpuTest1.use(Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor3f(0, 0, 0);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringRight(Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getWidth(), Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() / 2 - (TetrisScreen.gpuTest12 ? 256 : 128), gpuCharTest1[gpuCharTest1Num]);
-// }
-// if (TetrisScreen.gpuTest3 != null) {
-// TetrisScreen.gpuTest3.use(Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor4f(1, 1, 1, 0.7f);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glFillRect(0, StaticVars.screenSize[1] - 128, 224, 128, gpuTestNum * 224, 0, 224, 128);
-// }
-// if (TetrisScreen.gpuTest2 != null) {
-// TetrisScreen.gpuTest2.use(Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xFF000000);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringRight(StaticVars.screenSize[0], Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() - TetrisScreen.gpuTest2.getCharacterHeight(), "A");
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xFF800000);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringRight(StaticVars.screenSize[0], Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() - TetrisScreen.gpuTest2.getCharacterHeight(), "B");
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xFFeea28e);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringRight(StaticVars.screenSize[0], Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() - TetrisScreen.gpuTest2.getCharacterHeight(), "C");
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xFFee7255);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringRight(StaticVars.screenSize[0], Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() - TetrisScreen.gpuTest2.getCharacterHeight(), "D");
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xFFeac0b0);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringRight(StaticVars.screenSize[0], Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() - TetrisScreen.gpuTest2.getCharacterHeight(), "E");
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xFFf3d8ce);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringRight(StaticVars.screenSize[0], Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() - TetrisScreen.gpuTest2.getCharacterHeight(), "F");
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glColor(0xFFffede7);
-// Engine.INSTANCE.getHardwareDevice().getDisplayManager().renderer.glDrawStringRight(StaticVars.screenSize[0], Engine.INSTANCE.getHardwareDevice().getDisplayManager().engine.getHeight() - TetrisScreen.gpuTest2.getCharacterHeight(), "G");
-// }
-// }
+ if (TetrisScreen.skin != null) {
+ TetrisScreen.skin.use(e);
+ }
+ r.glColor3f(1, 1, 1);
+ BlockColor[] renderedGrid = g.getRenderedGrid();
+ int centerScreen = StaticVars.screenSize[0]/2;
+ int centerGrid = TetrisGame.WIDTH*6/2-1;
+ final int leftOffset = centerScreen - centerGrid;
+ final int topOffset = StaticVars.screenSize[1] - TetrisGame.HEIGHT*6-1;
+ for (int y = 0; y < TetrisGame.HEIGHT; y++) {
+ for (int x = 0; x < TetrisGame.WIDTH; x++) {
+ final int offset = x+y*TetrisGame.WIDTH;
+ final BlockColor type = renderedGrid[offset];
+ if (type != null) {
+ r.glFillRect(leftOffset + x * 5, topOffset + (y+3) * 5, 5, 5, renderedGrid[offset].ordinal() * 5, 0, 5, 5);
+ } else {
+ r.glFillRect(leftOffset + x * 5, topOffset + (y+3) * 5, 5, 5, 7 * 5, 0, 5, 5);
+ }
+ }
+ }
+
+
+ Tetromino nextTetromino = g.getNextTetromino();
+ if (nextTetromino != null) {
+ r.glColor3f(0.25f, 0.25f, 0.25f);
+ r.glFillColor(leftOffset + (TetrisGame.WIDTH + 3) * 5, topOffset + 3 * 5, 5*4, 5*4);
+ r.glColor3f(1,1,1);
+ boolean[] renderedNextTetromino = nextTetromino.getRenderedBlock();
+ final BlockColor type = nextTetromino.getColor();
+ int nextTetrominoGridSize = nextTetromino.getTetrominoGridSize();
+ int nextGridOffset = 4*5/2 - nextTetrominoGridSize*5/2;
+ for (int y = 0; y < nextTetrominoGridSize; y++) {
+ for (int x = 0; x < nextTetrominoGridSize; x++) {
+ final int offset = x+y*nextTetrominoGridSize;
+ if (renderedNextTetromino[offset]) {
+ if (type != null) {
+ r.glFillRect(leftOffset + nextGridOffset + (TetrisGame.WIDTH + 3 + x) * 5, topOffset + nextGridOffset + (3 + y) * 5, 5, 5, type.ordinal() * 5, 0, 5, 5);
+ }
+ }
+ }
+ }
+ }
+ r.glColor3f(1,1,1);
+ r.glDrawStringLeft(leftOffset + (TetrisGame.WIDTH + 3) * 5, topOffset + (3+5) * 5, "SCORE:"+g.getScore());
}
-
+
+ @Override
+ public boolean onKeyPressed(KeyPressedEvent k) {
+ switch (k.getKey()) {
+ case LEFT: {
+ leftPressed.press();
+ return true;
+ }
+ case RIGHT: {
+ rightPressed.press();
+ return true;
+ }
+ case UP: {
+ upPressed.press();
+ return true;
+ }
+ case DOWN: {
+ downPressed.press();
+ return true;
+ }
+ case OK: {
+ okPressed.press();
+ g.playAgain();
+ return true;
+ }
+ case BACK: {
+ backPressed.press();
+ return true;
+ }
+ default: return false;
+ }
+ }
+
+ @Override
+ public boolean onKeyReleased(KeyReleasedEvent k) {
+ switch (k.getKey()) {
+ case LEFT: {
+ leftPressed.release();
+ return true;
+ }
+ case RIGHT: {
+ rightPressed.release();
+ return true;
+ }
+ case UP: {
+ upPressed.release();
+ return true;
+ }
+ case DOWN: {
+ downPressed.release();
+ return true;
+ }
+ case OK: {
+ okPressed.release();
+ return true;
+ }
+ case BACK: {
+ backPressed.release();
+ return true;
+ }
+ default: return false;
+ }
+ }
@Override
public boolean mustBeRefreshed() {
return true;
@@ -179,7 +187,6 @@ public class TetrisScreen extends Screen {
@Override
public String getSessionTitle() {
- return "Absolutely not Super Mario";
+ return "Tetris";
}
-
}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/Tetromino.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/Tetromino.java
new file mode 100644
index 00000000..ebadf3b2
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/Tetromino.java
@@ -0,0 +1,130 @@
+package it.cavallium.warppi.extra.tetris;
+
+public abstract class Tetromino {
+ private byte x, y, rotation;
+ private final TetrominoType type;
+ public final boolean o = false, w = true;
+
+ public Tetromino(byte x, byte y, byte rotation, TetrominoType type) {
+ super();
+ this.x = x;
+ this.y = y;
+ this.rotation = rotation;
+ this.type = type;
+ }
+
+ public byte getX() {
+ return x;
+ }
+
+ public void setX(byte x) {
+ this.x = x;
+ }
+
+ public byte getY() {
+ return y;
+ }
+
+ public void setY(byte y) {
+ this.y = y;
+ }
+
+ public byte getRotation() {
+ return rotation;
+ }
+
+ public void setRotation(byte rotation) {
+ this.rotation = rotation;
+ }
+
+ public TetrominoType getType() {
+ return type;
+ }
+
+ public BlockColor getColor() {
+ switch(type) {
+ case I_CYAN:
+ return BlockColor.CYAN;
+ case J_BLUE:
+ return BlockColor.BLUE;
+ case L_ORANGE:
+ return BlockColor.ORANGE;
+ case O_YELLOW:
+ return BlockColor.YELLOW;
+ case S_GREEN:
+ return BlockColor.GREEN;
+ case T_PURPLE:
+ return BlockColor.PURPLE;
+ case Z_RED:
+ return BlockColor.RED;
+ default:
+ return BlockColor.RED;
+ }
+ }
+
+ public void draw(BlockColor[] grid, final int WIDTH) {
+ boolean[] blockGrid = getRenderedBlock();
+ final int tetrominoGridSize = getTetrominoGridSize();
+ final int centerOffset = (int) Math.floor((double)tetrominoGridSize/2d);
+ final BlockColor type = getColor();
+ for (int bx = 0; bx < tetrominoGridSize; bx++) {
+ for (int by = 0; by < tetrominoGridSize; by++) {
+ if (blockGrid[bx+by*tetrominoGridSize] == w) {
+ final int index = x+bx-centerOffset + (y+by-centerOffset) * WIDTH;
+ if (index < grid.length && index >= 0) {
+ grid[index] = type;
+ }
+ }
+ }
+ }
+ }
+
+ public void fixInitialPosition() {
+ this.y += (byte) (this.getTetrominoGridSize()/2);
+ }
+
+ public abstract int getTetrominoGridSize();
+ protected abstract boolean[] getRenderedBlock(byte dRotation);
+ protected boolean[] getRenderedBlock() {
+ return getRenderedBlock(this.rotation);
+ }
+
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + rotation;
+ result = prime * result + ((type == null) ? 0 : type.hashCode());
+ result = prime * result + x;
+ result = prime * result + y;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Tetromino other = (Tetromino) obj;
+ if (rotation != other.rotation)
+ return false;
+ if (type != other.type)
+ return false;
+ if (x != other.x)
+ return false;
+ if (y != other.y)
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "Tetromino = {\n\t\"x\": \"" + x + "\",\n\ty\": \"" + y + "\",\n\trotation\": \"" + rotation + "\",\n\ttype\": \"" + type + "\"\n}";
+ }
+
+
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoICyan.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoICyan.java
new file mode 100644
index 00000000..d15a2d7e
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoICyan.java
@@ -0,0 +1,48 @@
+package it.cavallium.warppi.extra.tetris;
+
+public class TetrominoICyan extends Tetromino {
+ public TetrominoICyan(byte x, byte y, byte rotation) {
+ super(x, y, rotation, TetrominoType.I_CYAN);
+ }
+
+ @Override
+ public int getTetrominoGridSize() {
+ return 4;
+ }
+
+ @Override
+ public boolean[] getRenderedBlock(final byte rotation) {
+ switch(rotation) {
+ case 0:
+ return new boolean[] {
+ o,o,o,o,
+ w,w,w,w,
+ o,o,o,o,
+ o,o,o,o
+ };
+ case 1:
+ return new boolean[] {
+ o,o,w,o,
+ o,o,w,o,
+ o,o,w,o,
+ o,o,w,o
+ };
+ case 2:
+ return new boolean[] {
+ o,o,o,o,
+ o,o,o,o,
+ w,w,w,w,
+ o,o,o,o
+ };
+ case 3:
+ return new boolean[] {
+ o,w,o,o,
+ o,w,o,o,
+ o,w,o,o,
+ o,w,o,o
+ };
+ default:
+ throw new NullPointerException();
+ }
+ }
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoJBlue.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoJBlue.java
new file mode 100644
index 00000000..eae5698d
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoJBlue.java
@@ -0,0 +1,44 @@
+package it.cavallium.warppi.extra.tetris;
+
+public class TetrominoJBlue extends Tetromino {
+ public TetrominoJBlue(byte x, byte y, byte rotation) {
+ super(x, y, rotation, TetrominoType.J_BLUE);
+ }
+
+ @Override
+ public int getTetrominoGridSize() {
+ return 3;
+ }
+
+ @Override
+ public boolean[] getRenderedBlock(final byte rotation) {
+ switch(rotation) {
+ case 0:
+ return new boolean[] {
+ w,o,o,
+ w,w,w,
+ o,o,o
+ };
+ case 1:
+ return new boolean[] {
+ o,w,w,
+ o,w,o,
+ o,w,o
+ };
+ case 2:
+ return new boolean[] {
+ o,o,o,
+ w,w,w,
+ o,o,w
+ };
+ case 3:
+ return new boolean[] {
+ o,w,o,
+ o,w,o,
+ w,w,o
+ };
+ default:
+ throw new NullPointerException();
+ }
+ }
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoLOrange.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoLOrange.java
new file mode 100644
index 00000000..09d5d384
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoLOrange.java
@@ -0,0 +1,44 @@
+package it.cavallium.warppi.extra.tetris;
+
+public class TetrominoLOrange extends Tetromino {
+ public TetrominoLOrange(byte x, byte y, byte rotation) {
+ super(x, y, rotation, TetrominoType.L_ORANGE);
+ }
+
+ @Override
+ public int getTetrominoGridSize() {
+ return 3;
+ }
+
+ @Override
+ public boolean[] getRenderedBlock(final byte rotation) {
+ switch(rotation) {
+ case 0:
+ return new boolean[] {
+ o,o,w,
+ w,w,w,
+ o,o,o
+ };
+ case 1:
+ return new boolean[] {
+ o,w,o,
+ o,w,o,
+ o,w,w
+ };
+ case 2:
+ return new boolean[] {
+ o,o,o,
+ w,w,w,
+ w,o,o
+ };
+ case 3:
+ return new boolean[] {
+ w,w,o,
+ o,w,o,
+ o,w,o
+ };
+ default:
+ throw new NullPointerException();
+ }
+ }
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoOYellow.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoOYellow.java
new file mode 100644
index 00000000..7425a75d
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoOYellow.java
@@ -0,0 +1,19 @@
+package it.cavallium.warppi.extra.tetris;
+
+public class TetrominoOYellow extends Tetromino {
+ public TetrominoOYellow(byte x, byte y, byte rotation) {
+ super(x, y, rotation, TetrominoType.O_YELLOW);
+ }
+ @Override
+ public int getTetrominoGridSize() {
+ return 2;
+ }
+
+ @Override
+ public boolean[] getRenderedBlock(byte rotation) {
+ return new boolean[] {
+ w,w,
+ w,w,
+ };
+ }
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoSGreen.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoSGreen.java
new file mode 100644
index 00000000..1bb35053
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoSGreen.java
@@ -0,0 +1,44 @@
+package it.cavallium.warppi.extra.tetris;
+
+public class TetrominoSGreen extends Tetromino {
+ public TetrominoSGreen(byte x, byte y, byte rotation) {
+ super(x, y, rotation, TetrominoType.S_GREEN);
+ }
+
+ @Override
+ public int getTetrominoGridSize() {
+ return 3;
+ }
+
+ @Override
+ public boolean[] getRenderedBlock(final byte rotation) {
+ switch(rotation) {
+ case 0:
+ return new boolean[] {
+ o,w,w,
+ w,w,o,
+ o,o,o
+ };
+ case 1:
+ return new boolean[] {
+ o,w,o,
+ o,w,w,
+ o,o,w
+ };
+ case 2:
+ return new boolean[] {
+ o,o,o,
+ o,w,w,
+ w,w,o
+ };
+ case 3:
+ return new boolean[] {
+ w,o,o,
+ w,w,o,
+ o,w,o
+ };
+ default:
+ throw new NullPointerException();
+ }
+ }
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoTPurple.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoTPurple.java
new file mode 100644
index 00000000..4b187f3d
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoTPurple.java
@@ -0,0 +1,44 @@
+package it.cavallium.warppi.extra.tetris;
+
+public class TetrominoTPurple extends Tetromino {
+ public TetrominoTPurple(byte x, byte y, byte rotation) {
+ super(x, y, rotation, TetrominoType.T_PURPLE);
+ }
+
+ @Override
+ public int getTetrominoGridSize() {
+ return 3;
+ }
+
+ @Override
+ public boolean[] getRenderedBlock(byte rotation) {
+ switch(rotation) {
+ case 0:
+ return new boolean[] {
+ o,w,o,
+ w,w,w,
+ o,o,o
+ };
+ case 1:
+ return new boolean[] {
+ o,w,o,
+ o,w,w,
+ o,w,o
+ };
+ case 2:
+ return new boolean[] {
+ o,o,o,
+ w,w,w,
+ o,w,o
+ };
+ case 3:
+ return new boolean[] {
+ o,w,o,
+ w,w,o,
+ o,w,o
+ };
+ default:
+ throw new NullPointerException();
+ }
+ }
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoType.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoType.java
new file mode 100644
index 00000000..794fa4b9
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoType.java
@@ -0,0 +1,11 @@
+package it.cavallium.warppi.extra.tetris;
+
+public enum TetrominoType {
+ I_CYAN,
+ O_YELLOW,
+ T_PURPLE,
+ S_GREEN,
+ Z_RED,
+ J_BLUE,
+ L_ORANGE
+}
diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoZRed.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoZRed.java
new file mode 100644
index 00000000..5f99f83d
--- /dev/null
+++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoZRed.java
@@ -0,0 +1,44 @@
+package it.cavallium.warppi.extra.tetris;
+
+public class TetrominoZRed extends Tetromino {
+ public TetrominoZRed(byte x, byte y, byte rotation) {
+ super(x, y, rotation, TetrominoType.Z_RED);
+ }
+
+ @Override
+ public int getTetrominoGridSize() {
+ return 3;
+ }
+
+ @Override
+ public boolean[] getRenderedBlock(final byte rotation) {
+ switch(rotation) {
+ case 0:
+ return new boolean[] {
+ w,w,o,
+ o,w,w,
+ o,o,o
+ };
+ case 1:
+ return new boolean[] {
+ o,o,w,
+ o,w,w,
+ o,w,o
+ };
+ case 2:
+ return new boolean[] {
+ o,o,o,
+ w,w,o,
+ o,w,w
+ };
+ case 3:
+ return new boolean[] {
+ o,w,o,
+ w,w,o,
+ w,o,o
+ };
+ default:
+ throw new NullPointerException();
+ }
+ }
+}
diff --git a/core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java b/core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java
index a86fac78..921c32ce 100644
--- a/core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java
+++ b/core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java
@@ -24,6 +24,12 @@ public class CalculatorHUD extends HUD {
}
+ @Override
+ public void graphicInitialized() throws InterruptedException {
+ // TODO Auto-generated method stub
+
+ }
+
@Override
public void render() {
// TODO Auto-generated method stub
diff --git a/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java b/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java
index faa26d33..cf913787 100644
--- a/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java
+++ b/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java
@@ -5,14 +5,13 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.lang3.tuple.Pair;
-
import it.cavallium.warppi.Engine;
import it.cavallium.warppi.Platform.ConsoleUtils;
import it.cavallium.warppi.Platform.Semaphore;
import it.cavallium.warppi.StaticVars;
import it.cavallium.warppi.device.Keyboard;
import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.flow.Pair;
import it.cavallium.warppi.gui.graphicengine.BinaryFont;
import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
import it.cavallium.warppi.gui.graphicengine.Renderer;
@@ -243,10 +242,10 @@ public final class DisplayManager implements RenderingLoop {
screen.create();
}
this.screen = screen;
- screenChange.release();
if (screen.initialized == false) {
screen.initialize();
}
+ screenChange.release();
} catch (final Exception e) {
e.printStackTrace();
Engine.getPlatform().exit(0);
@@ -268,10 +267,10 @@ public final class DisplayManager implements RenderingLoop {
try {
screen.create();
this.screen = screen;
- screenChange.release();
if (screen.initialized == false) {
screen.initialize();
}
+ screenChange.release();
} catch (final Exception e) {
e.printStackTrace();
Engine.getPlatform().exit(0);
@@ -373,6 +372,13 @@ public final class DisplayManager implements RenderingLoop {
}
}
}
+ if (!screen.graphicInitialized) {
+ try {
+ screen.initializeGraphic();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
renderer.glClear(engine.getWidth(), engine.getHeight());
}
@@ -440,7 +446,6 @@ public final class DisplayManager implements RenderingLoop {
setScreen(initialScreen);
initialScreen = null;
}
- screen.initialize();
} catch (final Exception e) {
e.printStackTrace();
Engine.getPlatform().exit(0);
diff --git a/core/src/main/java/it/cavallium/warppi/gui/GraphicalInterface.java b/core/src/main/java/it/cavallium/warppi/gui/GraphicalInterface.java
index 9617df37..f1ee5694 100644
--- a/core/src/main/java/it/cavallium/warppi/gui/GraphicalInterface.java
+++ b/core/src/main/java/it/cavallium/warppi/gui/GraphicalInterface.java
@@ -2,8 +2,10 @@ package it.cavallium.warppi.gui;
public interface GraphicalInterface {
void create() throws InterruptedException;
-
+
void initialize() throws InterruptedException;
+
+ void initializeGraphic() throws InterruptedException;
void render();
diff --git a/core/src/main/java/it/cavallium/warppi/gui/HUD.java b/core/src/main/java/it/cavallium/warppi/gui/HUD.java
index 06e13a26..79436fe9 100644
--- a/core/src/main/java/it/cavallium/warppi/gui/HUD.java
+++ b/core/src/main/java/it/cavallium/warppi/gui/HUD.java
@@ -3,6 +3,7 @@ package it.cavallium.warppi.gui;
public abstract class HUD implements GraphicalInterface {
public DisplayManager d;
public boolean created = false;
+ public boolean graphicInitialized = false;
public boolean initialized = false;
public boolean visible = true;
@@ -16,6 +17,14 @@ public abstract class HUD implements GraphicalInterface {
}
}
+ @Override
+ public void initializeGraphic() throws InterruptedException {
+ if (!graphicInitialized) {
+ graphicInitialized = true;
+ graphicInitialized();
+ }
+ }
+
@Override
public void create() throws InterruptedException {
if (!created) {
@@ -26,6 +35,8 @@ public abstract class HUD implements GraphicalInterface {
public abstract void created() throws InterruptedException;
+ public abstract void graphicInitialized() throws InterruptedException;
+
public abstract void initialized() throws InterruptedException;
public abstract void renderBackground();
diff --git a/core/src/main/java/it/cavallium/warppi/gui/expression/ExtraMenu.java b/core/src/main/java/it/cavallium/warppi/gui/expression/ExtraMenu.java
index e28d6c5c..5c8b2f56 100644
--- a/core/src/main/java/it/cavallium/warppi/gui/expression/ExtraMenu.java
+++ b/core/src/main/java/it/cavallium/warppi/gui/expression/ExtraMenu.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
import it.cavallium.warppi.event.KeyboardEventListener;
import it.cavallium.warppi.gui.expression.blocks.Block;
import it.cavallium.warppi.gui.expression.blocks.BlockVariable;
+import it.cavallium.warppi.gui.expression.blocks.TreeContainer;
import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
import it.cavallium.warppi.gui.graphicengine.Renderer;
@@ -45,7 +46,7 @@ public abstract class ExtraMenu- * Concrete classes should extend {@link PngChunkSingle} or - * {@link PngChunkMultiple} - *
- * Note that some methods/fields are type-specific (getOrderingConstraint(),
- * allowsMultiple()),
- * some are 'almost' type-specific (id,crit,pub,safe; the exception is
- * PngUKNOWN),
- * and the rest are instance-specific
- */
-public abstract class PngChunk {
-
- /**
- * Chunk-id: 4 letters
- */
- public final String id;
- /**
- * Autocomputed at creation time
- */
- public final boolean crit, pub, safe;
-
- protected final ImageInfo imgInfo;
-
- protected ChunkRaw raw;
-
- private boolean priority = false; // For writing. Queued chunks with high priority will be written
- // as soon as
- // possible
-
- protected int chunkGroup = -1; // chunk group where it was read or writen
-
- /**
- * Possible ordering constraint for a PngChunk type -only relevant for
- * ancillary chunks. Theoretically, there could be
- * more general constraints, but these cover the constraints for standard
- * chunks.
- */
- public enum ChunkOrderingConstraint {
- /**
- * no ordering constraint
- */
- NONE,
- /**
- * Must go before PLTE (and hence, also before IDAT)
- */
- BEFORE_PLTE_AND_IDAT,
- /**
- * Must go after PLTE (if exists) but before IDAT
- */
- AFTER_PLTE_BEFORE_IDAT,
- /**
- * Must go after PLTE (and it must exist) but before IDAT
- */
- AFTER_PLTE_BEFORE_IDAT_PLTE_REQUIRED,
- /**
- * Must before IDAT (before or after PLTE)
- */
- BEFORE_IDAT,
- /**
- * After IDAT (this restriction does not apply to the standard PNG
- * chunks)
- */
- AFTER_IDAT,
- /**
- * Does not apply
- */
- NA;
-
- public boolean mustGoBeforePLTE() {
- return this == BEFORE_PLTE_AND_IDAT;
- }
-
- public boolean mustGoBeforeIDAT() {
- return this == BEFORE_IDAT || this == BEFORE_PLTE_AND_IDAT || this == AFTER_PLTE_BEFORE_IDAT;
- }
-
- /**
- * after pallete, if exists
- */
- public boolean mustGoAfterPLTE() {
- return this == AFTER_PLTE_BEFORE_IDAT || this == AFTER_PLTE_BEFORE_IDAT_PLTE_REQUIRED;
- }
-
- public boolean mustGoAfterIDAT() {
- return this == AFTER_IDAT;
- }
-
- public boolean isOk(final int currentChunkGroup, final boolean hasplte) {
- if (this == NONE)
- return true;
- else if (this == BEFORE_IDAT)
- return currentChunkGroup < ChunksList.CHUNK_GROUP_4_IDAT;
- else if (this == BEFORE_PLTE_AND_IDAT)
- return currentChunkGroup < ChunksList.CHUNK_GROUP_2_PLTE;
- else if (this == AFTER_PLTE_BEFORE_IDAT)
- return hasplte ? currentChunkGroup < ChunksList.CHUNK_GROUP_4_IDAT : currentChunkGroup < ChunksList.CHUNK_GROUP_4_IDAT && currentChunkGroup > ChunksList.CHUNK_GROUP_2_PLTE;
- else if (this == AFTER_IDAT)
- return currentChunkGroup > ChunksList.CHUNK_GROUP_4_IDAT;
- return false;
- }
- }
-
- public PngChunk(final String id, final ImageInfo imgInfo) {
- this.id = id;
- this.imgInfo = imgInfo;
- crit = ChunkHelper.isCritical(id);
- pub = ChunkHelper.isPublic(id);
- safe = ChunkHelper.isSafeToCopy(id);
- }
-
- protected final ChunkRaw createEmptyChunk(final int len, final boolean alloc) {
- final ChunkRaw c = new ChunkRaw(len, ChunkHelper.toBytes(id), alloc);
- return c;
- }
-
- /**
- * In which "chunkGroup" (see {@link ChunksList}for definition) this chunks
- * instance was read or written.
- *
- * -1 if not read or written (eg, queued) - */ - final public int getChunkGroup() { - return chunkGroup; - } - - /** - * @see #getChunkGroup() - */ - final void setChunkGroup(final int chunkGroup) { - this.chunkGroup = chunkGroup; - } - - public boolean hasPriority() { - return priority; - } - - public void setPriority(final boolean priority) { - this.priority = priority; - } - - final void write(final OutputStream os) { - if (raw == null || raw.data == null) - raw = createRawChunk(); - if (raw == null) - throw new PngjExceptionInternal("null chunk ! creation failed for " + this); - raw.writeChunk(os); - } - - /** - * Creates the physical chunk. This is used when writing (serialization). - * Each particular chunk class implements its - * own logic. - * - * @return A newly allocated and filled raw chunk - */ - public abstract ChunkRaw createRawChunk(); - - /** - * Parses raw chunk and fill inside data. This is used when reading - * (deserialization). Each particular chunk class - * implements its own logic. - */ - protected abstract void parseFromRaw(ChunkRaw c); - - /** - * See {@link PngChunkMultiple} and {@link PngChunkSingle} - * - * @return true if PNG accepts multiple chunks of this class - */ - protected abstract boolean allowsMultiple(); - - public ChunkRaw getRaw() { - return raw; - } - - void setRaw(final ChunkRaw raw) { - this.raw = raw; - } - - /** - * @see ChunkRaw#len - */ - public int getLen() { - return raw != null ? raw.len : -1; - } - - /** - * @see ChunkRaw#getOffset() - */ - public long getOffset() { - return raw != null ? raw.getOffset() : -1; - } - - /** - * This signals that the raw chunk (serialized data) as invalid, so that - * it's regenerated on write. This should be - * called for the (infrequent) case of chunks that were copied from a - * PngReader and we want to manually modify it. - */ - public void invalidateRawData() { - raw = null; - } - - /** - * see {@link ChunkOrderingConstraint} - */ - public abstract ChunkOrderingConstraint getOrderingConstraint(); - - @Override - public String toString() { - return "chunk id= " + id + " (len=" + getLen() + " offset=" + getOffset() + ")"; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java deleted file mode 100644 index 3d179f06..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java +++ /dev/null @@ -1,57 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; - -/** - * acTL chunk. For APGN, not PGN standard - *
- * see - * https://wiki.mozilla.org/APNG_Specification#.60acTL.60:_The_Animation_Control_Chunk - *
- */ -public class PngChunkACTL extends PngChunkSingle { - public final static String ID = "acTL"; - private int numFrames; - private int numPlays; - - public PngChunkACTL(final ImageInfo info) { - super(PngChunkACTL.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = createEmptyChunk(8, true); - PngHelperInternal.writeInt4tobytes(numFrames, c.data, 0); - PngHelperInternal.writeInt4tobytes(numPlays, c.data, 4); - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - numFrames = PngHelperInternal.readInt4fromBytes(chunk.data, 0); - numPlays = PngHelperInternal.readInt4fromBytes(chunk.data, 4); - } - - public int getNumFrames() { - return numFrames; - } - - public void setNumFrames(final int numFrames) { - this.numFrames = numFrames; - } - - public int getNumPlays() { - return numPlays; - } - - public void setNumPlays(final int numPlays) { - this.numPlays = numPlays; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java deleted file mode 100644 index 6486c189..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java +++ /dev/null @@ -1,112 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * bKGD Chunk. - *
- * see {@link http://www.w3.org/TR/PNG/#11bKGD} - *
- * This chunk structure depends on the image type - */ -public class PngChunkBKGD extends PngChunkSingle { - public final static String ID = ChunkHelper.bKGD; - // only one of these is meaningful - private int gray; - private int red, green, blue; - private int paletteIndex; - - public PngChunkBKGD(final ImageInfo info) { - super(ChunkHelper.bKGD, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.AFTER_PLTE_BEFORE_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - ChunkRaw c = null; - if (imgInfo.greyscale) { - c = createEmptyChunk(2, true); - PngHelperInternal.writeInt2tobytes(gray, c.data, 0); - } else if (imgInfo.indexed) { - c = createEmptyChunk(1, true); - c.data[0] = (byte) paletteIndex; - } else { - c = createEmptyChunk(6, true); - PngHelperInternal.writeInt2tobytes(red, c.data, 0); - PngHelperInternal.writeInt2tobytes(green, c.data, 0); - PngHelperInternal.writeInt2tobytes(blue, c.data, 0); - } - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - if (imgInfo.greyscale) - gray = PngHelperInternal.readInt2fromBytes(c.data, 0); - else if (imgInfo.indexed) - paletteIndex = c.data[0] & 0xff; - else { - red = PngHelperInternal.readInt2fromBytes(c.data, 0); - green = PngHelperInternal.readInt2fromBytes(c.data, 2); - blue = PngHelperInternal.readInt2fromBytes(c.data, 4); - } - } - - /** - * Set gray value (0-255 if bitdept=8) - * - * @param gray - */ - public void setGray(final int gray) { - if (!imgInfo.greyscale) - throw new PngjException("only gray images support this"); - this.gray = gray; - } - - public int getGray() { - if (!imgInfo.greyscale) - throw new PngjException("only gray images support this"); - return gray; - } - - /** - * Set pallette index - * - */ - public void setPaletteIndex(final int i) { - if (!imgInfo.indexed) - throw new PngjException("only indexed (pallete) images support this"); - paletteIndex = i; - } - - public int getPaletteIndex() { - if (!imgInfo.indexed) - throw new PngjException("only indexed (pallete) images support this"); - return paletteIndex; - } - - /** - * Set rgb values - * - */ - public void setRGB(final int r, final int g, final int b) { - if (imgInfo.greyscale || imgInfo.indexed) - throw new PngjException("only rgb or rgba images support this"); - red = r; - green = g; - blue = b; - } - - public int[] getRGB() { - if (imgInfo.greyscale || imgInfo.indexed) - throw new PngjException("only rgb or rgba images support this"); - return new int[] { red, green, blue }; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java deleted file mode 100644 index 6086a7a2..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java +++ /dev/null @@ -1,75 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * cHRM chunk. - *
- * see http://www.w3.org/TR/PNG/#11cHRM - */ -public class PngChunkCHRM extends PngChunkSingle { - public final static String ID = ChunkHelper.cHRM; - - // http://www.w3.org/TR/PNG/#11cHRM - private double whitex, whitey; - private double redx, redy; - private double greenx, greeny; - private double bluex, bluey; - - public PngChunkCHRM(final ImageInfo info) { - super(PngChunkCHRM.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.AFTER_PLTE_BEFORE_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - ChunkRaw c = null; - c = createEmptyChunk(32, true); - PngHelperInternal.writeInt4tobytes(PngHelperInternal.doubleToInt100000(whitex), c.data, 0); - PngHelperInternal.writeInt4tobytes(PngHelperInternal.doubleToInt100000(whitey), c.data, 4); - PngHelperInternal.writeInt4tobytes(PngHelperInternal.doubleToInt100000(redx), c.data, 8); - PngHelperInternal.writeInt4tobytes(PngHelperInternal.doubleToInt100000(redy), c.data, 12); - PngHelperInternal.writeInt4tobytes(PngHelperInternal.doubleToInt100000(greenx), c.data, 16); - PngHelperInternal.writeInt4tobytes(PngHelperInternal.doubleToInt100000(greeny), c.data, 20); - PngHelperInternal.writeInt4tobytes(PngHelperInternal.doubleToInt100000(bluex), c.data, 24); - PngHelperInternal.writeInt4tobytes(PngHelperInternal.doubleToInt100000(bluey), c.data, 28); - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - if (c.len != 32) - throw new PngjException("bad chunk " + c); - whitex = PngHelperInternal.intToDouble100000(PngHelperInternal.readInt4fromBytes(c.data, 0)); - whitey = PngHelperInternal.intToDouble100000(PngHelperInternal.readInt4fromBytes(c.data, 4)); - redx = PngHelperInternal.intToDouble100000(PngHelperInternal.readInt4fromBytes(c.data, 8)); - redy = PngHelperInternal.intToDouble100000(PngHelperInternal.readInt4fromBytes(c.data, 12)); - greenx = PngHelperInternal.intToDouble100000(PngHelperInternal.readInt4fromBytes(c.data, 16)); - greeny = PngHelperInternal.intToDouble100000(PngHelperInternal.readInt4fromBytes(c.data, 20)); - bluex = PngHelperInternal.intToDouble100000(PngHelperInternal.readInt4fromBytes(c.data, 24)); - bluey = PngHelperInternal.intToDouble100000(PngHelperInternal.readInt4fromBytes(c.data, 28)); - } - - public void setChromaticities(final double whitex, final double whitey, final double redx, final double redy, - final double greenx, final double greeny, final double bluex, final double bluey) { - this.whitex = whitex; - this.redx = redx; - this.greenx = greenx; - this.bluex = bluex; - this.whitey = whitey; - this.redy = redy; - this.greeny = greeny; - this.bluey = bluey; - } - - public double[] getChromaticities() { - return new double[] { whitex, whitey, redx, redy, greenx, greeny, bluex, bluey }; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java deleted file mode 100644 index 4a8c8d1f..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java +++ /dev/null @@ -1,158 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; - -/** - * fcTL chunk. For APGN, not PGN standard - *
- * see - * https://wiki.mozilla.org/APNG_Specification#.60fcTL.60:_The_Frame_Control_Chunk - *
- */ -public class PngChunkFCTL extends PngChunkMultiple { - public final static String ID = "fcTL"; - - public final static byte APNG_DISPOSE_OP_NONE = 0; - public final static byte APNG_DISPOSE_OP_BACKGROUND = 1; - public final static byte APNG_DISPOSE_OP_PREVIOUS = 2; - public final static byte APNG_BLEND_OP_SOURCE = 0; - public final static byte APNG_BLEND_OP_OVER = 1; - - private int seqNum; - private int width, height, xOff, yOff; - private int delayNum, delayDen; - private byte disposeOp, blendOp; - - public PngChunkFCTL(final ImageInfo info) { - super(PngChunkFCTL.ID, info); - } - - public ImageInfo getEquivImageInfo() { - return new ImageInfo(width, height, imgInfo.bitDepth, imgInfo.alpha, imgInfo.greyscale, imgInfo.indexed); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.NONE; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = createEmptyChunk(8, true); - int off = 0; - PngHelperInternal.writeInt4tobytes(seqNum, c.data, off); - off += 4; - PngHelperInternal.writeInt4tobytes(width, c.data, off); - off += 4; - PngHelperInternal.writeInt4tobytes(height, c.data, off); - off += 4; - PngHelperInternal.writeInt4tobytes(xOff, c.data, off); - off += 4; - PngHelperInternal.writeInt4tobytes(yOff, c.data, off); - off += 4; - PngHelperInternal.writeInt2tobytes(delayNum, c.data, off); - off += 2; - PngHelperInternal.writeInt2tobytes(delayDen, c.data, off); - off += 2; - c.data[off] = disposeOp; - off += 1; - c.data[off] = blendOp; - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - int off = 0; - seqNum = PngHelperInternal.readInt4fromBytes(chunk.data, off); - off += 4; - width = PngHelperInternal.readInt4fromBytes(chunk.data, off); - off += 4; - height = PngHelperInternal.readInt4fromBytes(chunk.data, off); - off += 4; - xOff = PngHelperInternal.readInt4fromBytes(chunk.data, off); - off += 4; - yOff = PngHelperInternal.readInt4fromBytes(chunk.data, off); - off += 4; - delayNum = PngHelperInternal.readInt2fromBytes(chunk.data, off); - off += 2; - delayDen = PngHelperInternal.readInt2fromBytes(chunk.data, off); - off += 2; - disposeOp = chunk.data[off]; - off += 1; - blendOp = chunk.data[off]; - } - - public int getSeqNum() { - return seqNum; - } - - public void setSeqNum(final int seqNum) { - this.seqNum = seqNum; - } - - public int getWidth() { - return width; - } - - public void setWidth(final int width) { - this.width = width; - } - - public int getHeight() { - return height; - } - - public void setHeight(final int height) { - this.height = height; - } - - public int getxOff() { - return xOff; - } - - public void setxOff(final int xOff) { - this.xOff = xOff; - } - - public int getyOff() { - return yOff; - } - - public void setyOff(final int yOff) { - this.yOff = yOff; - } - - public int getDelayNum() { - return delayNum; - } - - public void setDelayNum(final int delayNum) { - this.delayNum = delayNum; - } - - public int getDelayDen() { - return delayDen; - } - - public void setDelayDen(final int delayDen) { - this.delayDen = delayDen; - } - - public byte getDisposeOp() { - return disposeOp; - } - - public void setDisposeOp(final byte disposeOp) { - this.disposeOp = disposeOp; - } - - public byte getBlendOp() { - return blendOp; - } - - public void setBlendOp(final byte blendOp) { - this.blendOp = blendOp; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java deleted file mode 100644 index 47449a00..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java +++ /dev/null @@ -1,72 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * fdAT chunk. For APGN, not PGN standard - *
- * see - * https://wiki.mozilla.org/APNG_Specification#.60fdAT.60:_The_Frame_Data_Chunk - *
- * This implementation does not support buffering, this should be not managed - * similar to a IDAT chunk - * - */ -public class PngChunkFDAT extends PngChunkMultiple { - public final static String ID = "fdAT"; - private int seqNum; - private byte[] buffer; // normally not allocated - if so, it's the raw data, so it includes the 4bytes seqNum - int datalen; // length of idat data, excluding seqNUm (= chunk.len-4) - - public PngChunkFDAT(final ImageInfo info) { - super(PngChunkFDAT.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.AFTER_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - if (buffer == null) - throw new PngjException("not buffered"); - final ChunkRaw c = createEmptyChunk(datalen + 4, false); - c.data = buffer; // shallow copy! - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - seqNum = PngHelperInternal.readInt4fromBytes(chunk.data, 0); - datalen = chunk.len - 4; - buffer = chunk.data; - } - - public int getSeqNum() { - return seqNum; - } - - public void setSeqNum(final int seqNum) { - this.seqNum = seqNum; - } - - public byte[] getBuffer() { - return buffer; - } - - public void setBuffer(final byte[] buffer) { - this.buffer = buffer; - } - - public int getDatalen() { - return datalen; - } - - public void setDatalen(final int datalen) { - this.datalen = datalen; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java deleted file mode 100644 index 3b70654b..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java +++ /dev/null @@ -1,51 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * gAMA chunk. - *
- * see http://www.w3.org/TR/PNG/#11gAMA - */ -public class PngChunkGAMA extends PngChunkSingle { - public final static String ID = ChunkHelper.gAMA; - - // http://www.w3.org/TR/PNG/#11gAMA - private double gamma; - - public PngChunkGAMA(final ImageInfo info) { - super(PngChunkGAMA.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_PLTE_AND_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = createEmptyChunk(4, true); - final int g = (int) (gamma * 100000 + 0.5); - PngHelperInternal.writeInt4tobytes(g, c.data, 0); - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - if (chunk.len != 4) - throw new PngjException("bad chunk " + chunk); - final int g = PngHelperInternal.readInt4fromBytes(chunk.data, 0); - gamma = g / 100000.0; - } - - public double getGamma() { - return gamma; - } - - public void setGamma(final double gamma) { - this.gamma = gamma; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java deleted file mode 100644 index 7d84aed8..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java +++ /dev/null @@ -1,56 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * hIST chunk. - *
- * see http://www.w3.org/TR/PNG/#11hIST
- * only for palette images
- */
-public class PngChunkHIST extends PngChunkSingle {
- public final static String ID = ChunkHelper.hIST;
-
- private int[] hist = new int[0]; // should have same lenght as palette
-
- public PngChunkHIST(final ImageInfo info) {
- super(PngChunkHIST.ID, info);
- }
-
- @Override
- public ChunkOrderingConstraint getOrderingConstraint() {
- return ChunkOrderingConstraint.AFTER_PLTE_BEFORE_IDAT;
- }
-
- @Override
- public void parseFromRaw(final ChunkRaw c) {
- if (!imgInfo.indexed)
- throw new PngjException("only indexed images accept a HIST chunk");
- final int nentries = c.data.length / 2;
- hist = new int[nentries];
- for (int i = 0; i < hist.length; i++)
- hist[i] = PngHelperInternal.readInt2fromBytes(c.data, i * 2);
- }
-
- @Override
- public ChunkRaw createRawChunk() {
- if (!imgInfo.indexed)
- throw new PngjException("only indexed images accept a HIST chunk");
- ChunkRaw c = null;
- c = createEmptyChunk(hist.length * 2, true);
- for (int i = 0; i < hist.length; i++)
- PngHelperInternal.writeInt2tobytes(hist[i], c.data, i * 2);
- return c;
- }
-
- public int[] getHist() {
- return hist;
- }
-
- public void setHist(final int[] hist) {
- this.hist = hist;
- }
-
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java
deleted file mode 100644
index caa2de2a..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package ar.com.hjg.pngj.chunks;
-
-import ar.com.hjg.pngj.ImageInfo;
-import ar.com.hjg.pngj.PngjException;
-
-/**
- * iCCP chunk.
- *
- * See {@link http://www.w3.org/TR/PNG/#11iCCP} - */ -public class PngChunkICCP extends PngChunkSingle { - public final static String ID = ChunkHelper.iCCP; - - // http://www.w3.org/TR/PNG/#11iCCP - private String profileName; - private byte[] compressedProfile; // copmression/decopmresion is done in getter/setter - - public PngChunkICCP(final ImageInfo info) { - super(PngChunkICCP.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_PLTE_AND_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = createEmptyChunk(profileName.length() + compressedProfile.length + 2, true); - System.arraycopy(ChunkHelper.toBytes(profileName), 0, c.data, 0, profileName.length()); - c.data[profileName.length()] = 0; - c.data[profileName.length() + 1] = 0; - System.arraycopy(compressedProfile, 0, c.data, profileName.length() + 2, compressedProfile.length); - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - final int pos0 = ChunkHelper.posNullByte(chunk.data); - profileName = ChunkHelper.toString(chunk.data, 0, pos0); - final int comp = chunk.data[pos0 + 1] & 0xff; - if (comp != 0) - throw new PngjException("bad compression for ChunkTypeICCP"); - final int compdatasize = chunk.data.length - (pos0 + 2); - compressedProfile = new byte[compdatasize]; - System.arraycopy(chunk.data, pos0 + 2, compressedProfile, 0, compdatasize); - } - - /** - * The profile should be uncompressed bytes - */ - public void setProfileNameAndContent(final String name, final byte[] profile) { - profileName = name; - compressedProfile = ChunkHelper.compressBytes(profile, true); - } - - public void setProfileNameAndContent(final String name, final String profile) { - setProfileNameAndContent(name, ChunkHelper.toBytes(profile)); - } - - public String getProfileName() { - return profileName; - } - - /** - * uncompressed - **/ - public byte[] getProfile() { - return ChunkHelper.compressBytes(compressedProfile, false); - } - - public String getProfileAsString() { - return ChunkHelper.toString(getProfile()); - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java deleted file mode 100644 index febd1469..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java +++ /dev/null @@ -1,35 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; - -/** - * IDAT chunk. - *
- * see http://www.w3.org/TR/PNG/#11IDAT - *
- * This is dummy placeholder - we write/read this chunk (actually several) by - * special code. - */ -public class PngChunkIDAT extends PngChunkMultiple { - public final static String ID = ChunkHelper.IDAT; - - // http://www.w3.org/TR/PNG/#11IDAT - public PngChunkIDAT(final ImageInfo i) { - super(PngChunkIDAT.ID, i); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.NA; - } - - @Override - public ChunkRaw createRawChunk() {// does nothing - return null; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { // does nothing - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java deleted file mode 100644 index 01fb6259..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java +++ /dev/null @@ -1,35 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; - -/** - * IEND chunk. - *
- * see http://www.w3.org/TR/PNG/#11IEND - */ -public class PngChunkIEND extends PngChunkSingle { - public final static String ID = ChunkHelper.IEND; - - // http://www.w3.org/TR/PNG/#11IEND - // this is a dummy placeholder - public PngChunkIEND(final ImageInfo info) { - super(PngChunkIEND.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.NA; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = new ChunkRaw(0, ChunkHelper.b_IEND, false); - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - // this is not used - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java deleted file mode 100644 index ddcbd5ec..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java +++ /dev/null @@ -1,184 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import java.io.ByteArrayInputStream; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; -import ar.com.hjg.pngj.PngjInputException; - -/** - * IHDR chunk. - *
- * see http://www.w3.org/TR/PNG/#11IHDR - *
- * This is a special critical Chunk. - */ -public class PngChunkIHDR extends PngChunkSingle { - public final static String ID = ChunkHelper.IHDR; - - private int cols; - private int rows; - private int bitspc; - private int colormodel; - private int compmeth; - private int filmeth; - private int interlaced; - - // http://www.w3.org/TR/PNG/#11IHDR - // - public PngChunkIHDR(final ImageInfo info) { // argument is normally null here, if not null is used to fill the fields - super(PngChunkIHDR.ID, info); - if (info != null) - fillFromInfo(info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.NA; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = new ChunkRaw(13, ChunkHelper.b_IHDR, true); - int offset = 0; - PngHelperInternal.writeInt4tobytes(cols, c.data, offset); - offset += 4; - PngHelperInternal.writeInt4tobytes(rows, c.data, offset); - offset += 4; - c.data[offset++] = (byte) bitspc; - c.data[offset++] = (byte) colormodel; - c.data[offset++] = (byte) compmeth; - c.data[offset++] = (byte) filmeth; - c.data[offset++] = (byte) interlaced; - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - if (c.len != 13) - throw new PngjException("Bad IDHR len " + c.len); - final ByteArrayInputStream st = c.getAsByteStream(); - cols = PngHelperInternal.readInt4(st); - rows = PngHelperInternal.readInt4(st); - // bit depth: number of bits per channel - bitspc = PngHelperInternal.readByte(st); - colormodel = PngHelperInternal.readByte(st); - compmeth = PngHelperInternal.readByte(st); - filmeth = PngHelperInternal.readByte(st); - interlaced = PngHelperInternal.readByte(st); - } - - public int getCols() { - return cols; - } - - public void setCols(final int cols) { - this.cols = cols; - } - - public int getRows() { - return rows; - } - - public void setRows(final int rows) { - this.rows = rows; - } - - public int getBitspc() { - return bitspc; - } - - public void setBitspc(final int bitspc) { - this.bitspc = bitspc; - } - - public int getColormodel() { - return colormodel; - } - - public void setColormodel(final int colormodel) { - this.colormodel = colormodel; - } - - public int getCompmeth() { - return compmeth; - } - - public void setCompmeth(final int compmeth) { - this.compmeth = compmeth; - } - - public int getFilmeth() { - return filmeth; - } - - public void setFilmeth(final int filmeth) { - this.filmeth = filmeth; - } - - public int getInterlaced() { - return interlaced; - } - - public void setInterlaced(final int interlaced) { - this.interlaced = interlaced; - } - - public boolean isInterlaced() { - return getInterlaced() == 1; - } - - public void fillFromInfo(final ImageInfo info) { - setCols(imgInfo.cols); - setRows(imgInfo.rows); - setBitspc(imgInfo.bitDepth); - int colormodel = 0; - if (imgInfo.alpha) - colormodel += 0x04; - if (imgInfo.indexed) - colormodel += 0x01; - if (!imgInfo.greyscale) - colormodel += 0x02; - setColormodel(colormodel); - setCompmeth(0); // compression method 0=deflate - setFilmeth(0); // filter method (0) - setInterlaced(0); // we never interlace - } - - /** throws PngInputException if unexpected values */ - public ImageInfo createImageInfo() { - check(); - final boolean alpha = (getColormodel() & 0x04) != 0; - final boolean palette = (getColormodel() & 0x01) != 0; - final boolean grayscale = getColormodel() == 0 || getColormodel() == 4; - // creates ImgInfo and imgLine, and allocates buffers - return new ImageInfo(getCols(), getRows(), getBitspc(), alpha, grayscale, palette); - } - - public void check() { - if (cols < 1 || rows < 1 || compmeth != 0 || filmeth != 0) - throw new PngjInputException("bad IHDR: col/row/compmethod/filmethod invalid"); - if (bitspc != 1 && bitspc != 2 && bitspc != 4 && bitspc != 8 && bitspc != 16) - throw new PngjInputException("bad IHDR: bitdepth invalid"); - if (interlaced < 0 || interlaced > 1) - throw new PngjInputException("bad IHDR: interlace invalid"); - switch (colormodel) { - case 0: - break; - case 3: - if (bitspc == 16) - throw new PngjInputException("bad IHDR: bitdepth invalid"); - break; - case 2: - case 4: - case 6: - if (bitspc != 8 && bitspc != 16) - throw new PngjInputException("bad IHDR: bitdepth invalid"); - break; - default: - throw new PngjInputException("bad IHDR: invalid colormodel"); - } - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java deleted file mode 100644 index d9d1bb83..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java +++ /dev/null @@ -1,108 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngjException; - -/** - * iTXt chunk. - *
- * see http://www.w3.org/TR/PNG/#11iTXt - */ -public class PngChunkITXT extends PngChunkTextVar { - public final static String ID = ChunkHelper.iTXt; - - private boolean compressed = false; - private String langTag = ""; - private String translatedTag = ""; - - // http://www.w3.org/TR/PNG/#11iTXt - public PngChunkITXT(final ImageInfo info) { - super(PngChunkITXT.ID, info); - } - - @Override - public ChunkRaw createRawChunk() { - if (key == null || key.trim().length() == 0) - throw new PngjException("Text chunk key must be non empty"); - try { - final ByteArrayOutputStream ba = new ByteArrayOutputStream(); - ba.write(ChunkHelper.toBytes(key)); - ba.write(0); // separator - ba.write(compressed ? 1 : 0); - ba.write(0); // compression method (always 0) - ba.write(ChunkHelper.toBytes(langTag)); - ba.write(0); // separator - ba.write(ChunkHelper.toBytesUTF8(translatedTag)); - ba.write(0); // separator - byte[] textbytes = ChunkHelper.toBytesUTF8(val); - if (compressed) - textbytes = ChunkHelper.compressBytes(textbytes, true); - ba.write(textbytes); - final byte[] b = ba.toByteArray(); - final ChunkRaw chunk = createEmptyChunk(b.length, false); - chunk.data = b; - return chunk; - } catch (final IOException e) { - throw new PngjException(e); - } - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - int nullsFound = 0; - final int[] nullsIdx = new int[3]; - for (int i = 0; i < c.data.length; i++) { - if (c.data[i] != 0) - continue; - nullsIdx[nullsFound] = i; - nullsFound++; - if (nullsFound == 1) - i += 2; - if (nullsFound == 3) - break; - } - if (nullsFound != 3) - throw new PngjException("Bad formed PngChunkITXT chunk"); - key = ChunkHelper.toString(c.data, 0, nullsIdx[0]); - int i = nullsIdx[0] + 1; - compressed = c.data[i] == 0 ? false : true; - i++; - if (compressed && c.data[i] != 0) - throw new PngjException("Bad formed PngChunkITXT chunk - bad compression method "); - langTag = ChunkHelper.toString(c.data, i, nullsIdx[1] - i); - translatedTag = ChunkHelper.toStringUTF8(c.data, nullsIdx[1] + 1, nullsIdx[2] - nullsIdx[1] - 1); - i = nullsIdx[2] + 1; - if (compressed) { - final byte[] bytes = ChunkHelper.compressBytes(c.data, i, c.data.length - i, false); - val = ChunkHelper.toStringUTF8(bytes); - } else - val = ChunkHelper.toStringUTF8(c.data, i, c.data.length - i); - } - - public boolean isCompressed() { - return compressed; - } - - public void setCompressed(final boolean compressed) { - this.compressed = compressed; - } - - public String getLangtag() { - return langTag; - } - - public void setLangtag(final String langtag) { - langTag = langtag; - } - - public String getTranslatedTag() { - return translatedTag; - } - - public void setTranslatedTag(final String translatedTag) { - this.translatedTag = translatedTag; - } -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java deleted file mode 100644 index 0f822d24..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java +++ /dev/null @@ -1,28 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; - -/** - * PNG chunk type (abstract) that allows multiple instances in same image. - */ -public abstract class PngChunkMultiple extends PngChunk { - - protected PngChunkMultiple(final String id, final ImageInfo imgInfo) { - super(id, imgInfo); - } - - @Override - public final boolean allowsMultiple() { - return true; - } - - /** - * NOTE: this chunk uses the default Object's equals() hashCode() - * implementation. - * - * This is the right thing to do, normally. - * - * This is important, eg see ChunkList.removeFromList() - */ - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java deleted file mode 100644 index 2f762a6c..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java +++ /dev/null @@ -1,81 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * oFFs chunk. - *
- * see http://www.libpng.org/pub/png/spec/register/pngext-1.3.0-pdg.html#C.oFFs - */ -public class PngChunkOFFS extends PngChunkSingle { - public final static String ID = "oFFs"; - - // http://www.libpng.org/pub/png/spec/register/pngext-1.3.0-pdg.html#C.oFFs - private long posX; - private long posY; - private int units; // 0: pixel 1:micrometer - - public PngChunkOFFS(final ImageInfo info) { - super(PngChunkOFFS.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = createEmptyChunk(9, true); - PngHelperInternal.writeInt4tobytes((int) posX, c.data, 0); - PngHelperInternal.writeInt4tobytes((int) posY, c.data, 4); - c.data[8] = (byte) units; - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - if (chunk.len != 9) - throw new PngjException("bad chunk length " + chunk); - posX = PngHelperInternal.readInt4fromBytes(chunk.data, 0); - if (posX < 0) - posX += 0x100000000L; - posY = PngHelperInternal.readInt4fromBytes(chunk.data, 4); - if (posY < 0) - posY += 0x100000000L; - units = PngHelperInternal.readInt1fromByte(chunk.data, 8); - } - - /** - * 0: pixel, 1:micrometer - */ - public int getUnits() { - return units; - } - - /** - * 0: pixel, 1:micrometer - */ - public void setUnits(final int units) { - this.units = units; - } - - public long getPosX() { - return posX; - } - - public void setPosX(final long posX) { - this.posX = posX; - } - - public long getPosY() { - return posY; - } - - public void setPosY(final long posY) { - this.posY = posY; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java deleted file mode 100644 index acce8ed3..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java +++ /dev/null @@ -1,107 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * pHYs chunk. - *
- * see http://www.w3.org/TR/PNG/#11pHYs - */ -public class PngChunkPHYS extends PngChunkSingle { - public final static String ID = ChunkHelper.pHYs; - - // http://www.w3.org/TR/PNG/#11pHYs - private long pixelsxUnitX; - private long pixelsxUnitY; - private int units; // 0: unknown 1:metre - - public PngChunkPHYS(final ImageInfo info) { - super(PngChunkPHYS.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = createEmptyChunk(9, true); - PngHelperInternal.writeInt4tobytes((int) pixelsxUnitX, c.data, 0); - PngHelperInternal.writeInt4tobytes((int) pixelsxUnitY, c.data, 4); - c.data[8] = (byte) units; - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - if (chunk.len != 9) - throw new PngjException("bad chunk length " + chunk); - pixelsxUnitX = PngHelperInternal.readInt4fromBytes(chunk.data, 0); - if (pixelsxUnitX < 0) - pixelsxUnitX += 0x100000000L; - pixelsxUnitY = PngHelperInternal.readInt4fromBytes(chunk.data, 4); - if (pixelsxUnitY < 0) - pixelsxUnitY += 0x100000000L; - units = PngHelperInternal.readInt1fromByte(chunk.data, 8); - } - - public long getPixelsxUnitX() { - return pixelsxUnitX; - } - - public void setPixelsxUnitX(final long pixelsxUnitX) { - this.pixelsxUnitX = pixelsxUnitX; - } - - public long getPixelsxUnitY() { - return pixelsxUnitY; - } - - public void setPixelsxUnitY(final long pixelsxUnitY) { - this.pixelsxUnitY = pixelsxUnitY; - } - - public int getUnits() { - return units; - } - - public void setUnits(final int units) { - this.units = units; - } - - // special getters / setters - - /** - * returns -1 if the physicial unit is unknown, or X-Y are not equal - */ - public double getAsDpi() { - if (units != 1 || pixelsxUnitX != pixelsxUnitY) - return -1; - return pixelsxUnitX * 0.0254; - } - - /** - * returns -1 if the physicial unit is unknown - */ - public double[] getAsDpi2() { - if (units != 1) - return new double[] { -1, -1 }; - return new double[] { pixelsxUnitX * 0.0254, pixelsxUnitY * 0.0254 }; - } - - public void setAsDpi(final double dpi) { - units = 1; - pixelsxUnitX = (long) (dpi / 0.0254 + 0.5); - pixelsxUnitY = pixelsxUnitX; - } - - public void setAsDpi2(final double dpix, final double dpiy) { - units = 1; - pixelsxUnitX = (long) (dpix / 0.0254 + 0.5); - pixelsxUnitY = (long) (dpiy / 0.0254 + 0.5); - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java deleted file mode 100644 index a0cfe734..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java +++ /dev/null @@ -1,95 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngjException; - -/** - * PLTE chunk. - *
- * see http://www.w3.org/TR/PNG/#11PLTE - *
- * Critical chunk - */ -public class PngChunkPLTE extends PngChunkSingle { - public final static String ID = ChunkHelper.PLTE; - - // http://www.w3.org/TR/PNG/#11PLTE - private int nentries = 0; - /** - * RGB8 packed in one integer - */ - private int[] entries; - - public PngChunkPLTE(final ImageInfo info) { - super(PngChunkPLTE.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.NA; - } - - @Override - public ChunkRaw createRawChunk() { - final int len = 3 * nentries; - final int[] rgb = new int[3]; - final ChunkRaw c = createEmptyChunk(len, true); - for (int n = 0, i = 0; n < nentries; n++) { - getEntryRgb(n, rgb); - c.data[i++] = (byte) rgb[0]; - c.data[i++] = (byte) rgb[1]; - c.data[i++] = (byte) rgb[2]; - } - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - setNentries(chunk.len / 3); - for (int n = 0, i = 0; n < nentries; n++) - setEntry(n, chunk.data[i++] & 0xff, chunk.data[i++] & 0xff, chunk.data[i++] & 0xff); - } - - public void setNentries(final int n) { - nentries = n; - if (nentries < 1 || nentries > 256) - throw new PngjException("invalid pallette - nentries=" + nentries); - if (entries == null || entries.length != nentries) - entries = new int[nentries]; - } - - public int getNentries() { - return nentries; - } - - public void setEntry(final int n, final int r, final int g, final int b) { - entries[n] = r << 16 | g << 8 | b; - } - - public int getEntry(final int n) { - return entries[n]; - } - - public void getEntryRgb(final int n, final int[] rgb) { - getEntryRgb(n, rgb, 0); - } - - public void getEntryRgb(final int n, final int[] rgb, final int offset) { - final int v = entries[n]; - rgb[offset + 0] = (v & 0xff0000) >> 16; - rgb[offset + 1] = (v & 0xff00) >> 8; - rgb[offset + 2] = v & 0xff; - } - - public int minBitDepth() { - if (nentries <= 2) - return 1; - else if (nentries <= 4) - return 2; - else if (nentries <= 16) - return 4; - else - return 8; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java deleted file mode 100644 index f782b0ea..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java +++ /dev/null @@ -1,114 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * sBIT chunk. - *
- * see http://www.w3.org/TR/PNG/#11sBIT - *
- * this chunk structure depends on the image type - */ -public class PngChunkSBIT extends PngChunkSingle { - public final static String ID = ChunkHelper.sBIT; - // http://www.w3.org/TR/PNG/#11sBIT - - // significant bits - private int graysb, alphasb; - private int redsb, greensb, bluesb; - - public PngChunkSBIT(final ImageInfo info) { - super(PngChunkSBIT.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_PLTE_AND_IDAT; - } - - private int getCLen() { - int len = imgInfo.greyscale ? 1 : 3; - if (imgInfo.alpha) - len += 1; - return len; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - if (c.len != getCLen()) - throw new PngjException("bad chunk length " + c); - if (imgInfo.greyscale) { - graysb = PngHelperInternal.readInt1fromByte(c.data, 0); - if (imgInfo.alpha) - alphasb = PngHelperInternal.readInt1fromByte(c.data, 1); - } else { - redsb = PngHelperInternal.readInt1fromByte(c.data, 0); - greensb = PngHelperInternal.readInt1fromByte(c.data, 1); - bluesb = PngHelperInternal.readInt1fromByte(c.data, 2); - if (imgInfo.alpha) - alphasb = PngHelperInternal.readInt1fromByte(c.data, 3); - } - } - - @Override - public ChunkRaw createRawChunk() { - ChunkRaw c = null; - c = createEmptyChunk(getCLen(), true); - if (imgInfo.greyscale) { - c.data[0] = (byte) graysb; - if (imgInfo.alpha) - c.data[1] = (byte) alphasb; - } else { - c.data[0] = (byte) redsb; - c.data[1] = (byte) greensb; - c.data[2] = (byte) bluesb; - if (imgInfo.alpha) - c.data[3] = (byte) alphasb; - } - return c; - } - - public void setGraysb(final int gray) { - if (!imgInfo.greyscale) - throw new PngjException("only greyscale images support this"); - graysb = gray; - } - - public int getGraysb() { - if (!imgInfo.greyscale) - throw new PngjException("only greyscale images support this"); - return graysb; - } - - public void setAlphasb(final int a) { - if (!imgInfo.alpha) - throw new PngjException("only images with alpha support this"); - alphasb = a; - } - - public int getAlphasb() { - if (!imgInfo.alpha) - throw new PngjException("only images with alpha support this"); - return alphasb; - } - - /** - * Set rgb values - * - */ - public void setRGB(final int r, final int g, final int b) { - if (imgInfo.greyscale || imgInfo.indexed) - throw new PngjException("only rgb or rgba images support this"); - redsb = r; - greensb = g; - bluesb = b; - } - - public int[] getRGB() { - if (imgInfo.greyscale || imgInfo.indexed) - throw new PngjException("only rgb or rgba images support this"); - return new int[] { redsb, greensb, bluesb }; - } -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java deleted file mode 100644 index 423b41ff..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java +++ /dev/null @@ -1,129 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * sPLT chunk. - *
- * see http://www.w3.org/TR/PNG/#11sPLT - */ -public class PngChunkSPLT extends PngChunkMultiple { - public final static String ID = ChunkHelper.sPLT; - - // http://www.w3.org/TR/PNG/#11sPLT - - private String palName; - private int sampledepth; // 8/16 - private int[] palette; // 5 elements per entry - - public PngChunkSPLT(final ImageInfo info) { - super(PngChunkSPLT.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - try { - final ByteArrayOutputStream ba = new ByteArrayOutputStream(); - ba.write(ChunkHelper.toBytes(palName)); - ba.write(0); // separator - ba.write((byte) sampledepth); - final int nentries = getNentries(); - for (int n = 0; n < nentries; n++) { - for (int i = 0; i < 4; i++) - if (sampledepth == 8) - PngHelperInternal.writeByte(ba, (byte) palette[n * 5 + i]); - else - PngHelperInternal.writeInt2(ba, palette[n * 5 + i]); - PngHelperInternal.writeInt2(ba, palette[n * 5 + 4]); - } - final byte[] b = ba.toByteArray(); - final ChunkRaw chunk = createEmptyChunk(b.length, false); - chunk.data = b; - return chunk; - } catch (final IOException e) { - throw new PngjException(e); - } - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - int t = -1; - for (int i = 0; i < c.data.length; i++) - if (c.data[i] == 0) { - t = i; - break; - } - if (t <= 0 || t > c.data.length - 2) - throw new PngjException("bad sPLT chunk: no separator found"); - palName = ChunkHelper.toString(c.data, 0, t); - sampledepth = PngHelperInternal.readInt1fromByte(c.data, t + 1); - t += 2; - final int nentries = (c.data.length - t) / (sampledepth == 8 ? 6 : 10); - palette = new int[nentries * 5]; - int r, g, b, a, f, ne; - ne = 0; - for (int i = 0; i < nentries; i++) { - if (sampledepth == 8) { - r = PngHelperInternal.readInt1fromByte(c.data, t++); - g = PngHelperInternal.readInt1fromByte(c.data, t++); - b = PngHelperInternal.readInt1fromByte(c.data, t++); - a = PngHelperInternal.readInt1fromByte(c.data, t++); - } else { - r = PngHelperInternal.readInt2fromBytes(c.data, t); - t += 2; - g = PngHelperInternal.readInt2fromBytes(c.data, t); - t += 2; - b = PngHelperInternal.readInt2fromBytes(c.data, t); - t += 2; - a = PngHelperInternal.readInt2fromBytes(c.data, t); - t += 2; - } - f = PngHelperInternal.readInt2fromBytes(c.data, t); - t += 2; - palette[ne++] = r; - palette[ne++] = g; - palette[ne++] = b; - palette[ne++] = a; - palette[ne++] = f; - } - } - - public int getNentries() { - return palette.length / 5; - } - - public String getPalName() { - return palName; - } - - public void setPalName(final String palName) { - this.palName = palName; - } - - public int getSampledepth() { - return sampledepth; - } - - public void setSampledepth(final int sampledepth) { - this.sampledepth = sampledepth; - } - - public int[] getPalette() { - return palette; - } - - public void setPalette(final int[] palette) { - this.palette = palette; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java deleted file mode 100644 index de261e79..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java +++ /dev/null @@ -1,55 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * sRGB chunk. - *
- * see http://www.w3.org/TR/PNG/#11sRGB - */ -public class PngChunkSRGB extends PngChunkSingle { - public final static String ID = ChunkHelper.sRGB; - - // http://www.w3.org/TR/PNG/#11sRGB - - public static final int RENDER_INTENT_Perceptual = 0; - public static final int RENDER_INTENT_Relative_colorimetric = 1; - public static final int RENDER_INTENT_Saturation = 2; - public static final int RENDER_INTENT_Absolute_colorimetric = 3; - - private int intent; - - public PngChunkSRGB(final ImageInfo info) { - super(PngChunkSRGB.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_PLTE_AND_IDAT; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - if (c.len != 1) - throw new PngjException("bad chunk length " + c); - intent = PngHelperInternal.readInt1fromByte(c.data, 0); - } - - @Override - public ChunkRaw createRawChunk() { - ChunkRaw c = null; - c = createEmptyChunk(1, true); - c.data[0] = (byte) intent; - return c; - } - - public int getIntent() { - return intent; - } - - public void setIntent(final int intent) { - this.intent = intent; - } -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java deleted file mode 100644 index fe135767..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java +++ /dev/null @@ -1,54 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngjException; - -/** - * sTER chunk. - *
- * see http://www.libpng.org/pub/png/spec/register/pngext-1.3.0-pdg.html#C.sTER - */ -public class PngChunkSTER extends PngChunkSingle { - public final static String ID = "sTER"; - - // http://www.libpng.org/pub/png/spec/register/pngext-1.3.0-pdg.html#C.sTER - private byte mode; // 0: cross-fuse layout 1: diverging-fuse layout - - public PngChunkSTER(final ImageInfo info) { - super(PngChunkSTER.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.BEFORE_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = createEmptyChunk(1, true); - c.data[0] = mode; - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - if (chunk.len != 1) - throw new PngjException("bad chunk length " + chunk); - mode = chunk.data[0]; - } - - /** - * 0: cross-fuse layout 1: diverging-fuse layout - */ - public byte getMode() { - return mode; - } - - /** - * 0: cross-fuse layout 1: diverging-fuse layout - */ - public void setMode(final byte mode) { - this.mode = mode; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java deleted file mode 100644 index a98df4e8..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java +++ /dev/null @@ -1,45 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; - -/** - * PNG chunk type (abstract) that does not allow multiple instances in same - * image. - */ -public abstract class PngChunkSingle extends PngChunk { - - protected PngChunkSingle(final String id, final ImageInfo imgInfo) { - super(id, imgInfo); - } - - @Override - public final boolean allowsMultiple() { - return false; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (id == null ? 0 : id.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final PngChunkSingle other = (PngChunkSingle) obj; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - return true; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java deleted file mode 100644 index efaa62d4..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java +++ /dev/null @@ -1,44 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngjException; - -/** - * tEXt chunk. - *
- * see http://www.w3.org/TR/PNG/#11tEXt - */ -public class PngChunkTEXT extends PngChunkTextVar { - public final static String ID = ChunkHelper.tEXt; - - public PngChunkTEXT(final ImageInfo info) { - super(PngChunkTEXT.ID, info); - } - - public PngChunkTEXT(final ImageInfo info, final String key, final String val) { - super(PngChunkTEXT.ID, info); - setKeyVal(key, val); - } - - @Override - public ChunkRaw createRawChunk() { - if (key == null || key.trim().length() == 0) - throw new PngjException("Text chunk key must be non empty"); - final byte[] b = ChunkHelper.toBytes(key + "\0" + val); - final ChunkRaw chunk = createEmptyChunk(b.length, false); - chunk.data = b; - return chunk; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - int i; - for (i = 0; i < c.data.length; i++) - if (c.data[i] == 0) - break; - key = ChunkHelper.toString(c.data, 0, i); - i++; - val = i < c.data.length ? ChunkHelper.toString(c.data, i, c.data.length - i) : ""; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java deleted file mode 100644 index 37fab915..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java +++ /dev/null @@ -1,83 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import java.util.Calendar; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * tIME chunk. - *
- * see http://www.w3.org/TR/PNG/#11tIME - */ -public class PngChunkTIME extends PngChunkSingle { - public final static String ID = ChunkHelper.tIME; - - // http://www.w3.org/TR/PNG/#11tIME - private int year, mon, day, hour, min, sec; - - public PngChunkTIME(final ImageInfo info) { - super(PngChunkTIME.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.NONE; - } - - @Override - public ChunkRaw createRawChunk() { - final ChunkRaw c = createEmptyChunk(7, true); - PngHelperInternal.writeInt2tobytes(year, c.data, 0); - c.data[2] = (byte) mon; - c.data[3] = (byte) day; - c.data[4] = (byte) hour; - c.data[5] = (byte) min; - c.data[6] = (byte) sec; - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw chunk) { - if (chunk.len != 7) - throw new PngjException("bad chunk " + chunk); - year = PngHelperInternal.readInt2fromBytes(chunk.data, 0); - mon = PngHelperInternal.readInt1fromByte(chunk.data, 2); - day = PngHelperInternal.readInt1fromByte(chunk.data, 3); - hour = PngHelperInternal.readInt1fromByte(chunk.data, 4); - min = PngHelperInternal.readInt1fromByte(chunk.data, 5); - sec = PngHelperInternal.readInt1fromByte(chunk.data, 6); - } - - public void setNow(final int secsAgo) { - final Calendar d = Calendar.getInstance(); - d.setTimeInMillis(System.currentTimeMillis() - 1000 * (long) secsAgo); - year = d.get(Calendar.YEAR); - mon = d.get(Calendar.MONTH) + 1; - day = d.get(Calendar.DAY_OF_MONTH); - hour = d.get(Calendar.HOUR_OF_DAY); - min = d.get(Calendar.MINUTE); - sec = d.get(Calendar.SECOND); - } - - public void setYMDHMS(final int yearx, final int monx, final int dayx, final int hourx, final int minx, - final int secx) { - year = yearx; - mon = monx; - day = dayx; - hour = hourx; - min = minx; - sec = secx; - } - - public int[] getYMDHMS() { - return new int[] { year, mon, day, hour, min, sec }; - } - - /** format YYYY/MM/DD HH:mm:SS */ - public String getAsString() { - return String.format("%04d/%02d/%02d %02d:%02d:%02d", year, mon, day, hour, min, sec); - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java deleted file mode 100644 index dd507304..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java +++ /dev/null @@ -1,150 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngHelperInternal; -import ar.com.hjg.pngj.PngjException; - -/** - * tRNS chunk. - *
- * see http://www.w3.org/TR/PNG/#11tRNS - *
- * this chunk structure depends on the image type - */ -public class PngChunkTRNS extends PngChunkSingle { - public final static String ID = ChunkHelper.tRNS; - - // http://www.w3.org/TR/PNG/#11tRNS - - // only one of these is meaningful, depending on the image type - private int gray; - private int red, green, blue; - private int[] paletteAlpha = new int[] {}; - - public PngChunkTRNS(final ImageInfo info) { - super(PngChunkTRNS.ID, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.AFTER_PLTE_BEFORE_IDAT; - } - - @Override - public ChunkRaw createRawChunk() { - ChunkRaw c = null; - if (imgInfo.greyscale) { - c = createEmptyChunk(2, true); - PngHelperInternal.writeInt2tobytes(gray, c.data, 0); - } else if (imgInfo.indexed) { - c = createEmptyChunk(paletteAlpha.length, true); - for (int n = 0; n < c.len; n++) - c.data[n] = (byte) paletteAlpha[n]; - } else { - c = createEmptyChunk(6, true); - PngHelperInternal.writeInt2tobytes(red, c.data, 0); - PngHelperInternal.writeInt2tobytes(green, c.data, 0); - PngHelperInternal.writeInt2tobytes(blue, c.data, 0); - } - return c; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - if (imgInfo.greyscale) - gray = PngHelperInternal.readInt2fromBytes(c.data, 0); - else if (imgInfo.indexed) { - final int nentries = c.data.length; - paletteAlpha = new int[nentries]; - for (int n = 0; n < nentries; n++) - paletteAlpha[n] = c.data[n] & 0xff; - } else { - red = PngHelperInternal.readInt2fromBytes(c.data, 0); - green = PngHelperInternal.readInt2fromBytes(c.data, 2); - blue = PngHelperInternal.readInt2fromBytes(c.data, 4); - } - } - - /** - * Set rgb values - * - */ - public void setRGB(final int r, final int g, final int b) { - if (imgInfo.greyscale || imgInfo.indexed) - throw new PngjException("only rgb or rgba images support this"); - red = r; - green = g; - blue = b; - } - - public int[] getRGB() { - if (imgInfo.greyscale || imgInfo.indexed) - throw new PngjException("only rgb or rgba images support this"); - return new int[] { red, green, blue }; - } - - public int getRGB888() { - if (imgInfo.greyscale || imgInfo.indexed) - throw new PngjException("only rgb or rgba images support this"); - return red << 16 | green << 8 | blue; - } - - public void setGray(final int g) { - if (!imgInfo.greyscale) - throw new PngjException("only grayscale images support this"); - gray = g; - } - - public int getGray() { - if (!imgInfo.greyscale) - throw new PngjException("only grayscale images support this"); - return gray; - } - - /** - * Sets the length of the palette alpha. This should be followed by - * #setNentriesPalAlpha - * - * @param idx - * index inside the table - * @param val - * alpha value (0-255) - */ - public void setEntryPalAlpha(final int idx, final int val) { - paletteAlpha[idx] = val; - } - - public void setNentriesPalAlpha(final int len) { - paletteAlpha = new int[len]; - } - - /** - * WARNING: non deep copy. See also {@link #setNentriesPalAlpha(int)} - * {@link #setEntryPalAlpha(int, int)} - */ - public void setPalAlpha(final int[] palAlpha) { - if (!imgInfo.indexed) - throw new PngjException("only indexed images support this"); - paletteAlpha = palAlpha; - } - - /** - * WARNING: non deep copy - */ - public int[] getPalletteAlpha() { - return paletteAlpha; - } - - /** - * to use when only one pallete index is set as totally transparent - */ - public void setIndexEntryAsTransparent(final int palAlphaIndex) { - if (!imgInfo.indexed) - throw new PngjException("only indexed images support this"); - paletteAlpha = new int[] { palAlphaIndex + 1 }; - for (int i = 0; i < palAlphaIndex; i++) - paletteAlpha[i] = 255; - paletteAlpha[palAlphaIndex] = 0; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java deleted file mode 100644 index 1591011a..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java +++ /dev/null @@ -1,60 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; - -/** - * Superclass (abstract) for three textual chunks (TEXT, ITXT, ZTXT) - */ -public abstract class PngChunkTextVar extends PngChunkMultiple { - protected String key; // key/val: only for tEXt. lazy computed - protected String val; - - // http://www.w3.org/TR/PNG/#11keywords - public final static String KEY_Title = "Title"; // Short (one line) title or caption for image - public final static String KEY_Author = "Author"; // Name of image's creator - public final static String KEY_Description = "Description"; // Description of image (possibly - // long) - public final static String KEY_Copyright = "Copyright"; // Copyright notice - public final static String KEY_Creation_Time = "Creation Time"; // Time of original image creation - public final static String KEY_Software = "Software"; // Software used to create the image - public final static String KEY_Disclaimer = "Disclaimer"; // Legal disclaimer - public final static String KEY_Warning = "Warning"; // Warning of nature of content - public final static String KEY_Source = "Source"; // Device used to create the image - public final static String KEY_Comment = "Comment"; // Miscellaneous comment - - protected PngChunkTextVar(final String id, final ImageInfo info) { - super(id, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.NONE; - } - - public static class PngTxtInfo { - public String title; - public String author; - public String description; - public String creation_time;// = (new Date()).toString(); - public String software; - public String disclaimer; - public String warning; - public String source; - public String comment; - - } - - public String getKey() { - return key; - } - - public String getVal() { - return val; - } - - public void setKeyVal(final String key, final String val) { - this.key = key; - this.val = val; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java deleted file mode 100644 index dbc8ad08..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java +++ /dev/null @@ -1,40 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import ar.com.hjg.pngj.ImageInfo; - -/** - * Placeholder for UNKNOWN (custom or not) chunks. - *
- * For PngReader, a chunk is unknown if it's not registered in the chunk factory - */ -public class PngChunkUNKNOWN extends PngChunkMultiple { // unkown, custom or not - - public PngChunkUNKNOWN(final String id, final ImageInfo info) { - super(id, info); - } - - @Override - public ChunkOrderingConstraint getOrderingConstraint() { - return ChunkOrderingConstraint.NONE; - } - - @Override - public ChunkRaw createRawChunk() { - return raw; - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - - } - - /* does not do deep copy! */ - public byte[] getData() { - return raw.data; - } - - /* does not do deep copy! */ - public void setData(final byte[] data) { - raw.data = data; - } -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java deleted file mode 100644 index 7ad9e69b..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java +++ /dev/null @@ -1,61 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -import ar.com.hjg.pngj.ImageInfo; -import ar.com.hjg.pngj.PngjException; - -/** - * zTXt chunk. - *
- * see http://www.w3.org/TR/PNG/#11zTXt - */ -public class PngChunkZTXT extends PngChunkTextVar { - public final static String ID = ChunkHelper.zTXt; - - // http://www.w3.org/TR/PNG/#11zTXt - public PngChunkZTXT(final ImageInfo info) { - super(PngChunkZTXT.ID, info); - } - - @Override - public ChunkRaw createRawChunk() { - if (key == null || key.trim().length() == 0) - throw new PngjException("Text chunk key must be non empty"); - try { - final ByteArrayOutputStream ba = new ByteArrayOutputStream(); - ba.write(ChunkHelper.toBytes(key)); - ba.write(0); // separator - ba.write(0); // compression method: 0 - final byte[] textbytes = ChunkHelper.compressBytes(ChunkHelper.toBytes(val), true); - ba.write(textbytes); - final byte[] b = ba.toByteArray(); - final ChunkRaw chunk = createEmptyChunk(b.length, false); - chunk.data = b; - return chunk; - } catch (final IOException e) { - throw new PngjException(e); - } - } - - @Override - public void parseFromRaw(final ChunkRaw c) { - int nullsep = -1; - for (int i = 0; i < c.data.length; i++) { // look for first zero - if (c.data[i] != 0) - continue; - nullsep = i; - break; - } - if (nullsep < 0 || nullsep > c.data.length - 2) - throw new PngjException("bad zTXt chunk: no separator found"); - key = ChunkHelper.toString(c.data, 0, nullsep); - final int compmet = c.data[nullsep + 1]; - if (compmet != 0) - throw new PngjException("bad zTXt chunk: unknown compression method"); - final byte[] uncomp = ChunkHelper.compressBytes(c.data, nullsep + 2, c.data.length - nullsep - 2, false); // uncompress - val = ChunkHelper.toString(uncomp); - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngMetadata.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngMetadata.java deleted file mode 100644 index 46c30c92..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngMetadata.java +++ /dev/null @@ -1,235 +0,0 @@ -package ar.com.hjg.pngj.chunks; - -import java.util.ArrayList; -import java.util.List; - -import ar.com.hjg.pngj.PngjException; - -/** - * We consider "image metadata" every info inside the image except for the most - * basic image info (IHDR chunk - ImageInfo - * class) and the pixels values. - *
- * This includes the palette (if present) and all the ancillary chunks - *
- * This class provides a wrapper over the collection of chunks of a image (read - * or to write) and provides some high - * level methods to access them - */ -public class PngMetadata { - private final ChunksList chunkList; - private final boolean readonly; - - public PngMetadata(final ChunksList chunks) { - chunkList = chunks; - if (chunks instanceof ChunksListForWrite) - readonly = false; - else - readonly = true; - } - - /** - * Queues the chunk at the writer - *
- * lazyOverwrite: if true, checks if there is a queued "equivalent" chunk - * and if so, overwrites it. However if that - * not check for already written chunks. - */ - public void queueChunk(final PngChunk c, final boolean lazyOverwrite) { - final ChunksListForWrite cl = getChunkListW(); - if (readonly) - throw new PngjException("cannot set chunk : readonly metadata"); - if (lazyOverwrite) - ChunkHelper.trimList(cl.getQueuedChunks(), c2 -> ChunkHelper.equivalent(c, c2)); - cl.queue(c); - } - - public void queueChunk(final PngChunk c) { - queueChunk(c, true); - } - - private ChunksListForWrite getChunkListW() { - return (ChunksListForWrite) chunkList; - } - - // ///// high level utility methods follow //////////// - - // //////////// DPI - - /** - * returns -1 if not found or dimension unknown - */ - public double[] getDpi() { - final PngChunk c = chunkList.getById1(ChunkHelper.pHYs, true); - if (c == null) - return new double[] { -1, -1 }; - else - return ((PngChunkPHYS) c).getAsDpi2(); - } - - public void setDpi(final double x) { - setDpi(x, x); - } - - public void setDpi(final double x, final double y) { - final PngChunkPHYS c = new PngChunkPHYS(chunkList.imageInfo); - c.setAsDpi2(x, y); - queueChunk(c); - } - - // //////////// TIME - - /** - * Creates a time chunk with current time, less secsAgo seconds - *
- * - * @return Returns the created-queued chunk, just in case you want to - * examine or modify it - */ - public PngChunkTIME setTimeNow(final int secsAgo) { - final PngChunkTIME c = new PngChunkTIME(chunkList.imageInfo); - c.setNow(secsAgo); - queueChunk(c); - return c; - } - - public PngChunkTIME setTimeNow() { - return setTimeNow(0); - } - - /** - * Creates a time chunk with diven date-time - *
- * - * @return Returns the created-queued chunk, just in case you want to - * examine or modify it - */ - public PngChunkTIME setTimeYMDHMS(final int yearx, final int monx, final int dayx, final int hourx, final int minx, - final int secx) { - final PngChunkTIME c = new PngChunkTIME(chunkList.imageInfo); - c.setYMDHMS(yearx, monx, dayx, hourx, minx, secx); - queueChunk(c, true); - return c; - } - - /** - * null if not found - */ - public PngChunkTIME getTime() { - return (PngChunkTIME) chunkList.getById1(ChunkHelper.tIME); - } - - public String getTimeAsString() { - final PngChunkTIME c = getTime(); - return c == null ? "" : c.getAsString(); - } - - // //////////// TEXT - - /** - * Creates a text chunk and queue it. - *
- * - * @param k - * : key (latin1) - * @param val - * (arbitrary, should be latin1 if useLatin1) - * @param useLatin1 - * @param compress - * @return Returns the created-queued chunks, just in case you want to - * examine, touch it - */ - public PngChunkTextVar setText(final String k, final String val, final boolean useLatin1, final boolean compress) { - if (compress && !useLatin1) - throw new PngjException("cannot compress non latin text"); - PngChunkTextVar c; - if (useLatin1) { - if (compress) - c = new PngChunkZTXT(chunkList.imageInfo); - else - c = new PngChunkTEXT(chunkList.imageInfo); - } else { - c = new PngChunkITXT(chunkList.imageInfo); - ((PngChunkITXT) c).setLangtag(k); // we use the same orig tag (this is not quite right) - } - c.setKeyVal(k, val); - queueChunk(c, true); - return c; - } - - public PngChunkTextVar setText(final String k, final String val) { - return setText(k, val, false, false); - } - - /** - * gets all text chunks with a given key - *
- * returns null if not found - *
- * Warning: this does not check the "lang" key of iTxt - */ - @SuppressWarnings("unchecked") - public List getTxtsForKey(final String k) { - @SuppressWarnings("rawtypes") - final List c = new ArrayList(); - c.addAll(chunkList.getById(ChunkHelper.tEXt, k)); - c.addAll(chunkList.getById(ChunkHelper.zTXt, k)); - c.addAll(chunkList.getById(ChunkHelper.iTXt, k)); - return c; - } - - /** - * Returns empty if not found, concatenated (with newlines) if multiple! - - * and trimmed - *
- * Use getTxtsForKey() if you don't want this behaviour - */ - public String getTxtForKey(final String k) { - final List li = getTxtsForKey(k); - if (li.isEmpty()) - return ""; - final StringBuilder t = new StringBuilder(); - for (final PngChunkTextVar c : li) - t.append(c.getVal()).append("\n"); - return t.toString().trim(); - } - - /** - * Returns the palette chunk, if present - * - * @return null if not present - */ - public PngChunkPLTE getPLTE() { - return (PngChunkPLTE) chunkList.getById1(PngChunkPLTE.ID); - } - - /** - * Creates a new empty palette chunk, queues it for write and return it to - * the caller, who should fill its entries - */ - public PngChunkPLTE createPLTEChunk() { - final PngChunkPLTE plte = new PngChunkPLTE(chunkList.imageInfo); - queueChunk(plte); - return plte; - } - - /** - * Returns the TRNS chunk, if present - * - * @return null if not present - */ - public PngChunkTRNS getTRNS() { - return (PngChunkTRNS) chunkList.getById1(PngChunkTRNS.ID); - } - - /** - * Creates a new empty TRNS chunk, queues it for write and return it to the - * caller, who should fill its entries - */ - public PngChunkTRNS createTRNSChunk() { - final PngChunkTRNS trns = new PngChunkTRNS(chunkList.imageInfo); - queueChunk(trns); - return trns; - } - -} diff --git a/teavm/src/main/java/ar/com/hjg/pngj/chunks/package.html b/teavm/src/main/java/ar/com/hjg/pngj/chunks/package.html deleted file mode 100644 index 13740669..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/chunks/package.html +++ /dev/null @@ -1,9 +0,0 @@ - -
--Contains the code related to chunk management for the PNGJ library.
--Only needed by client code if some special chunk handling is required. -
- - diff --git a/teavm/src/main/java/ar/com/hjg/pngj/package.html b/teavm/src/main/java/ar/com/hjg/pngj/package.html deleted file mode 100644 index a417d56b..00000000 --- a/teavm/src/main/java/ar/com/hjg/pngj/package.html +++ /dev/null @@ -1,49 +0,0 @@ - - --PNGJ main package -
-
-Users of this library should rarely need more than the public members of this package.
-Newcomers: start with PngReader and PngWriter.
-
-Example of use: this code reads a true colour PNG image (RGB8 or RGBA8) -and reduces the red channel by half, increasing the green by 20. -It copies all the "safe" metadata from the original image, and adds a textual metadata. - -
- public static void convert(String origFilename, String destFilename) {
- // you can also use PngReader (esentially the same) or PngReaderByte
- PngReaderInt pngr = new PngReaderInt(new File(origFilename));
- System.out.println(pngr.toString());
- int channels = pngr.imgInfo.channels;
- if (channels < 3 || pngr.imgInfo.bitDepth != 8)
- throw new RuntimeException("For simplicity this supports only RGB8/RGBA8 images");
- // writer with same image properties as original
- PngWriter pngw = new PngWriter(new File(destFilename), pngr.imgInfo, true);
- // instruct the writer to grab all ancillary chunks from the original
- pngw.copyChunksFrom(pngr.getChunksList(), ChunkCopyBehaviour.COPY_ALL_SAFE);
- // add a textual chunk to writer
- pngw.getMetadata().setText(PngChunkTextVar.KEY_Description, "Decreased red and increased green");
- // also: while(pngr.hasMoreRows())
- for (int row = 0; row < pngr.imgInfo.rows; row++) {
- ImageLineInt l1 = pngr.readRowInt(); // each element is a sample
- int[] scanline = l1.getScanline(); // to save typing
- for (int j = 0; j < pngr.imgInfo.cols; j++) {
- scanline[j * channels] /= 2;
- scanline[j * channels + 1] = ImageLineHelper.clampTo_0_255(scanline[j * channels + 1] + 20);
- }
- pngw.writeRow(l1);
- }
- pngr.end(); // it's recommended to end the reader first, in case there are trailing chunks to read
- pngw.end();
- }
-
-
-
-For more examples, see the tests and samples.
-
-
-
-
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStream.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStream.java
deleted file mode 100644
index 7c7425af..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStream.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-import java.io.OutputStream;
-
-import ar.com.hjg.pngj.IDatChunkWriter;
-
-/**
- * This is an OutputStream that compresses (via Deflater or a deflater-like
- * object), and optionally passes the
- * compressed stream to another output stream.
- *
- * It allows to compute in/out/ratio stats.
- *
- * It works as a stream (similar to DeflaterOutputStream), but it's peculiar in
- * that it expects that each writes has a
- * fixed length (other lenghts are accepted, but it's less efficient) and that
- * the total amount of bytes is known (so it
- * can close itself, but it can also be closed on demand) In PNGJ use, the block
- * is typically a row (including filter
- * byte).
- *
- * We use this to do the real compression (with Deflate) but also to compute
- * tentative estimators
- *
- * If not closed, it can be recicled via reset()
- *
- *
- */
-public abstract class CompressorStream extends OutputStream {
-
- protected IDatChunkWriter idatChunkWriter;
- public final int blockLen;
- public final long totalbytes;
-
- boolean closed = false;
- protected boolean done = false;
- protected long bytesIn = 0;
- protected long bytesOut = 0;
- protected int block = -1;
-
- /** optionally stores the first byte of each block (row) */
- private byte[] firstBytes;
- protected boolean storeFirstByte = false;
-
- /**
- *
- * @param idatCw
- * Can be null (if we are only interested in compute compression
- * ratio)
- * @param blockLen
- * Estimated maximum block length. If unknown, use -1.
- * @param totalbytes
- * Expected total bytes to be fed. If unknown, use -1.
- */
- public CompressorStream(final IDatChunkWriter idatCw, int blockLen, long totalbytes) {
- idatChunkWriter = idatCw;
- if (blockLen < 0)
- blockLen = 4096;
- if (totalbytes < 0)
- totalbytes = Long.MAX_VALUE;
- if (blockLen < 1 || totalbytes < 1)
- throw new RuntimeException(" maxBlockLen or totalLen invalid");
- this.blockLen = blockLen;
- this.totalbytes = totalbytes;
- }
-
- /** Releases resources. Idempotent. */
- @Override
- public void close() {
- done();
- if (idatChunkWriter != null)
- idatChunkWriter.close();
- closed = true;
- }
-
- /**
- * Will be called automatically when the number of bytes reaches the total
- * expected Can be also be called from
- * outside. This should set the flag done=true
- */
- public abstract void done();
-
- @Override
- public final void write(final byte[] data) {
- write(data, 0, data.length);
- }
-
- @Override
- public final void write(final byte[] data, int off, int len) {
- block++;
- if (len <= blockLen) { // normal case
- mywrite(data, off, len);
- if (storeFirstByte && block < firstBytes.length)
- firstBytes[block] = data[off]; // only makes sense in this case
- } else
- while (len > 0) {
- mywrite(data, off, blockLen);
- off += blockLen;
- len -= blockLen;
- }
- if (bytesIn >= totalbytes)
- done();
-
- }
-
- /**
- * same as write, but guarantedd to not exceed blockLen The implementation
- * should update bytesOut and bytesInt but not
- * check for totalBytes
- */
- public abstract void mywrite(byte[] data, int off, int len);
-
- /**
- * compressed/raw. This should be called only when done
- */
- public final double getCompressionRatio() {
- return bytesOut == 0 ? 1.0 : bytesOut / (double) bytesIn;
- }
-
- /**
- * raw (input) bytes. This should be called only when done
- */
- public final long getBytesRaw() {
- return bytesIn;
- }
-
- /**
- * compressed (out) bytes. This should be called only when done
- */
- public final long getBytesCompressed() {
- return bytesOut;
- }
-
- public boolean isClosed() {
- return closed;
- }
-
- public boolean isDone() {
- return done;
- }
-
- public byte[] getFirstBytes() {
- return firstBytes;
- }
-
- public void setStoreFirstByte(final boolean storeFirstByte, final int nblocks) {
- this.storeFirstByte = storeFirstByte;
- if (this.storeFirstByte) {
- if (firstBytes == null || firstBytes.length < nblocks)
- firstBytes = new byte[nblocks];
- } else
- firstBytes = null;
- }
-
- public void reset() {
- done();
- bytesIn = 0;
- bytesOut = 0;
- block = -1;
- done = false;
- }
-
- @Override
- public void write(final int i) { // should not be used
- write(new byte[] { (byte) i });
- }
-
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java
deleted file mode 100644
index 291bf4d6..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-import java.util.zip.Deflater;
-
-import ar.com.hjg.pngj.IDatChunkWriter;
-import ar.com.hjg.pngj.PngjOutputException;
-
-/**
- * CompressorStream backed by a Deflater.
- *
- * Note that the Deflater is not disposed after done, you should either recycle
- * this with reset() or dispose it with
- * close()
- *
- */
-public class CompressorStreamDeflater extends CompressorStream {
-
- protected Deflater deflater;
- protected byte[] buf1; // temporary storage of compressed bytes: only used if idatWriter is null
- protected boolean deflaterIsOwn = true;
-
- /**
- * if a deflater is passed, it must be already reset. It will not be
- * released on close
- */
- public CompressorStreamDeflater(final IDatChunkWriter idatCw, final int maxBlockLen, final long totalLen, final Deflater def) {
- super(idatCw, maxBlockLen, totalLen);
- deflater = def == null ? new Deflater() : def;
- deflaterIsOwn = def == null;
- }
-
- public CompressorStreamDeflater(final IDatChunkWriter idatCw, final int maxBlockLen, final long totalLen) {
- this(idatCw, maxBlockLen, totalLen, null);
- }
-
- public CompressorStreamDeflater(final IDatChunkWriter idatCw, final int maxBlockLen, final long totalLen, final int deflaterCompLevel, final int deflaterStrategy) {
- this(idatCw, maxBlockLen, totalLen, new Deflater(deflaterCompLevel));
- deflaterIsOwn = true;
- deflater.setStrategy(deflaterStrategy);
- }
-
- @Override
- public void mywrite(final byte[] data, final int off, final int len) {
- if (deflater.finished() || done || closed)
- throw new PngjOutputException("write beyond end of stream");
- deflater.setInput(data, off, len);
- bytesIn += len;
- while (!deflater.needsInput())
- deflate();
- }
-
- protected void deflate() {
- byte[] buf;
- int off, n;
- if (idatChunkWriter != null) {
- buf = idatChunkWriter.getBuf();
- off = idatChunkWriter.getOffset();
- n = idatChunkWriter.getAvailLen();
- } else {
- if (buf1 == null)
- buf1 = new byte[4096];
- buf = buf1;
- off = 0;
- n = buf1.length;
- }
- final int len = deflater.deflate(buf, off, n);
- if (len > 0) {
- if (idatChunkWriter != null)
- idatChunkWriter.incrementOffset(len);
- bytesOut += len;
- }
- }
-
- /** automatically called when done */
- @Override
- public void done() {
- if (done)
- return;
- if (!deflater.finished()) {
- deflater.finish();
- while (!deflater.finished())
- deflate();
- }
- done = true;
- if (idatChunkWriter != null)
- idatChunkWriter.close();
- }
-
- @Override
- public void close() {
- done();
- try {
- if (deflaterIsOwn)
- deflater.end();
- } catch (final Exception e) {}
- super.close();
- }
-
- @Override
- public void reset() {
- deflater.reset();
- super.reset();
- }
-
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java
deleted file mode 100644
index 318918f2..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-import java.util.zip.Deflater;
-
-import ar.com.hjg.pngj.IDatChunkWriter;
-import ar.com.hjg.pngj.PngjOutputException;
-
-/**
- * This class uses a quick compressor to get a rough estimate of deflate
- * compression ratio.
- *
- * This just ignores the outputStream, and the deflater related parameters
- */
-public class CompressorStreamLz4 extends CompressorStream {
-
- private final DeflaterEstimatorLz4 lz4;
-
- private byte[] buf; // lazily allocated, only if needed
- private final int buffer_size;
- // bufpos=bytes in buffer yet not compressed (bytesIn include this)
- private int inbuf = 0;
-
- private static final int MAX_BUFFER_SIZE = 16000;
-
- public CompressorStreamLz4(final IDatChunkWriter os, final int maxBlockLen, final long totalLen) {
- super(os, maxBlockLen, totalLen);
- lz4 = new DeflaterEstimatorLz4();
- buffer_size = (int) (totalLen > CompressorStreamLz4.MAX_BUFFER_SIZE ? CompressorStreamLz4.MAX_BUFFER_SIZE : totalLen);
- }
-
- public CompressorStreamLz4(final IDatChunkWriter os, final int maxBlockLen, final long totalLen, final Deflater def) {
- this(os, maxBlockLen, totalLen);// edlfater ignored
- }
-
- public CompressorStreamLz4(final IDatChunkWriter os, final int maxBlockLen, final long totalLen, final int deflaterCompLevel, final int deflaterStrategy) {
- this(os, maxBlockLen, totalLen); // paramters ignored
- }
-
- @Override
- public void mywrite(final byte[] b, int off, int len) {
- if (len == 0)
- return;
- if (done || closed)
- throw new PngjOutputException("write beyond end of stream");
- bytesIn += len;
- while (len > 0)
- if (inbuf == 0 && (len >= CompressorStreamLz4.MAX_BUFFER_SIZE || bytesIn == totalbytes)) {
- // direct copy (buffer might be null or empty)
- bytesOut += lz4.compressEstim(b, off, len);
- len = 0;
- } else {
- if (buf == null)
- buf = new byte[buffer_size];
- final int len1 = inbuf + len <= buffer_size ? len : buffer_size - inbuf; // to copy
- if (len1 > 0)
- System.arraycopy(b, off, buf, inbuf, len1);
- inbuf += len1;
- len -= len1;
- off += len1;
- if (inbuf == buffer_size)
- compressFromBuffer();
- }
- }
-
- void compressFromBuffer() {
- if (inbuf > 0) {
- bytesOut += lz4.compressEstim(buf, 0, inbuf);
- inbuf = 0;
- }
- }
-
- @Override
- public void done() {
- if (!done) {
- compressFromBuffer();
- done = true;
- }
- }
-
- @Override
- public void close() {
- done();
- if (!closed) {
- super.close();
- buf = null;
- }
- }
-
- @Override
- public void reset() {
- super.reset();
- }
-
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java
deleted file mode 100644
index 4f8fab67..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-final public class DeflaterEstimatorHjg {
-
- /**
- * This object is stateless, it's thread safe and can be reused
- */
- public DeflaterEstimatorHjg() {}
-
- /**
- * Estimates the length of the compressed bytes, as compressed by Lz4
- * WARNING: if larger than LZ4_64K_LIMIT it cuts it
- * in fragments
- *
- * WARNING: if some part of the input is discarded, this should return the
- * proportional (so that
- * returnValue/srcLen=compressionRatio)
- *
- * @param src
- * @param srcOff
- * @param srcLen
- * @return length of the compressed bytes
- */
- public int compressEstim(final byte[] src, int srcOff, final int srcLen) {
- if (srcLen < 10)
- return srcLen; // too small
- int stride = DeflaterEstimatorHjg.LZ4_64K_LIMIT - 1;
- final int segments = (srcLen + stride - 1) / stride;
- stride = srcLen / segments;
- if (stride >= DeflaterEstimatorHjg.LZ4_64K_LIMIT - 1 || stride * segments > srcLen || segments < 1 || stride < 1)
- throw new RuntimeException("?? " + srcLen);
- int bytesIn = 0;
- int bytesOut = 0;
- int len = srcLen;
- while (len > 0) {
- if (len > stride)
- len = stride;
- bytesOut += DeflaterEstimatorHjg.compress64k(src, srcOff, len);
- srcOff += len;
- bytesIn += len;
- len = srcLen - bytesIn;
- }
- final double ratio = bytesOut / (double) bytesIn;
- return bytesIn == srcLen ? bytesOut : (int) (ratio * srcLen + 0.5);
- }
-
- public int compressEstim(final byte[] src) {
- return compressEstim(src, 0, src.length);
- }
-
- static final int MEMORY_USAGE = 14;
- static final int NOT_COMPRESSIBLE_DETECTION_LEVEL = 6; // see SKIP_STRENGTH
-
- static final int MIN_MATCH = 4;
-
- static final int HASH_LOG = DeflaterEstimatorHjg.MEMORY_USAGE - 2;
- static final int HASH_TABLE_SIZE = 1 << DeflaterEstimatorHjg.HASH_LOG;
-
- static final int SKIP_STRENGTH = Math.max(DeflaterEstimatorHjg.NOT_COMPRESSIBLE_DETECTION_LEVEL, 2); // 6 findMatchAttempts =
- // 2^SKIP_STRENGTH+3
- static final int COPY_LENGTH = 8;
- static final int LAST_LITERALS = 5;
- static final int MF_LIMIT = DeflaterEstimatorHjg.COPY_LENGTH + DeflaterEstimatorHjg.MIN_MATCH;
- static final int MIN_LENGTH = DeflaterEstimatorHjg.MF_LIMIT + 1;
-
- static final int MAX_DISTANCE = 1 << 16;
-
- static final int ML_BITS = 4;
- static final int ML_MASK = (1 << DeflaterEstimatorHjg.ML_BITS) - 1;
- static final int RUN_BITS = 8 - DeflaterEstimatorHjg.ML_BITS;
- static final int RUN_MASK = (1 << DeflaterEstimatorHjg.RUN_BITS) - 1;
-
- static final int LZ4_64K_LIMIT = (1 << 16) + DeflaterEstimatorHjg.MF_LIMIT - 1;
- static final int HASH_LOG_64K = DeflaterEstimatorHjg.HASH_LOG + 1;
- static final int HASH_TABLE_SIZE_64K = 1 << DeflaterEstimatorHjg.HASH_LOG_64K;
-
- static final int HASH_LOG_HC = 15;
- static final int HASH_TABLE_SIZE_HC = 1 << DeflaterEstimatorHjg.HASH_LOG_HC;
- static final int OPTIMAL_ML = DeflaterEstimatorHjg.ML_MASK - 1 + DeflaterEstimatorHjg.MIN_MATCH;
-
- static int compress64k(final byte[] src, final int srcOff, final int srcLen) {
- final int srcEnd = srcOff + srcLen;
- final int srcLimit = srcEnd - DeflaterEstimatorHjg.LAST_LITERALS;
- final int mflimit = srcEnd - DeflaterEstimatorHjg.MF_LIMIT;
-
- int sOff = srcOff, dOff = 0;
-
- int anchor = sOff;
-
- if (srcLen >= DeflaterEstimatorHjg.MIN_LENGTH) {
-
- final short[] hashTable = new short[DeflaterEstimatorHjg.HASH_TABLE_SIZE_64K];
-
- ++sOff;
-
- main: while (true) {
-
- // find a match
- int forwardOff = sOff;
-
- int ref;
- int findMatchAttempts1 = (1 << DeflaterEstimatorHjg.SKIP_STRENGTH) + 3; // 64+3=67
- do {
- sOff = forwardOff;
- forwardOff += findMatchAttempts1++ >>> DeflaterEstimatorHjg.SKIP_STRENGTH;
-
- if (forwardOff > mflimit)
- break main; // ends all
-
- final int h = DeflaterEstimatorHjg.hash64k(DeflaterEstimatorHjg.readInt(src, sOff));
- ref = srcOff + DeflaterEstimatorHjg.readShort(hashTable, h);
- DeflaterEstimatorHjg.writeShort(hashTable, h, sOff - srcOff);
- } while (!DeflaterEstimatorHjg.readIntEquals(src, ref, sOff));
-
- // catch up
- final int excess = DeflaterEstimatorHjg.commonBytesBackward(src, ref, sOff, srcOff, anchor);
- sOff -= excess;
- ref -= excess;
- // sequence == refsequence
- final int runLen = sOff - anchor;
- dOff++;
-
- if (runLen >= DeflaterEstimatorHjg.RUN_MASK) {
- if (runLen > DeflaterEstimatorHjg.RUN_MASK)
- dOff += (runLen - DeflaterEstimatorHjg.RUN_MASK) / 0xFF;
- dOff++;
- }
- dOff += runLen;
- while (true) {
- // encode offset
- dOff += 2;
- // count nb matches
- sOff += DeflaterEstimatorHjg.MIN_MATCH;
- ref += DeflaterEstimatorHjg.MIN_MATCH;
- final int matchLen = DeflaterEstimatorHjg.commonBytes(src, ref, sOff, srcLimit);
- sOff += matchLen;
- // encode match len
- if (matchLen >= DeflaterEstimatorHjg.ML_MASK) {
- if (matchLen >= DeflaterEstimatorHjg.ML_MASK + 0xFF)
- dOff += (matchLen - DeflaterEstimatorHjg.ML_MASK) / 0xFF;
- dOff++;
- }
- // test end of chunk
- if (sOff > mflimit) {
- anchor = sOff;
- break main;
- }
- // fill table
- DeflaterEstimatorHjg.writeShort(hashTable, DeflaterEstimatorHjg.hash64k(DeflaterEstimatorHjg.readInt(src, sOff - 2)), sOff - 2 - srcOff);
- // test next position
- final int h = DeflaterEstimatorHjg.hash64k(DeflaterEstimatorHjg.readInt(src, sOff));
- ref = srcOff + DeflaterEstimatorHjg.readShort(hashTable, h);
- DeflaterEstimatorHjg.writeShort(hashTable, h, sOff - srcOff);
- if (!DeflaterEstimatorHjg.readIntEquals(src, sOff, ref))
- break;
- dOff++;
- }
- // prepare next loop
- anchor = sOff++;
- }
- }
- final int runLen = srcEnd - anchor;
- if (runLen >= DeflaterEstimatorHjg.RUN_MASK + 0xFF)
- dOff += (runLen - DeflaterEstimatorHjg.RUN_MASK) / 0xFF;
- dOff++;
- dOff += runLen;
- return dOff;
- }
-
- static int maxCompressedLength(final int length) {
- if (length < 0)
- throw new IllegalArgumentException("length must be >= 0, got " + length);
- return length + length / 255 + 16;
- }
-
- static int hash(final int i) {
- return i * -1640531535 >>> DeflaterEstimatorHjg.MIN_MATCH * 8 - DeflaterEstimatorHjg.HASH_LOG;
- }
-
- static int hash64k(final int i) {
- return i * -1640531535 >>> DeflaterEstimatorHjg.MIN_MATCH * 8 - DeflaterEstimatorHjg.HASH_LOG_64K;
- }
-
- static int readShortLittleEndian(final byte[] buf, final int i) {
- return buf[i] & 0xFF | (buf[i + 1] & 0xFF) << 8;
- }
-
- static boolean readIntEquals(final byte[] buf, final int i, final int j) {
- return buf[i] == buf[j] && buf[i + 1] == buf[j + 1] && buf[i + 2] == buf[j + 2] && buf[i + 3] == buf[j + 3];
- }
-
- static int commonBytes(final byte[] b, int o1, int o2, final int limit) {
- int count = 0;
- while (o2 < limit && b[o1++] == b[o2++])
- ++count;
- return count;
- }
-
- static int commonBytesBackward(final byte[] b, int o1, int o2, final int l1, final int l2) {
- int count = 0;
- while (o1 > l1 && o2 > l2 && b[--o1] == b[--o2])
- ++count;
- return count;
- }
-
- static int readShort(final short[] buf, final int off) {
- return buf[off] & 0xFFFF;
- }
-
- static byte readByte(final byte[] buf, final int i) {
- return buf[i];
- }
-
- static void checkRange(final byte[] buf, final int off) {
- if (off < 0 || off >= buf.length)
- throw new ArrayIndexOutOfBoundsException(off);
- }
-
- static void checkRange(final byte[] buf, final int off, final int len) {
- DeflaterEstimatorHjg.checkLength(len);
- if (len > 0) {
- DeflaterEstimatorHjg.checkRange(buf, off);
- DeflaterEstimatorHjg.checkRange(buf, off + len - 1);
- }
- }
-
- static void checkLength(final int len) {
- if (len < 0)
- throw new IllegalArgumentException("lengths must be >= 0");
- }
-
- static int readIntBE(final byte[] buf, final int i) {
- return (buf[i] & 0xFF) << 24 | (buf[i + 1] & 0xFF) << 16 | (buf[i + 2] & 0xFF) << 8 | buf[i + 3] & 0xFF;
- }
-
- static int readIntLE(final byte[] buf, final int i) {
- return buf[i] & 0xFF | (buf[i + 1] & 0xFF) << 8 | (buf[i + 2] & 0xFF) << 16 | (buf[i + 3] & 0xFF) << 24;
- }
-
- static int readInt(final byte[] buf, final int i) {
- return DeflaterEstimatorHjg.readIntBE(buf, i);
- }
-
- static void writeShort(final short[] buf, final int off, final int v) {
- buf[off] = (short) v;
- }
-
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java
deleted file mode 100644
index 74d544c6..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-import java.nio.ByteOrder;
-
-/**
- * This estimator actually uses the LZ4 compression algorithm, and hopes that
- * it's well correlated with Deflater. It's
- * about 3 to 4 times faster than Deflater.
- *
- * This is a modified heavily trimmed version of the
- * net.jpountz.lz4.LZ4JavaSafeCompressor class plus some methods from
- * other classes from LZ4 Java library: https://github.com/jpountz/lz4-java ,
- * originally licensed under the Apache
- * License 2.0
- */
-final public class DeflaterEstimatorLz4 {
-
- /**
- * This object is stateless, it's thread safe and can be reused
- */
- public DeflaterEstimatorLz4() {}
-
- /**
- * Estimates the length of the compressed bytes, as compressed by Lz4
- * WARNING: if larger than LZ4_64K_LIMIT it cuts it
- * in fragments
- *
- * WARNING: if some part of the input is discarded, this should return the
- * proportional (so that
- * returnValue/srcLen=compressionRatio)
- *
- * @param src
- * @param srcOff
- * @param srcLen
- * @return length of the compressed bytes
- */
- public int compressEstim(final byte[] src, int srcOff, final int srcLen) {
- if (srcLen < 10)
- return srcLen; // too small
- int stride = DeflaterEstimatorLz4.LZ4_64K_LIMIT - 1;
- final int segments = (srcLen + stride - 1) / stride;
- stride = srcLen / segments;
- if (stride >= DeflaterEstimatorLz4.LZ4_64K_LIMIT - 1 || stride * segments > srcLen || segments < 1 || stride < 1)
- throw new RuntimeException("?? " + srcLen);
- int bytesIn = 0;
- int bytesOut = 0;
- int len = srcLen;
- while (len > 0) {
- if (len > stride)
- len = stride;
- bytesOut += DeflaterEstimatorLz4.compress64k(src, srcOff, len);
- srcOff += len;
- bytesIn += len;
- len = srcLen - bytesIn;
- }
- final double ratio = bytesOut / (double) bytesIn;
- return bytesIn == srcLen ? bytesOut : (int) (ratio * srcLen + 0.5);
- }
-
- public int compressEstim(final byte[] src) {
- return compressEstim(src, 0, src.length);
- }
-
- static final ByteOrder NATIVE_BYTE_ORDER = ByteOrder.nativeOrder();
-
- static final int MEMORY_USAGE = 14;
- static final int NOT_COMPRESSIBLE_DETECTION_LEVEL = 6;
-
- static final int MIN_MATCH = 4;
-
- static final int HASH_LOG = DeflaterEstimatorLz4.MEMORY_USAGE - 2;
- static final int HASH_TABLE_SIZE = 1 << DeflaterEstimatorLz4.HASH_LOG;
-
- static final int SKIP_STRENGTH = Math.max(DeflaterEstimatorLz4.NOT_COMPRESSIBLE_DETECTION_LEVEL, 2);
- static final int COPY_LENGTH = 8;
- static final int LAST_LITERALS = 5;
- static final int MF_LIMIT = DeflaterEstimatorLz4.COPY_LENGTH + DeflaterEstimatorLz4.MIN_MATCH;
- static final int MIN_LENGTH = DeflaterEstimatorLz4.MF_LIMIT + 1;
-
- static final int MAX_DISTANCE = 1 << 16;
-
- static final int ML_BITS = 4;
- static final int ML_MASK = (1 << DeflaterEstimatorLz4.ML_BITS) - 1;
- static final int RUN_BITS = 8 - DeflaterEstimatorLz4.ML_BITS;
- static final int RUN_MASK = (1 << DeflaterEstimatorLz4.RUN_BITS) - 1;
-
- static final int LZ4_64K_LIMIT = (1 << 16) + DeflaterEstimatorLz4.MF_LIMIT - 1;
- static final int HASH_LOG_64K = DeflaterEstimatorLz4.HASH_LOG + 1;
- static final int HASH_TABLE_SIZE_64K = 1 << DeflaterEstimatorLz4.HASH_LOG_64K;
-
- static final int HASH_LOG_HC = 15;
- static final int HASH_TABLE_SIZE_HC = 1 << DeflaterEstimatorLz4.HASH_LOG_HC;
- static final int OPTIMAL_ML = DeflaterEstimatorLz4.ML_MASK - 1 + DeflaterEstimatorLz4.MIN_MATCH;
-
- static int compress64k(final byte[] src, final int srcOff, final int srcLen) {
- final int srcEnd = srcOff + srcLen;
- final int srcLimit = srcEnd - DeflaterEstimatorLz4.LAST_LITERALS;
- final int mflimit = srcEnd - DeflaterEstimatorLz4.MF_LIMIT;
-
- int sOff = srcOff, dOff = 0;
-
- int anchor = sOff;
-
- if (srcLen >= DeflaterEstimatorLz4.MIN_LENGTH) {
-
- final short[] hashTable = new short[DeflaterEstimatorLz4.HASH_TABLE_SIZE_64K];
-
- ++sOff;
-
- main: while (true) {
-
- // find a match
- int forwardOff = sOff;
-
- int ref;
- int findMatchAttempts = (1 << DeflaterEstimatorLz4.SKIP_STRENGTH) + 3;
- do {
- sOff = forwardOff;
- forwardOff += findMatchAttempts++ >>> DeflaterEstimatorLz4.SKIP_STRENGTH;
-
- if (forwardOff > mflimit)
- break main;
-
- final int h = DeflaterEstimatorLz4.hash64k(DeflaterEstimatorLz4.readInt(src, sOff));
- ref = srcOff + DeflaterEstimatorLz4.readShort(hashTable, h);
- DeflaterEstimatorLz4.writeShort(hashTable, h, sOff - srcOff);
- } while (!DeflaterEstimatorLz4.readIntEquals(src, ref, sOff));
-
- // catch up
- final int excess = DeflaterEstimatorLz4.commonBytesBackward(src, ref, sOff, srcOff, anchor);
- sOff -= excess;
- ref -= excess;
- // sequence == refsequence
- final int runLen = sOff - anchor;
- dOff++;
-
- if (runLen >= DeflaterEstimatorLz4.RUN_MASK) {
- if (runLen > DeflaterEstimatorLz4.RUN_MASK)
- dOff += (runLen - DeflaterEstimatorLz4.RUN_MASK) / 0xFF;
- dOff++;
- }
- dOff += runLen;
- while (true) {
- // encode offset
- dOff += 2;
- // count nb matches
- sOff += DeflaterEstimatorLz4.MIN_MATCH;
- ref += DeflaterEstimatorLz4.MIN_MATCH;
- final int matchLen = DeflaterEstimatorLz4.commonBytes(src, ref, sOff, srcLimit);
- sOff += matchLen;
- // encode match len
- if (matchLen >= DeflaterEstimatorLz4.ML_MASK) {
- if (matchLen >= DeflaterEstimatorLz4.ML_MASK + 0xFF)
- dOff += (matchLen - DeflaterEstimatorLz4.ML_MASK) / 0xFF;
- dOff++;
- }
- // test end of chunk
- if (sOff > mflimit) {
- anchor = sOff;
- break main;
- }
- // fill table
- DeflaterEstimatorLz4.writeShort(hashTable, DeflaterEstimatorLz4.hash64k(DeflaterEstimatorLz4.readInt(src, sOff - 2)), sOff - 2 - srcOff);
- // test next position
- final int h = DeflaterEstimatorLz4.hash64k(DeflaterEstimatorLz4.readInt(src, sOff));
- ref = srcOff + DeflaterEstimatorLz4.readShort(hashTable, h);
- DeflaterEstimatorLz4.writeShort(hashTable, h, sOff - srcOff);
- if (!DeflaterEstimatorLz4.readIntEquals(src, sOff, ref))
- break;
- dOff++;
- }
- // prepare next loop
- anchor = sOff++;
- }
- }
- final int runLen = srcEnd - anchor;
- if (runLen >= DeflaterEstimatorLz4.RUN_MASK + 0xFF)
- dOff += (runLen - DeflaterEstimatorLz4.RUN_MASK) / 0xFF;
- dOff++;
- dOff += runLen;
- return dOff;
- }
-
- static int maxCompressedLength(final int length) {
- if (length < 0)
- throw new IllegalArgumentException("length must be >= 0, got " + length);
- return length + length / 255 + 16;
- }
-
- static int hash(final int i) {
- return i * -1640531535 >>> DeflaterEstimatorLz4.MIN_MATCH * 8 - DeflaterEstimatorLz4.HASH_LOG;
- }
-
- static int hash64k(final int i) {
- return i * -1640531535 >>> DeflaterEstimatorLz4.MIN_MATCH * 8 - DeflaterEstimatorLz4.HASH_LOG_64K;
- }
-
- static int readShortLittleEndian(final byte[] buf, final int i) {
- return buf[i] & 0xFF | (buf[i + 1] & 0xFF) << 8;
- }
-
- static boolean readIntEquals(final byte[] buf, final int i, final int j) {
- return buf[i] == buf[j] && buf[i + 1] == buf[j + 1] && buf[i + 2] == buf[j + 2] && buf[i + 3] == buf[j + 3];
- }
-
- static int commonBytes(final byte[] b, int o1, int o2, final int limit) {
- int count = 0;
- while (o2 < limit && b[o1++] == b[o2++])
- ++count;
- return count;
- }
-
- static int commonBytesBackward(final byte[] b, int o1, int o2, final int l1, final int l2) {
- int count = 0;
- while (o1 > l1 && o2 > l2 && b[--o1] == b[--o2])
- ++count;
- return count;
- }
-
- static int readShort(final short[] buf, final int off) {
- return buf[off] & 0xFFFF;
- }
-
- static byte readByte(final byte[] buf, final int i) {
- return buf[i];
- }
-
- static void checkRange(final byte[] buf, final int off) {
- if (off < 0 || off >= buf.length)
- throw new ArrayIndexOutOfBoundsException(off);
- }
-
- static void checkRange(final byte[] buf, final int off, final int len) {
- DeflaterEstimatorLz4.checkLength(len);
- if (len > 0) {
- DeflaterEstimatorLz4.checkRange(buf, off);
- DeflaterEstimatorLz4.checkRange(buf, off + len - 1);
- }
- }
-
- static void checkLength(final int len) {
- if (len < 0)
- throw new IllegalArgumentException("lengths must be >= 0");
- }
-
- static int readIntBE(final byte[] buf, final int i) {
- return (buf[i] & 0xFF) << 24 | (buf[i + 1] & 0xFF) << 16 | (buf[i + 2] & 0xFF) << 8 | buf[i + 3] & 0xFF;
- }
-
- static int readIntLE(final byte[] buf, final int i) {
- return buf[i] & 0xFF | (buf[i + 1] & 0xFF) << 8 | (buf[i + 2] & 0xFF) << 16 | (buf[i + 3] & 0xFF) << 24;
- }
-
- static int readInt(final byte[] buf, final int i) {
- if (DeflaterEstimatorLz4.NATIVE_BYTE_ORDER == ByteOrder.BIG_ENDIAN)
- return DeflaterEstimatorLz4.readIntBE(buf, i);
- else
- return DeflaterEstimatorLz4.readIntLE(buf, i);
- }
-
- static void writeShort(final short[] buf, final int off, final int v) {
- buf[off] = (short) v;
- }
-
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java
deleted file mode 100644
index bf35aa42..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-import java.util.Arrays;
-
-import ar.com.hjg.pngj.FilterType;
-import ar.com.hjg.pngj.ImageInfo;
-import ar.com.hjg.pngj.PngHelperInternal;
-import ar.com.hjg.pngj.PngjExceptionInternal;
-
-/** for use in adaptative strategy */
-public class FiltersPerformance {
-
- private final ImageInfo iminfo;
- private double memoryA = 0.7; // empirical (not very critical: 0.72)
- private int lastrow = -1;
- private final double[] absum = new double[5];// depending on the strategy not all values might be
- // computed for all
- private final double[] entropy = new double[5];
- private final double[] cost = new double[5];
- private final int[] histog = new int[256]; // temporary, not normalized
- private int lastprefered = -1;
- private boolean initdone = false;
- private double preferenceForNone = 1.0; // higher gives more preference to NONE
-
- // this values are empirical (montecarlo), for RGB8 images with entropy estimator for NONE and
- // memory=0.7
- // DONT MODIFY THIS
- public static final double[] FILTER_WEIGHTS_DEFAULT = { 0.73, 1.03, 0.97, 1.11, 1.22 }; // lower is
- // better!
-
- private final double[] filter_weights = new double[] { -1, -1, -1, -1, -1 };
-
- private final static double LOG2NI = -1.0 / Math.log(2.0);
-
- public FiltersPerformance(final ImageInfo imgInfo) {
- iminfo = imgInfo;
- }
-
- private void init() {
- if (filter_weights[0] < 0) {// has not been set from outside
- System.arraycopy(FiltersPerformance.FILTER_WEIGHTS_DEFAULT, 0, filter_weights, 0, 5);
- double wNone = filter_weights[0];
- if (iminfo.bitDepth == 16)
- wNone = 1.2;
- else if (iminfo.alpha)
- wNone = 0.8;
- else if (iminfo.indexed || iminfo.bitDepth < 8)
- wNone = 0.4; // we prefer NONE strongly
- wNone /= preferenceForNone;
- filter_weights[0] = wNone;
- }
- Arrays.fill(cost, 1.0);
- initdone = true;
- }
-
- public void updateFromFiltered(final FilterType ftype, final byte[] rowff, final int rown) {
- updateFromRawOrFiltered(ftype, rowff, null, null, rown);
- }
-
- /** alternative: computes statistic without filtering */
- public void updateFromRaw(final FilterType ftype, final byte[] rowb, final byte[] rowbprev, final int rown) {
- updateFromRawOrFiltered(ftype, null, rowb, rowbprev, rown);
- }
-
- private void updateFromRawOrFiltered(final FilterType ftype, final byte[] rowff, final byte[] rowb,
- final byte[] rowbprev, final int rown) {
- if (!initdone)
- init();
- if (rown != lastrow) {
- Arrays.fill(absum, Double.NaN);
- Arrays.fill(entropy, Double.NaN);
- }
- lastrow = rown;
- if (rowff != null)
- computeHistogram(rowff);
- else
- computeHistogramForFilter(ftype, rowb, rowbprev);
- if (ftype == FilterType.FILTER_NONE)
- entropy[ftype.val] = computeEntropyFromHistogram();
- else
- absum[ftype.val] = computeAbsFromHistogram();
- }
-
- /* WARNING: this is not idempotent, call it just once per cycle (sigh) */
- public FilterType getPreferred() {
- int fi = 0;
- double vali = Double.MAX_VALUE, val = 0; // lower wins
- for (int i = 0; i < 5; i++) {
- if (!Double.isNaN(absum[i]))
- val = absum[i];
- else if (!Double.isNaN(entropy[i]))
- val = (Math.pow(2.0, entropy[i]) - 1.0) * 0.5;
- else
- continue;
- val *= filter_weights[i];
- val = cost[i] * memoryA + (1 - memoryA) * val;
- cost[i] = val;
- if (val < vali) {
- vali = val;
- fi = i;
- }
- }
- lastprefered = fi;
- return FilterType.getByVal(lastprefered);
- }
-
- public final void computeHistogramForFilter(final FilterType filterType, final byte[] rowb, final byte[] rowbprev) {
- Arrays.fill(histog, 0);
- int i, j;
- final int imax = iminfo.bytesPerRow;
- switch (filterType) {
- case FILTER_NONE:
- for (i = 1; i <= imax; i++)
- histog[rowb[i] & 0xFF]++;
- break;
- case FILTER_PAETH:
- for (i = 1; i <= imax; i++)
- histog[PngHelperInternal.filterRowPaeth(rowb[i], 0, rowbprev[i] & 0xFF, 0)]++;
- for (j = 1, i = iminfo.bytesPixel + 1; i <= imax; i++, j++)
- histog[PngHelperInternal.filterRowPaeth(rowb[i], rowb[j] & 0xFF, rowbprev[i] & 0xFF, rowbprev[j] & 0xFF)]++;
- break;
- case FILTER_SUB:
- for (i = 1; i <= iminfo.bytesPixel; i++)
- histog[rowb[i] & 0xFF]++;
- for (j = 1, i = iminfo.bytesPixel + 1; i <= imax; i++, j++)
- histog[rowb[i] - rowb[j] & 0xFF]++;
- break;
- case FILTER_UP:
- for (i = 1; i <= iminfo.bytesPerRow; i++)
- histog[rowb[i] - rowbprev[i] & 0xFF]++;
- break;
- case FILTER_AVERAGE:
- for (i = 1; i <= iminfo.bytesPixel; i++)
- histog[(rowb[i] & 0xFF) - (rowbprev[i] & 0xFF) / 2 & 0xFF]++;
- for (j = 1, i = iminfo.bytesPixel + 1; i <= imax; i++, j++)
- histog[(rowb[i] & 0xFF) - ((rowbprev[i] & 0xFF) + (rowb[j] & 0xFF)) / 2 & 0xFF]++;
- break;
- default:
- throw new PngjExceptionInternal("Bad filter:" + filterType);
- }
- }
-
- public void computeHistogram(final byte[] rowff) {
- Arrays.fill(histog, 0);
- for (int i = 1; i < iminfo.bytesPerRow; i++)
- histog[rowff[i] & 0xFF]++;
- }
-
- public double computeAbsFromHistogram() {
- int s = 0;
- for (int i = 1; i < 128; i++)
- s += histog[i] * i;
- for (int i = 128, j = 128; j > 0; i++, j--)
- s += histog[i] * j;
- return s / (double) iminfo.bytesPerRow;
- }
-
- public final double computeEntropyFromHistogram() {
- final double s = 1.0 / iminfo.bytesPerRow;
- final double ls = Math.log(s);
-
- double h = 0;
- for (final int x : histog)
- if (x > 0)
- h += (Math.log(x) + ls) * x;
- h *= s * FiltersPerformance.LOG2NI;
- if (h < 0.0)
- h = 0.0;
- return h;
- }
-
- /**
- * If larger than 1.0, NONE will be more prefered. This must be called
- * before init
- *
- * @param preferenceForNone
- * around 1.0 (default: 1.0)
- */
- public void setPreferenceForNone(final double preferenceForNone) {
- this.preferenceForNone = preferenceForNone;
- }
-
- /**
- * Values greater than 1.0 (towards infinite) increase the memory towards 1.
- * Values smaller than 1.0 (towards zero)
- * decreases the memory .
- *
- */
- public void tuneMemory(final double m) {
- if (m == 0)
- memoryA = 0.0;
- else
- memoryA = Math.pow(memoryA, 1.0 / m);
- }
-
- /**
- * To set manually the filter weights. This is not recommended, unless you
- * know what you are doing. Setting this
- * ignores preferenceForNone and omits some heuristics
- *
- * @param weights
- * Five doubles around 1.0, one for each filter type. Lower is
- * preferered
- */
- public void setFilterWeights(final double[] weights) {
- System.arraycopy(weights, 0, filter_weights, 0, 5);
- }
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriter.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriter.java
deleted file mode 100644
index 9ab95115..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriter.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-import java.io.OutputStream;
-import java.util.zip.Deflater;
-
-import ar.com.hjg.pngj.FilterType;
-import ar.com.hjg.pngj.IDatChunkWriter;
-import ar.com.hjg.pngj.ImageInfo;
-import ar.com.hjg.pngj.PngHelperInternal;
-import ar.com.hjg.pngj.PngjOutputException;
-
-/**
- * Encodes a set of rows (pixels) as a continuous deflated stream (does not know
- * about IDAT chunk segmentation).
- * - * This includes the filter selection strategy, plus the filtering itself and - * the deflating. Only supports fixed length - * rows (no interlaced writing). - *
- * Typically an instance of this is hold by a PngWriter - but more instances - * could be used (for APGN) - */ -public abstract class PixelsWriter { - - private static final int IDAT_MAX_SIZE_DEFAULT = 32000; - - protected final ImageInfo imgInfo; - /** - * row buffer length, including filter byte (imgInfo.bytesPerRow + 1) - */ - protected final int buflen; - - protected final int bytesPixel; - protected final int bytesRow; - - private CompressorStream compressorStream; // to compress the idat stream - - protected int deflaterCompLevel = 6; - protected int deflaterStrategy = Deflater.DEFAULT_STRATEGY; - - protected boolean initdone = false; - - /** - * This is the globally configured filter type - it can be a concrete type - * or a pseudo type (hint or strategy) - */ - protected FilterType filterType; - - // counts the filters used - just for stats - private final int[] filtersUsed = new int[5]; - - // this is the raw underlying os (shared with the PngWriter) - private OutputStream os; - - private int idatMaxSize = PixelsWriter.IDAT_MAX_SIZE_DEFAULT; - - /** - * row being processed, couting from zero - */ - protected int currentRow; - - public PixelsWriter(final ImageInfo imgInfo) { - this.imgInfo = imgInfo; - bytesRow = imgInfo.bytesPerRow; - buflen = bytesRow + 1; - bytesPixel = imgInfo.bytesPixel; - currentRow = -1; - filterType = FilterType.FILTER_DEFAULT; - } - - /** - * main internal point for external call. It does the lazy initializion if - * necessary, sets current row, and call - * {@link #filterAndWrite(byte[])} - */ - public final void processRow(final byte[] rowb) { - if (!initdone) - init(); - currentRow++; - filterAndWrite(rowb); - } - - protected void sendToCompressedStream(final byte[] rowf) { - compressorStream.write(rowf, 0, rowf.length); - filtersUsed[rowf[0]]++; - } - - /** - * This does the filtering and send to stream. Typically should decide the - * filtering, call - * {@link #filterRowWithFilterType(FilterType, byte[], byte[], byte[])} and - * and - * {@link #sendToCompressedStream(byte[])} - * - * @param rowb - */ - protected abstract void filterAndWrite(final byte[] rowb); - - /** - * Does the real filtering. This must be called with the real (standard) - * filterType. This should rarely be overriden. - *
- * WARNING: look out the contract
- *
- * @param _filterType
- * @param _rowb
- * current row (the first byte might be modified)
- * @param _rowbprev
- * previous row (should be all zero the first time)
- * @param _rowf
- * tentative buffer to store the filtered bytes. might not be
- * used!
- * @return normally _rowf, but eventually _rowb. This MUST NOT BE MODIFIED
- * nor reused by caller
- */
- final protected byte[] filterRowWithFilterType(final FilterType _filterType, final byte[] _rowb,
- final byte[] _rowbprev, byte[] _rowf) {
- // warning: some filters rely on: "previous row" (rowbprev) it must be initialized to 0 the
- // first time
- if (_filterType == FilterType.FILTER_NONE)
- _rowf = _rowb;
- _rowf[0] = (byte) _filterType.val;
- int i, j;
- switch (_filterType) {
- case FILTER_NONE:
- // we return the same original (be careful!)
- break;
- case FILTER_PAETH:
- for (i = 1; i <= bytesPixel; i++)
- _rowf[i] = (byte) PngHelperInternal.filterRowPaeth(_rowb[i], 0, _rowbprev[i] & 0xFF, 0);
- for (j = 1, i = bytesPixel + 1; i <= bytesRow; i++, j++)
- _rowf[i] = (byte) PngHelperInternal.filterRowPaeth(_rowb[i], _rowb[j] & 0xFF, _rowbprev[i] & 0xFF, _rowbprev[j] & 0xFF);
- break;
- case FILTER_SUB:
- for (i = 1; i <= bytesPixel; i++)
- _rowf[i] = _rowb[i];
- for (j = 1, i = bytesPixel + 1; i <= bytesRow; i++, j++)
- _rowf[i] = (byte) (_rowb[i] - _rowb[j]);
- break;
- case FILTER_AVERAGE:
- for (i = 1; i <= bytesPixel; i++)
- _rowf[i] = (byte) (_rowb[i] - (_rowbprev[i] & 0xFF) / 2);
- for (j = 1, i = bytesPixel + 1; i <= bytesRow; i++, j++)
- _rowf[i] = (byte) (_rowb[i] - ((_rowbprev[i] & 0xFF) + (_rowb[j] & 0xFF)) / 2);
- break;
- case FILTER_UP:
- for (i = 1; i <= bytesRow; i++)
- _rowf[i] = (byte) (_rowb[i] - _rowbprev[i]);
- break;
- default:
- throw new PngjOutputException("Filter type not recognized: " + _filterType);
- }
- return _rowf;
- }
-
- /**
- * This will be called by the PngWrite to fill the raw pixels for each row.
- * This can change from call to call.
- * Warning: this can be called before the object is init, implementations
- * should call init() to be sure
- */
- public abstract byte[] getRowb();
-
- /**
- * This will be called lazily just before writing row 0. Idempotent.
- */
- protected final void init() {
- if (!initdone) {
- initParams();
- initdone = true;
- }
- }
-
- /**
- * called by init(); override (calling this first) to do additional
- * initialization
- */
- protected void initParams() {
- final IDatChunkWriter idatWriter = new IDatChunkWriter(os, idatMaxSize);
- if (compressorStream == null)
- compressorStream = new CompressorStreamDeflater(idatWriter, buflen, imgInfo.getTotalRawBytes(), deflaterCompLevel, deflaterStrategy);
- }
-
- /** cleanup. This should be called explicitly. Idempotent and secure */
- public void close() {
- if (compressorStream != null)
- compressorStream.close();
- }
-
- /**
- * Deflater (ZLIB) strategy. You should rarely change this from the default
- * (Deflater.DEFAULT_STRATEGY) to
- * Deflater.FILTERED (Deflater.HUFFMAN_ONLY is fast but compress poorly)
- */
- public void setDeflaterStrategy(final Integer deflaterStrategy) {
- this.deflaterStrategy = deflaterStrategy;
- }
-
- /**
- * Deflater (ZLIB) compression level, between 0 (no compression) and 9
- */
- public void setDeflaterCompLevel(final Integer deflaterCompLevel) {
- this.deflaterCompLevel = deflaterCompLevel;
- }
-
- public Integer getDeflaterCompLevel() {
- return deflaterCompLevel;
- }
-
- public final void setOs(final OutputStream datStream) {
- os = datStream;
- }
-
- public OutputStream getOs() {
- return os;
- }
-
- /** @see #filterType */
- final public FilterType getFilterType() {
- return filterType;
- }
-
- /** @see #filterType */
- final public void setFilterType(final FilterType filterType) {
- this.filterType = filterType;
- }
-
- /* out/in This should be called only after end() to get reliable results */
- public double getCompression() {
- return compressorStream.isDone() ? compressorStream.getCompressionRatio() : 1.0;
- }
-
- public void setCompressorStream(final CompressorStream compressorStream) {
- this.compressorStream = compressorStream;
- }
-
- public long getTotalBytesToWrite() {
- return imgInfo.getTotalRawBytes();
- }
-
- public boolean isDone() {
- return currentRow == imgInfo.rows - 1;
- }
-
- /**
- * computed default fixed filter type to use, if specified DEFAULT; wilde
- * guess based on image properties
- *
- * @return One of the five concrete filter types
- */
- protected FilterType getDefaultFilter() {
- if (imgInfo.indexed || imgInfo.bitDepth < 8)
- return FilterType.FILTER_NONE;
- else if (imgInfo.getTotalPixels() < 1024)
- return FilterType.FILTER_NONE;
- else if (imgInfo.rows == 1)
- return FilterType.FILTER_SUB;
- else if (imgInfo.cols == 1)
- return FilterType.FILTER_UP;
- else
- return FilterType.FILTER_PAETH;
- }
-
- /** informational stats : filter used, in percentages */
- final public String getFiltersUsed() {
- return String.format("%d,%d,%d,%d,%d", (int) (filtersUsed[0] * 100.0 / imgInfo.rows + 0.5), (int) (filtersUsed[1] * 100.0 / imgInfo.rows + 0.5), (int) (filtersUsed[2] * 100.0 / imgInfo.rows + 0.5), (int) (filtersUsed[3] * 100.0 / imgInfo.rows + 0.5), (int) (filtersUsed[4] * 100.0 / imgInfo.rows + 0.5));
- }
-
- public void setIdatMaxSize(final int idatMaxSize) {
- this.idatMaxSize = idatMaxSize;
- }
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java
deleted file mode 100644
index 00ffcec9..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-import java.util.Arrays;
-
-import ar.com.hjg.pngj.FilterType;
-import ar.com.hjg.pngj.ImageInfo;
-import ar.com.hjg.pngj.PngjOutputException;
-
-/**
- * Default implementation of PixelsWriter, with fixed filters and also adaptive
- * strategies.
- */
-public class PixelsWriterDefault extends PixelsWriter {
- /** current raw row */
- protected byte[] rowb;
- /** previous raw row */
- protected byte[] rowbprev;
- /** buffer for filtered row */
- protected byte[] rowbfilter;
-
- /** evaluates different filters, for adaptive strategy */
- protected FiltersPerformance filtersPerformance;
-
- /** currently concrete selected filter type */
- protected FilterType curfilterType;
-
- /** parameters for adaptive strategy */
- protected int adaptMaxSkip; // set in initParams, does not change
- protected int adaptSkipIncreaseSinceRow; // set in initParams, does not change
- protected double adaptSkipIncreaseFactor; // set in initParams, does not change
- protected int adaptNextRow = 0;
-
- public PixelsWriterDefault(final ImageInfo imgInfo) {
- super(imgInfo);
- filtersPerformance = new FiltersPerformance(imgInfo);
- }
-
- @Override
- protected void initParams() {
- super.initParams();
-
- if (rowb == null || rowb.length < buflen)
- rowb = new byte[buflen];
- if (rowbfilter == null || rowbfilter.length < buflen)
- rowbfilter = new byte[buflen];
- if (rowbprev == null || rowbprev.length < buflen)
- rowbprev = new byte[buflen];
- else
- Arrays.fill(rowbprev, (byte) 0);
-
- // if adaptative but too few rows or columns, use default
- if (imgInfo.cols < 3 && !FilterType.isValidStandard(filterType))
- filterType = FilterType.FILTER_DEFAULT;
- if (imgInfo.rows < 3 && !FilterType.isValidStandard(filterType))
- filterType = FilterType.FILTER_DEFAULT;
-
- if (imgInfo.getTotalPixels() <= 1024 && !FilterType.isValidStandard(filterType))
- filterType = getDefaultFilter();
-
- if (FilterType.isAdaptive(filterType)) {
- // adaptCurSkip = 0;
- adaptNextRow = 0;
- if (filterType == FilterType.FILTER_ADAPTIVE_FAST) {
- adaptMaxSkip = 200;
- adaptSkipIncreaseSinceRow = 3;
- adaptSkipIncreaseFactor = 1 / 4.0; // skip ~ row/3
- } else if (filterType == FilterType.FILTER_ADAPTIVE_MEDIUM) {
- adaptMaxSkip = 8;
- adaptSkipIncreaseSinceRow = 32;
- adaptSkipIncreaseFactor = 1 / 80.0;
- } else if (filterType == FilterType.FILTER_ADAPTIVE_FULL) {
- adaptMaxSkip = 0;
- adaptSkipIncreaseSinceRow = 128;
- adaptSkipIncreaseFactor = 1 / 120.0;
- } else
- throw new PngjOutputException("bad filter " + filterType);
- }
- }
-
- @Override
- protected void filterAndWrite(final byte[] rowb) {
- if (rowb != this.rowb)
- throw new RuntimeException("??"); // we rely on this
- decideCurFilterType();
- final byte[] filtered = filterRowWithFilterType(curfilterType, rowb, rowbprev, rowbfilter);
- sendToCompressedStream(filtered);
- // swap rowb <-> rowbprev
- final byte[] aux = this.rowb;
- this.rowb = rowbprev;
- rowbprev = aux;
- }
-
- protected void decideCurFilterType() {
- // decide the real filter and store in curfilterType
- if (FilterType.isValidStandard(getFilterType()))
- curfilterType = getFilterType();
- else if (getFilterType() == FilterType.FILTER_PRESERVE)
- curfilterType = FilterType.getByVal(rowb[0]);
- else if (getFilterType() == FilterType.FILTER_CYCLIC)
- curfilterType = FilterType.getByVal(currentRow % 5);
- else if (getFilterType() == FilterType.FILTER_DEFAULT) {
- setFilterType(getDefaultFilter());
- curfilterType = getFilterType(); // this could be done once
- } else if (FilterType.isAdaptive(getFilterType())) {// adaptive
- if (currentRow == adaptNextRow) {
- for (final FilterType ftype : FilterType.getAllStandard())
- filtersPerformance.updateFromRaw(ftype, rowb, rowbprev, currentRow);
- curfilterType = filtersPerformance.getPreferred();
- int skip = currentRow >= adaptSkipIncreaseSinceRow ? (int) Math.round((currentRow - adaptSkipIncreaseSinceRow) * adaptSkipIncreaseFactor) : 0;
- if (skip > adaptMaxSkip)
- skip = adaptMaxSkip;
- if (currentRow == 0)
- skip = 0;
- adaptNextRow = currentRow + 1 + skip;
- }
- } else
- throw new PngjOutputException("not implemented filter: " + getFilterType());
- if (currentRow == 0 && curfilterType != FilterType.FILTER_NONE && curfilterType != FilterType.FILTER_SUB)
- curfilterType = FilterType.FILTER_SUB; // first row should always be none or sub
- }
-
- @Override
- public byte[] getRowb() {
- if (!initdone)
- init();
- return rowb;
- }
-
- @Override
- public void close() {
- super.close();
- }
-
- /**
- * Only for adaptive strategies. See
- * {@link FiltersPerformance#setPreferenceForNone(double)}
- */
- public void setPreferenceForNone(final double preferenceForNone) {
- filtersPerformance.setPreferenceForNone(preferenceForNone);
- }
-
- /**
- * Only for adaptive strategies. See
- * {@link FiltersPerformance#tuneMemory(double)}
- */
- public void tuneMemory(final double m) {
- filtersPerformance.tuneMemory(m);
- }
-
- /**
- * Only for adaptive strategies. See
- * {@link FiltersPerformance#setFilterWeights(double[])}
- */
- public void setFilterWeights(final double[] weights) {
- filtersPerformance.setFilterWeights(weights);
- }
-
-}
diff --git a/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java
deleted file mode 100644
index bf36c12b..00000000
--- a/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package ar.com.hjg.pngj.pixels;
-
-import java.util.LinkedList;
-import java.util.zip.Deflater;
-
-import ar.com.hjg.pngj.FilterType;
-import ar.com.hjg.pngj.ImageInfo;
-
-/** Special pixels writer for experimental super adaptive strategy */
-public class PixelsWriterMultiple extends PixelsWriter {
- /**
- * unfiltered rowsperband elements, 0 is the current (rowb). This should
- * include all rows of current band, plus one
- */
- protected LinkedList
-Mostly related with logic specific to reading/writing pixels.
-
-Includes ImageLine related classes, and rows filtering
-
-Some classes like ImageLineInt should belong here, but we keep them in the main package for backward compatibility.
-
-