LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-30 21:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVG import fix

Browse Source
This commit is contained in:
honfika@gmail.com
2016-08-12 15:56:34 +02:00
parent 357db0bec3
commit 44a1c7bd5f
3 changed files with 1805 additions and 1784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -2894,8 +2894,7 @@ public final class SWF implements SWFContainerItem, Timelined {
timelined.setModified(true);
timelined.resetTimeline();
} else // timeline should be always the swf here
{
if (removeDependencies) {
if (removeDependencies) {
removeTagWithDependenciesFromTimeline(tag, timelined.getTimeline());
timelined.setModified(true);
} else {
@@ -2904,7 +2903,6 @@ public final class SWF implements SWFContainerItem, Timelined {
timelined.setModified(true);
}
}
}
}
@Override

3332
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgImporter.java
View File

File diff suppressed because it is too large Load Diff

253
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgPathReader.java
View File

@@ -1,115 +1,138 @@
/*
* Copyright (C) 2010-2016 JPEXS, All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
*/
package com.jpexs.decompiler.flash.importers.svg;
/**
*
* @author JPEXS
*/
public class SvgPathReader {
private final String str;
private int pos;
public SvgPathReader(String str) {
this.str = str;
}
public boolean hasNext() {
return pos < str.length();
}
public char peek() {
return str.charAt(pos);
}
public char readChar() {
char ch = str.charAt(pos);
pos++;
return ch;
}
public char readCommand() {
if (!hasNext()) {
return 0;
}
readWhiteSpaces();
char ch = peek();
char command = 0;
if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z')) {
command = ch;
pos++;
readSeparators();
}
return command;
}
public double readDouble() {
int startPos = pos;
readWhiteSpaces();
if (peek() == '-') {
pos++;
}
boolean pointFound = false;
while (hasNext()) {
char ch = str.charAt(pos);
if (ch == '.') {
if (pointFound) {
break;
}
pointFound = true;
} else if (ch >= '0' && ch <= '9') {
} else {
break;
}
pos++;
}
double result = Double.parseDouble(str.substring(startPos, pos));
readSeparators();
return result;
}
private void readWhiteSpaces() {
while (hasNext()) {
char ch = peek();
if (ch != ' ' && ch != '\r' && ch != '\n') {
return;
}
readChar();
}
}
private void readSeparators() {
while (hasNext()) {
char ch = peek();
if (ch != ' ' && ch != ',' && ch != '\r' && ch != '\n') {
return;
}
readChar();
}
}
}
/*
* Copyright (C) 2010-2016 JPEXS, All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
*/
package com.jpexs.decompiler.flash.importers.svg;
/**
*
* @author JPEXS
*/
public class SvgPathReader {
private final String str;
private int pos;
public SvgPathReader(String str) {
this.str = str;
}
public boolean hasNext() {
return pos < str.length();
}
public char peek() {
return str.charAt(pos);
}
public char readChar() {
char ch = str.charAt(pos);
pos++;
return ch;
}
public char readCommand() {
if (!hasNext()) {
return 0;
}
readWhiteSpaces();
char ch = peek();
char command = 0;
if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z')) {
command = ch;
pos++;
readSeparators();
}
return command;
}
private void digitSequence() {
while (hasNext()) {
char ch = str.charAt(pos);
if (ch >= '0' && ch <= '9') {
} else {
break;
}
pos++;
}
}
public double readDouble() {
int startPos = pos;
readWhiteSpaces();
char ch = str.charAt(pos);
if (ch == '-') {
pos++;
}
digitSequence();
ch = str.charAt(pos);
if (ch == '.') {
pos++;
digitSequence();
}
ch = str.charAt(pos);
if (ch == 'e') {
pos++;
ch = str.charAt(pos);
if (ch == '-') {
pos++;
}
digitSequence();
}
boolean ok = false;
try {
double result = Double.parseDouble(str.substring(startPos, pos));
readSeparators();
ok = true;
return result;
} finally {
if (!ok) {
pos = startPos;
}
}
}
private void readWhiteSpaces() {
while (hasNext()) {
char ch = peek();
if (ch != ' ' && ch != '\r' && ch != '\n') {
return;
}
readChar();
}
}
private void readSeparators() {
while (hasNext()) {
char ch = peek();
if (ch != ' ' && ch != ',' && ch != '\r' && ch != '\n') {
return;
}
readChar();
}
}
}