just unnecessary long

hansonr · hansonr · commit a14dd9ba6444 · 2020-12-21T22:58:44.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/VideoReader.java b/sources/net.sf.j2s.java.core/src/javajs/util/VideoReader.java
@@ -21,7 +21,7 @@
  *
  */
 public class VideoReader {
-	long pt = 0;		
+	int pt = 0;		
 	String blockType;
 	int blockLen;
 	byte[] buf = new byte[10]; 
@@ -81,7 +81,7 @@ public List<Map<String, Object>> getContents(boolean verbose) {
 	}
 	
 	protected void readBlock(List<Map<String, Object>> contents) throws IOException {
-		long pt = this.pt;
+		int pt = this.pt;
 		blockLen = readInt();
 		blockType = readString(4);
 		if (verbose)
@@ -151,7 +151,7 @@ protected int readInner(int len, Map<String, Object> map) throws IOException {
 		List<Map<String, Object>> list = new ArrayList<>();
 		map.put("blocks", list);
 		while (len > 0) {
-			long p = pt;
+			int p = pt;
 			readBlock(list);
 			len -= (pt - p);
 		}
@@ -175,8 +175,8 @@ protected int readFTYP(int len, Map<String, Object> map) throws IOException {
 
 	protected int readMVHD(int len, Map<String, Object> map) throws IOException {
 		map.put("version_flags", readInt()); 
-		map.put("creationTime", readIntLong());
-		map.put("modificationTime", readIntLong());
+		map.put("creationTime", readUIntLong());
+		map.put("modificationTime", readUIntLong());
 		timeScale = readInt();
 		int dur = readInt();
 		map.put("timeScale", timeScale);
@@ -198,8 +198,8 @@ private void dumpMap(Map<String, Object> map, String name) {
 
 	protected int readTKHD(int len, Map<String, Object> map) throws IOException {
 		map.put("version_flags", readInt()); 
-		map.put("creationTime", readIntLong());
-		map.put("modificationTime", readIntLong());
+		map.put("creationTime", readUIntLong());
+		map.put("modificationTime", readUIntLong());
 		map.put("trackID", readInt());
 		readInt(); // reserved
 		int dur = readInt();
@@ -246,7 +246,7 @@ protected byte[] readBytes(int n) throws IOException {
 		return buf;
 	}
 
-	protected long readIntLong() throws IOException {
+	protected long readUIntLong() throws IOException {
 		pt += 4;
 		return is.readInt() & 0xFFFFFFFFL;
 	}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Long.java b/sources/net.sf.j2s.java.core/src/test/Test_Long.java
@@ -14,6 +14,15 @@ public abstract class Test_Long extends Test_ {
 	static Long getLong(long l) {
 		return Long.valueOf(l);
 	}
+	
+	static {
+		long l = 1;
+		for (int i = 1; i < 21; i++) {
+			l *= i;
+			System.out.println(i + "\t" + l + " " + (double) l);
+		}
+	}
+
 
 	public static void main(String[] args) {
 
