diff --git a/trunk/libsrc/LZMA/nbproject/build-impl.xml b/trunk/libsrc/LZMA/nbproject/build-impl.xml
index 4144cb57a..951bf989a 100644
--- a/trunk/libsrc/LZMA/nbproject/build-impl.xml
+++ b/trunk/libsrc/LZMA/nbproject/build-impl.xml
@@ -80,9 +80,12 @@ is divided into following sections:
-
-
-
+
+
+
+
+
+
@@ -1199,11 +1202,14 @@ is divided into following sections:
-
+
+
+
+
-
+
@@ -1277,7 +1283,7 @@ is divided into following sections:
-
+
Some tests failed; see details above.
diff --git a/trunk/libsrc/LZMA/nbproject/genfiles.properties b/trunk/libsrc/LZMA/nbproject/genfiles.properties
index 248655073..ebce23e4c 100644
--- a/trunk/libsrc/LZMA/nbproject/genfiles.properties
+++ b/trunk/libsrc/LZMA/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.68.1.46
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=cf8fb9e4
-nbproject/build-impl.xml.script.CRC32=35617b72
-nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
+nbproject/build-impl.xml.script.CRC32=fd6704e6
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
diff --git a/trunk/libsrc/avi/nbproject/build-impl.xml b/trunk/libsrc/avi/nbproject/build-impl.xml
index 675a2b235..d2730e2c3 100644
--- a/trunk/libsrc/avi/nbproject/build-impl.xml
+++ b/trunk/libsrc/avi/nbproject/build-impl.xml
@@ -80,9 +80,12 @@ is divided into following sections:
-
-
-
+
+
+
+
+
+
@@ -1199,11 +1202,14 @@ is divided into following sections:
-
+
+
+
+
-
+
@@ -1277,7 +1283,7 @@ is divided into following sections:
-
+
Some tests failed; see details above.
diff --git a/trunk/libsrc/avi/nbproject/genfiles.properties b/trunk/libsrc/avi/nbproject/genfiles.properties
index 4b63314ae..adc983466 100644
--- a/trunk/libsrc/avi/nbproject/genfiles.properties
+++ b/trunk/libsrc/avi/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.68.1.46
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=505ab359
-nbproject/build-impl.xml.script.CRC32=b5283dd3
-nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
+nbproject/build-impl.xml.script.CRC32=3d5c3ae5
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
diff --git a/trunk/libsrc/gif/nbproject/build-impl.xml b/trunk/libsrc/gif/nbproject/build-impl.xml
index 9a4d2773d..ce27c129d 100644
--- a/trunk/libsrc/gif/nbproject/build-impl.xml
+++ b/trunk/libsrc/gif/nbproject/build-impl.xml
@@ -80,9 +80,12 @@ is divided into following sections:
-
-
-
+
+
+
+
+
+
@@ -1199,11 +1202,14 @@ is divided into following sections:
-
+
+
+
+
-
+
@@ -1277,7 +1283,7 @@ is divided into following sections:
-
+
Some tests failed; see details above.
diff --git a/trunk/libsrc/gif/nbproject/genfiles.properties b/trunk/libsrc/gif/nbproject/genfiles.properties
index d8a93fa60..a6fe2d3a4 100644
--- a/trunk/libsrc/gif/nbproject/genfiles.properties
+++ b/trunk/libsrc/gif/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.68.1.46
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=c07cf2d0
-nbproject/build-impl.xml.script.CRC32=cf654385
-nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
+nbproject/build-impl.xml.script.CRC32=178a9ed1
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
diff --git a/trunk/libsrc/nellymoser/nbproject/build-impl.xml b/trunk/libsrc/nellymoser/nbproject/build-impl.xml
index 87a75aec3..0039b3234 100644
--- a/trunk/libsrc/nellymoser/nbproject/build-impl.xml
+++ b/trunk/libsrc/nellymoser/nbproject/build-impl.xml
@@ -80,9 +80,12 @@ is divided into following sections:
-
-
-
+
+
+
+
+
+
@@ -1199,11 +1202,14 @@ is divided into following sections:
-
+
+
+
+
-
+
@@ -1277,7 +1283,7 @@ is divided into following sections:
-
+
Some tests failed; see details above.
diff --git a/trunk/libsrc/nellymoser/nbproject/genfiles.properties b/trunk/libsrc/nellymoser/nbproject/genfiles.properties
index 85533b776..c93a9a0f1 100644
--- a/trunk/libsrc/nellymoser/nbproject/genfiles.properties
+++ b/trunk/libsrc/nellymoser/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.68.1.46
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=413e5dbf
-nbproject/build-impl.xml.script.CRC32=03e6ec15
-nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
+nbproject/build-impl.xml.script.CRC32=36480124
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
diff --git a/trunk/libsrc/ttf/nbproject/build-impl.xml b/trunk/libsrc/ttf/nbproject/build-impl.xml
index 2451f7f11..41c1b513d 100644
--- a/trunk/libsrc/ttf/nbproject/build-impl.xml
+++ b/trunk/libsrc/ttf/nbproject/build-impl.xml
@@ -80,9 +80,12 @@ is divided into following sections:
-
-
-
+
+
+
+
+
+
@@ -1199,11 +1202,14 @@ is divided into following sections:
-
+
+
+
+
-
+
@@ -1277,7 +1283,7 @@ is divided into following sections:
-
+
Some tests failed; see details above.
diff --git a/trunk/libsrc/ttf/nbproject/genfiles.properties b/trunk/libsrc/ttf/nbproject/genfiles.properties
index 115ce4b20..29b2c0e4d 100644
--- a/trunk/libsrc/ttf/nbproject/genfiles.properties
+++ b/trunk/libsrc/ttf/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.68.1.46
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=ffc041f7
-nbproject/build-impl.xml.script.CRC32=b06e210e
-nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
+nbproject/build-impl.xml.script.CRC32=fdde8048
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java
index 802090cdf..d40f1a402 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWF.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java
@@ -535,7 +535,8 @@ public final class SWF implements TreeItem, Timelined {
gfx = true;
}
if (hdr[0] == 'C') {
- sis = new SWFInputStream(new InflaterInputStream(is), version, 8);
+ byte[] uncompressedData = Helper.readStream(new InflaterInputStream(is));
+ sis = new SWFInputStream(new ByteArrayInputStream(uncompressedData), version, 8);
compressed = true;
}
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
index e7c4f7476..bb4a2bf77 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
@@ -641,11 +641,11 @@ public class SWFInputStream extends InputStream {
* @return Array of read bytes
* @throws IOException
*/
- public byte[] readBytes(long count) throws IOException {
+ public byte[] readBytes(int count) throws IOException {
if (count <= 0) {
return new byte[0];
}
- byte[] ret = new byte[(int) count];
+ byte[] ret = new byte[count];
try {
for (int i = 0; i < count; i++) {
ret[i] = (byte) readEx();
diff --git a/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index f56ad28db..cb7718611 100644
--- a/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -99,7 +99,7 @@ public class Configuration {
public static final ConfigurationItem useRibbonInterface = null;
@ConfigurationDefaultBoolean(false)
public static final ConfigurationItem openFolderAfterFlaExport = null;
- @ConfigurationDefaultBoolean(true)
+ @ConfigurationDefaultBoolean(false)
public static final ConfigurationItem useDetailedLogging = null;
@ConfigurationDefaultInt(65536)
diff --git a/trunk/testdata/as3/build.bat b/trunk/testdata/as3/build.bat
index 5b260b546..881f4cfb4 100644
--- a/trunk/testdata/as3/build.bat
+++ b/trunk/testdata/as3/build.bat
@@ -1,19 +1,19 @@
-@echo off
-set ISDEBUG=false
-if "%1" == "debug" goto blockset
-goto block2
-:blockset
-set ISDEBUG=true
-:block2
-set COMPILERPATH=..\..\flex_sdk\bin\mxmlc.exe
-if not exist %COMPILERPATH% goto notex
-%COMPILERPATH% -warnings=false -debug=%ISDEBUG% TestMovie.as>out.txt
-rem start notepad out.txt
-if errorlevel==1 goto failed
-goto end
-:notex
-echo Flex SDK not found. Download and unpack Flex SDK into trunk\flex_sdk directory, then run build again
-goto end
-:failed
-pause
-:end
\ No newline at end of file
+@echo off
+set ISDEBUG=false
+if "%1" == "debug" goto blockset
+goto block2
+:blockset
+set ISDEBUG=true
+:block2
+set COMPILERPATH=..\..\flex_sdk\bin\mxmlc.exe
+if not exist %COMPILERPATH% goto notex
+%COMPILERPATH% -warnings=false -debug=%ISDEBUG% TestMovie.as>out.txt
+rem start notepad out.txt
+if errorlevel==1 goto failed
+goto end
+:notex
+echo Flex SDK not found. Download and unpack Flex SDK into trunk\flex_sdk directory, then run build again
+goto end
+:failed
+pause
+:end
diff --git a/trunk/testdata/as3/classes/Test.as b/trunk/testdata/as3/classes/Test.as
index c8e1891da..062fcddf7 100644
--- a/trunk/testdata/as3/classes/Test.as
+++ b/trunk/testdata/as3/classes/Test.as
@@ -5,13 +5,13 @@
import classes.myInternal;
import flash.errors.EOFError;
import flash.events.Event;
-
public class Test
{
private var testPriv:int=5;
protected var testProt:int=9;
public var t3:TestClass3;
public static const p:int=8;
+ private namespace n="nazdar";
public function testHello()
{
@@ -614,7 +614,7 @@
function getNamespace():Namespace
{
- return null; //myInternal;
+ return myInternal;
}
function getName():String
@@ -626,9 +626,10 @@
{
var ns=getNamespace();
var name=getName();
- //var a=ns::unnamespacedFunc();
- //var b=ns::[name];
- //trace(b.c);
+ var a=ns::unnamespacedFunc();
+ var b=ns::[name];
+ trace(b.c);
+ var c=myInternal::neco;
}
function testComplexExpressions()