Changeset 1833

Timestamp:

10/29/08 04:25:39 (2 months ago)

Author:

ddb174

Message:

Better realMyst support. Now unpacks all files to disk. Implemented zlib compatible DEFLATE of some objects. Understands the Hsm files. Understands the Idx files.

Files:

• drizzle/DrizzlePrp/src/gui/Gui.form (modified) (1 diff)
• drizzle/DrizzlePrp/src/gui/Gui.java (modified) (9 diffs)
• drizzle/DrizzlePrp/src/realmyst/Bstr.java (added)
• drizzle/DrizzlePrp/src/realmyst/Desc.java (added)
• drizzle/DrizzlePrp/src/realmyst/Hsm.java (added)
• drizzle/DrizzlePrp/src/realmyst/Idx.java (added)
• drizzle/DrizzlePrp/src/realmyst/Mdb.java (added)
• drizzle/DrizzlePrp/src/realmyst/Ntstring.java (added)
• drizzle/DrizzlePrp/src/realmyst/ObjFile.java (added)
• drizzle/DrizzlePrp/src/realmyst/ReverseInt.java (added)
• drizzle/DrizzlePrp/src/realmyst/Sceneobject.java (added)
• drizzle/DrizzlePrp/src/realmyst/Sdb.java (added)
• drizzle/DrizzlePrp/src/realmyst/Shp.java (added)
• drizzle/DrizzlePrp/src/realmyst/dirtfile.java (modified) (10 diffs)
• drizzle/DrizzlePrp/src/realmyst/info.txt (added)
• drizzle/DrizzlePrp/src/realmyst/rmcontext.java (modified) (3 diffs)
• drizzle/DrizzlePrp/src/shared/IBytedeque.java (added)
• drizzle/DrizzlePrp/src/shared/IBytestream.java (added)
• drizzle/DrizzlePrp/src/shared/SerialBytestream.java (added)
• drizzle/DrizzlePrp/src/shared/generic.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/uru/Bytestream.java (modified) (6 diffs)
• drizzle/DrizzlePrp/src/uru/b.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/uru/moulprp/Image.java (modified) (4 diffs)

drizzle/DrizzlePrp/src/gui/Gui.form

@@ -2652 +2652 @@
-          </Constraints>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-          </Layout>
-          <SubComponents>
-            <Component class="javax.swing.JButton" name="jButton45">
-              <Properties>
-jButton45
+Depack
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton45ActionPerformed"/>
-              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="50" y="120" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="shared.State.TextfieldState" name="textfieldState21">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="textfieldState21"/>
+                <Property name="name" type="java.lang.String" value="realmystIn" noResource="true"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="80" y="30" width="410" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JButton" name="jButton95">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="select"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton95ActionPerformed"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="500" y="20" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JButton" name="jButton101">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="select"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton101ActionPerformed"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="510" y="70" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="shared.State.TextfieldState" name="textfieldState24">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="textfieldState24"/>
+                <Property name="name" type="java.lang.String" value="realmystOut" noResource="true"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="80" y="80" width="410" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JLabel" name="jLabel25">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="in file:"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="30" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JLabel" name="jLabel26">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="out folder:"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="80" width="60" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="shared.State.TextfieldState" name="textfieldState25">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="textfieldState25"/>
+                <Property name="name" type="java.lang.String" value="realmystObjFile" noResource="true"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="210" width="340" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JButton" name="jButton102">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Attempt to read."/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton102ActionPerformed"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="250" width="160" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JLabel" name="jLabel27">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="File:"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="30" y="210" width="48" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JButton" name="jButton103">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="select"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton103ActionPerformed"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="440" y="200" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JButton" name="jButton104">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="test"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton104ActionPerformed"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="260" y="120" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
-            </Component>
-          </SubComponents>

drizzle/DrizzlePrp/src/gui/Gui.java

@@ -559 +559 @@
-        jPanel10 = new javax.swing.JPanel();
-        jButton45 = new javax.swing.JButton();
+        textfieldState21 = new shared.State.TextfieldState();
+        jButton95 = new javax.swing.JButton();
+        jButton101 = new javax.swing.JButton();
+        textfieldState24 = new shared.State.TextfieldState();
+        jLabel25 = new javax.swing.JLabel();
+        jLabel26 = new javax.swing.JLabel();
+        textfieldState25 = new shared.State.TextfieldState();
+        jButton102 = new javax.swing.JButton();
+        jLabel27 = new javax.swing.JLabel();
+        jButton103 = new javax.swing.JButton();
+        jButton104 = new javax.swing.JButton();
-        jPanel12 = new javax.swing.JPanel();
-        jButton50 = new javax.swing.JButton();
@@ -2280 +2291 @@
-                tabsState3.addTab("GameHelp", jPanel7);
-
-
+
+
+
-                jButton45.addActionListener(new java.awt.event.ActionListener() {
-                    public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -2286 +2299 @@
-                    }
-                });
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                tabsState3.addTab("realMyst", jPanel10);
@@ -3397 +3467 @@
-
-    private void jButton45ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton45ActionPerformed
-
-
-
+
+
+
+
+
+
+
+
-    }//GEN-LAST:event_jButton45ActionPerformed
-
@@ -3763 +3838 @@
-    automation.inplaceModifications.addDynamicTextMapAndMiscToFile(in, outfolder);
-}//GEN-LAST:event_jButton100ActionPerformed
+
+private void jButton95ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton95ActionPerformed
+    GuiUtils.getUserSelectedFile(this.textfieldState21);
+}//GEN-LAST:event_jButton95ActionPerformed
+
+private void jButton101ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton101ActionPerformed
+    GuiUtils.getUserSelectedFolder(this.textfieldState24);
+}//GEN-LAST:event_jButton101ActionPerformed
+
+private void jButton103ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton103ActionPerformed
+    GuiUtils.getUserSelectedFile(this.textfieldState25);
+}//GEN-LAST:event_jButton103ActionPerformed
+
+private void jButton102ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton102ActionPerformed
+    String filename = this.textfieldState25.getText();
+    File f = new File(filename);
+    shared.IBytestream bs = shared.SerialBytestream.createFromFilename(filename);
+    realmyst.Hsm hsm;
+    realmyst.Idx idx;
+    realmyst.Mdb mdb;
+    realmyst.Sdb sdb;
+    realmyst.Shp shp;
+    if(filename.toLowerCase().endsWith(".hsm"))
+    {
+        hsm = new realmyst.Hsm(bs);
+    }
+    else if(filename.toLowerCase().endsWith(".idx"))
+    {
+        idx = new realmyst.Idx(bs);
+    }
+    else if(filename.toLowerCase().endsWith(".vdb"))
+    {
+        if(f.getParentFile().getName().toLowerCase().equals("sdb"))
+            sdb = new realmyst.Sdb(bs);
+        else if(f.getParentFile().getName().toLowerCase().equals("mdb"))
+            mdb = new realmyst.Mdb(bs);
+    }
+    else if(filename.toLowerCase().endsWith(".shp"))
+    {
+        shp = new realmyst.Shp(bs);
+    }
+    //realmyst.Idx idx = new realmyst.Idx(bs);
+    //realmyst.SceneObject so = new realmyst.SceneObject(bs);
+    //realmyst.Sdb mdb = new realmyst.Sdb(bs);
+    if(bs.getBytesRemaining()!=0) m.warn("Didn't read all data.");
+}//GEN-LAST:event_jButton102ActionPerformed
+
+private void jButton104ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton104ActionPerformed
+    String outfol = this.textfieldState24.getText();
+    
+    File f = new File(outfol+"/sdb");
+    for(File child: f.listFiles())
+    {
+        if(child.getName().toLowerCase().endsWith(".vdb"))
+        {
+            int fs = (int)child.length();
+            shared.IBytestream bs = shared.SerialBytestream.createFromFile(child);
+            realmyst.Sdb mdb = new realmyst.Sdb(bs);
+            int offset = bs.getAbsoluteOffset();
+            int bytesleft = bs.getBytesRemaining();
+            
+            if (mdb.filesizeMinusHeader!=fs-offset)
+            {
+                int dummy=0;
+            }
+            if(bytesleft!=0)
+            {
+                int dummy=0;
+            }
+            int dummy=0;
+        }
+    }
+    
+    File f2 = new File(outfol+"/mdb");
+    for(File child: f2.listFiles())
+    {
+        if(child.getName().toLowerCase().endsWith(".vdb"))
+        {
+            int fs = (int)child.length();
+            shared.IBytestream bs = shared.SerialBytestream.createFromFile(child);
+            realmyst.Mdb mdb = new realmyst.Mdb(bs);
+            int offset = bs.getAbsoluteOffset();
+            int bytesleft = bs.getBytesRemaining();
+            
+            if (mdb.u2!=fs-offset)
+            {
+                int dummy=0;
+            }
+            if(bytesleft!=0)
+            {
+                int dummy=0;
+            }
+            int dummy=0;
+        }
+    }
+    
+}//GEN-LAST:event_jButton104ActionPerformed
-    
-/*class c2 extends javax.swing.DefaultListSelectionModel
@@ -3827 +3999 @@
-    private javax.swing.JButton jButton10;
-    private javax.swing.JButton jButton100;
+    private javax.swing.JButton jButton101;
+    private javax.swing.JButton jButton102;
+    private javax.swing.JButton jButton103;
+    private javax.swing.JButton jButton104;
-    private javax.swing.JButton jButton11;
-    private javax.swing.JButton jButton12;
@@ -3919 +4095 @@
-    private javax.swing.JButton jButton93;
-    private javax.swing.JButton jButton94;
+    private javax.swing.JButton jButton95;
-    private javax.swing.JButton jButton96;
-    private javax.swing.JButton jButton97;
@@ -3943 +4120 @@
-    private javax.swing.JLabel jLabel23;
-    private javax.swing.JLabel jLabel24;
+    private javax.swing.JLabel jLabel25;
+    private javax.swing.JLabel jLabel26;
+    private javax.swing.JLabel jLabel27;
-    private javax.swing.JLabel jLabel3;
-    private javax.swing.JLabel jLabel4;
@@ -4029 +4209 @@
-    private shared.State.TextfieldState textfieldState2;
-    private shared.State.TextfieldState textfieldState20;
+    private shared.State.TextfieldState textfieldState21;
-    private shared.State.TextfieldState textfieldState22;
-    private shared.State.TextfieldState textfieldState23;
+    private shared.State.TextfieldState textfieldState24;
+    private shared.State.TextfieldState textfieldState25;
-    private shared.State.TextfieldState textfieldState3;
-    private shared.State.TextfieldState textfieldState4;

drizzle/DrizzlePrp/src/realmyst/dirtfile.java

@@ -22 +22 @@
-import uru.b;
-import java.util.Vector;
+import shared.*;
+import java.io.File;
-
-//pera.dni seems to contain only .wav files.
@@ -32 +34 @@
-    dirttree tree;
-    
-rmcontext
+IBytestream
-    {
-        header = new Header(c);
@@ -38 +40 @@
-        tree = new dirttree(c.Fork(header.dirOffset), header.FTOffset, true);
-    }
-static class Ntstring
+void saveAllFiles(String outputdir)
-    {
-
-
+
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
-            {
-
-
-
-
-
-
-
+
-            }
-        }
-public String toString()
+else
-        {
-
-
-
-
-
-
-
-
-
-
+
-        }
-    }
@@ -73 +66 @@
-    {
-        Ntstring name;
-Dirt
+Obj
-        DirectoryTable xdirtable;
-        FileStruct xfilestruct;
@@ -80 +73 @@
-        dirttree[] xchildren;
-        
-rmcontext
+IBytestream
-        {
-            isdir = isdirectory;
@@ -100 +93 @@
-                xfilestruct = new FileStruct(c);
-                name = new Ntstring(c.Fork(xfilestruct.nameOffset));
-
-DirtFile(c.Fork(xfilestruct.offset), xfilestruct.fileLength
+//
+ObjFile(c.Fork(xfilestruct.offset), xfilestruct.fileLength, xfilestruct.isEmpty
-            }
-        }
@@ -119 +112 @@
-        int NLOffset;
-        int dataOffset;
-
+ //equals FTOffset
-        
-rmcontext
+IBytestream
-        {
-            header = c.readBytes(4); e.ensure(b.isEqual(header, new byte[]{'D','i','r','t'}));
@@ -140 +133 @@
-        int[] fileOffsets;
-        
-rmcontext
+IBytestream
-        {
-            nameOffset = c.readInt();
@@ -151 +144 @@
-    {
-        int nameOffset;
-
+ //the offset to this structure, this var is redundent.
-        int fileLength;
-        int offset;
-        int isEmpty; //is this what it is?
-        
-
+
+
+
+
+
+
+
+
-        {
-            nameOffset = c.readInt();
@@ -163 +163 @@
-            offset = c.readInt();
-            isEmpty = c.readInt();
+            all += fileLength;
+            diff += fileLength-isEmpty;
+            test += isEmpty==0?fileLength:isEmpty;
+            if(isEmpty!=0)
+            {
+                int dummy=0;
+                sum += isEmpty;
+                type2++;
+                //m.msg("fileLength="+Integer.toString(fileLength)+" isEmpty="+Integer.toString(isEmpty)+" sum="+Integer.toString(sum)+" all="+Integer.toString(all)+" diff="+Integer.toString(diff));
+                //m.msg("offsetstart="+Integer.toString(offset)+" offsetend"+Integer.toString(offset+fileLength));
+                //m.msg("test="+Integer.toString(test));
+            }
+            else
+            {
+                type1++;
+            }
+            m.msg("type1="+Integer.toString(type1)+" type2="+Integer.toString(type2));
+            //m.msg(Integer.toString(extOffset));
-        }
-    }

drizzle/DrizzlePrp/src/realmyst/rmcontext.java

@@ -20 +20 @@
-
-//import uru.context;
-uru.Bytestream
+shared.*
-import shared.readexception;
-import shared.mystobj;
-
-//extends context
+extends SerialBytestream
-{
-
+//I
-    
-public rmcontext(
+/*public rmcontext(I
-    {
-        this.in = in2;
+    }*/
+    /*public rmcontext(String filename)
+    {
+        super(filename);
+    }*/
+    static rmcontext _curcontext = new rmcontext();
+    public static rmcontext get()
+    {
+        return _curcontext;
-    }
-    
-
+
+
+
-    {
-
+
+
+
+
+
-    
-
+/*
-    {
-        rmcontext result = this.Fork();
@@ -50 +65 @@
-        
-        return result;
-
+*/
-    
-    
-
+/*
-    {
-        T[] result = (T[])java.lang.reflect.Array.newInstance(objclass, size);
@@ -131 +146 @@
-        
-        return result;
-
+*/
-    
-}

drizzle/DrizzlePrp/src/shared/generic.java

@@ -87 +87 @@
-        return result;
-    }
-
+<T>
-    {
-        T[] result = (T[])java.lang.reflect.Array.newInstance(objclass, length);

drizzle/DrizzlePrp/src/uru/Bytestream.java

@@ -23 +23 @@
-import shared.m;
-import shared.Bytes;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import shared.*;
-/**
- *
- * @author user
- */
-
+
+
-{
-    
@@ -35 +40 @@
-    private int maxpos;
-    //private int length; //fullLength
+    //private boolean serial = false;
+    //private FileInputStream in;
-
-    //okay to change.
@@ -40 +47 @@
-    public boolean throwExceptionOnEof = false;
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
-    public Bytestream(byte[] newData)
-    {
@@ -50 +68 @@
-        pos = 0;
-    }
-ublic
+rivate
-    public boolean eof()
-    {
@@ -67 +85 @@
-        return result;
-    }
+    /*public static Bytestream createSerial(String filename)
+    {
+        Bytestream result = new Bytestream();
+        result.serial = true;
+        File f = new File(filename);
+        if(!f.exists()) throw new shared.uncaughtexception("File doesn't exist:"+filename);
+        try
+        {
+            result.in = new FileInputStream(f);
+        }
+        catch(java.io.FileNotFoundException e)
+        {
+            throw new shared.uncaughtexception("File doesn't exist:"+filename);
+        }
+        return result;
+    }*/
-    public Bytestream Fork()
-    {
@@ -199 +233 @@
-        {
-            result[i] = readByte();
-        }
-        return result;
-    }
-    public byte[][] readMultiDimensionBytes(int num1, int num2)
-    {
-        byte[][] result = new byte[num1][];
-        for(int i=0;i<num1;i++)
-        {
-            result[i] = this.readBytes(num2);
-        }
-        return result;
-    }
-    public int[][] readMultiDimensionInts(int num1, int num2)
-    {
-        int[][] result = new int[num1][];
-        for(int i=0;i<num1;i++)
-        {
-            result[i] = this.readInts(num2);
-        }
-        return result;

drizzle/DrizzlePrp/src/uru/b.java

@@ -112 +112 @@
-        int c = ByteToInt32(bytes[startpos+2])<<16;
-        int d = ByteToInt32(bytes[startpos+3])<<24;
+        int result = a | b | c | d;
+        return result;
+    }
+    public static int BytesToInt32(byte b0, byte b1, byte b2, byte b3)
+    {
+        int a = ByteToInt32(b0)<<0;
+        int b = ByteToInt32(b1)<<8;
+        int c = ByteToInt32(b2)<<16;
+        int d = ByteToInt32(b3)<<24;
-        int result = a | b | c | d;
-        return result;

drizzle/DrizzlePrp/src/uru/moulprp/Image.java

@@ -13 +13 @@
-import uru.Bytedeque;
-import shared.readexception;
+import shared.IBytestream;
-
-/**
@@ -40 +41 @@
-            int[][] extraPixels;
-            
-
+I
-            {
-                this.width = width;
@@ -151 +152 @@
-            byte[] rawdata;
-            
-
+I
-            {
-                rawdata = data.readBytes(texelsize);
@@ -262 +263 @@
-        }
-        
-
+I
-        {
-            //e.ensure(texelsize==8); //DXT1