Skip to content

Commit

Permalink
- Fix for images marked as '$single'
Browse files Browse the repository at this point in the history
- added possibility to pass ""--jpgQuality x" via command line
  • Loading branch information
CrazyFlasher committed Jan 27, 2020
1 parent 293c1a2 commit 00766b0
Show file tree
Hide file tree
Showing 9 changed files with 98 additions and 79 deletions.
Binary file modified bin/exporter/Flump.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion bin/exporter/META-INF/AIR/hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
���7A��}�G�a�W�F�W�G7�d��wu.�
��f�D�3�혞�@�f�\�$hJ��g_9E
Expand Down
142 changes: 71 additions & 71 deletions bin/exporter/META-INF/signatures.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>M6TRjRAdMZa/XZ6m/3nNKc38YgM69dR70pNx6wlv5c8=</DigestValue>
<DigestValue>mo/sGTCssPa6N2FPBrNEcFU+cSEKrA+NXqPAoo/ogN8=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue Id="PackageSignatureValue">KBZWoB9dVb/Izx9oCxsWfp2RrdOTDM0esJiNcmMxkHzKTosKc3GT5hJWGXFMoIKyBPIXaxzG7Qjl
hmluMiQ04rN30lvtRhVJa57EBegUK7/6hvVadjlIs2PwfDPbfkaWCAmOuv8YdYOYSa2q4jlKsF9d
vSCI7PNTvLIAQeLJ9cx8G0iLsHEwN/BmNXyPuzUbJsnVQ4jZRvmpGix4mt5CmRKLS4l+hvTCHOvg
QXzo6cGSzpfwNVjcetZeAZwAlBGsp0rVwIbkSSpw7USLYf84mc1WN39Hrm1ki9ynipN+N02OpKXD
fIokZI+OVbCZJeYzWqMILjnuw5hrSF6rumD/JA==</SignatureValue>
<SignatureValue Id="PackageSignatureValue">aeH4FavcGglh5Tn4S2z2K0wOy9sVnP7sz6MMvmO/sLu7rPUv8UBO8Ma1wS6g4x+FFx1TeFTSynoc
gIDTRlMg2lDM91RHI4s9HWOJUS2qZSTNtCZ/KhVeEBt08x2hUKXF0GUkLxo9hxwxspbXGqzn3Clk
zfJztTRjW6e9txbzV9yBJace4qBMFcnIw6Vn9Thl2xshPvssf9Q+sUmmLrhgtxDRoT/GD8pZz+Ka
dELmOe44Qc1wj2p7A0x0OekY2JAgvojXOrDyH2yW/D32+o5Lz3onkxiMyD3s+1kgyFLDzA4UZ0z9
uK3t7NoKa2oZqkFZLNdWNegX8mFeX9S6vU8ZZw==</SignatureValue>
<KeyInfo>
<X509Data>
<X509Certificate>MIIDBDCCAeygAwIBAgIbLTY4OTgxNWUyOjE2MTRjYTUwOThiOi04MDAwMA0GCSqGSIb3DQEBBQUA
Expand All @@ -36,7 +36,7 @@ Z/JcNgXxTYUSxaWCztjiXTdMmXYPs0M6w88jocsY6eA8rJI=</X509Certificate>
</KeyInfo>
<Object>
<Manifest Id="PackageContents">
<Reference URI="mimetype"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>0/oCb84THKMagtI0Dy0KogEu92TegdesqRr/clXct1c=</DigestValue></Reference><Reference URI="META-INF/AIR/application.xml"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>JUY7VaF6/710+DuwesbqX+BUxv5n8tQ9gO8lmh8oBI4=</DigestValue></Reference><Reference URI="flump-exporter.swf"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>6OLTmQjGB1DVcdvyVy7cQXT7B1PxjNys4+lZm8GsVFg=</DigestValue></Reference><Reference URI="icons/icon_128.png"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>YZHHPJZTG65mU6hb9S4736zXEdfMBiFwAwja8j6Rbo4=</DigestValue></Reference><Reference URI="icons/icon_16.png"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>eQig8S6obnixVAoh//61364OXEiap0cmE1yTnmrqu3w=</DigestValue></Reference><Reference URI="icons/icon_32.png"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>HACoZNxq6Bwq4o9IFpSIjDFQtsKQ6SA+rEDD/nhcCJs=</DigestValue></Reference><Reference URI="icons/icon_48.png"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>AOYIvGEDJOY3kQbiZUUA3dsicQ21iGBprPy2aKP0cXQ=</DigestValue></Reference>
<Reference URI="mimetype"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>0/oCb84THKMagtI0Dy0KogEu92TegdesqRr/clXct1c=</DigestValue></Reference><Reference URI="META-INF/AIR/application.xml"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>JUY7VaF6/710+DuwesbqX+BUxv5n8tQ9gO8lmh8oBI4=</DigestValue></Reference><Reference URI="flump-exporter.swf"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>ZQ5CugthfDP9g12wccef0IOP40RfzH7+LAn1sxCP7iQ=</DigestValue></Reference><Reference URI="icons/icon_128.png"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>YZHHPJZTG65mU6hb9S4736zXEdfMBiFwAwja8j6Rbo4=</DigestValue></Reference><Reference URI="icons/icon_16.png"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>eQig8S6obnixVAoh//61364OXEiap0cmE1yTnmrqu3w=</DigestValue></Reference><Reference URI="icons/icon_32.png"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>HACoZNxq6Bwq4o9IFpSIjDFQtsKQ6SA+rEDD/nhcCJs=</DigestValue></Reference><Reference URI="icons/icon_48.png"><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod><DigestValue>AOYIvGEDJOY3kQbiZUUA3dsicQ21iGBprPy2aKP0cXQ=</DigestValue></Reference>
</Manifest>
</Object>
<Object xmlns:xades="http://uri.etsi.org/01903/v1.1.1#" >
Expand All @@ -49,70 +49,70 @@ Z/JcNgXxTYUSxaWCztjiXTdMmXYPs0M6w88jocsY6eA8rJI=</X509Certificate>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
</Transforms>
<xades:EncapsulatedTimeStamp>
MIIOEwYJKoZIhvcNAQcCoIIOBDCCDgACAQMxDTALBglghkgBZQMEAgEwgf4GCyqGSIb3DQEJEAEE
oIHuBIHrMIHoAgEBBgtghkgBhvhFAQcXAzAhMAkGBSsOAwIaBQAEFE0ONeTXJo0copaTkIXP4W3k
6qHDAhRsMebYAo0C781bMFPa5qfBVUGzCBgPMjAyMDAxMjcxNDM3MjBaMAMCAR6ggYakgYMwgYAx
CzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3lt
YW50ZWMgVHJ1c3QgTmV0d29yazExMC8GA1UEAxMoU3ltYW50ZWMgU0hBMjU2IFRpbWVTdGFtcGlu
ZyBTaWduZXIgLSBHM6CCCoswggU4MIIEIKADAgECAhB7BbHUSWhRRPfJidKcGZ0SMA0GCSqGSIb3
DQEBCwUAMIG9MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsT
FlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMu
IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBS
b290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTE2MDExMjAwMDAwMFoXDTMxMDExMTIzNTk1
OVowdzELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQL
ExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0
YW1waW5nIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu1mdWVVPnYxyXRqBoutV
87ABrTxxrDKPBWuGmicAMpdqTclkFEspu8LZKbku7GOz4c8/C1aQ+GIbfuumB+Lef15tQDjUkQbn
QXx5HMvLrRu/2JWR8/DubPitljkuf8EnuHg5xYSl7e2vh47Ojcdt6tKYtTofHjmdw/SaqPSE4cTR
fHHGBim0P+SDDSbDewg+TfkKtzNJ/8o71PWym0vhiJka9cDpMxTW38eA25Hu/rySV3J39M2ozP4J
9ZM3vpWIasXc9LFL1M7oCZFftYR5NYp4rBkyjyPBMkEbWQ6pPrHM+dYr77fY5NUdbRE6kvaTyZzj
SO67Uw7UNpeGeMWhNwIDAQABo4IBdzCCAXMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
Af8CAQAwZgYDVR0gBF8wXTBbBgtghkgBhvhFAQcXAzBMMCMGCCsGAQUFBwIBFhdodHRwczovL2Qu
c3ltY2IuY29tL2NwczAlBggrBgEFBQcCAjAZGhdodHRwczovL2Quc3ltY2IuY29tL3JwYTAuBggr
BgEFBQcBAQQiMCAwHgYIKwYBBQUHMAGGEmh0dHA6Ly9zLnN5bWNkLmNvbTA2BgNVHR8ELzAtMCug
KaAnhiVodHRwOi8vcy5zeW1jYi5jb20vdW5pdmVyc2FsLXJvb3QuY3JsMBMGA1UdJQQMMAoGCCsG
AQUFBwMIMCgGA1UdEQQhMB+kHTAbMRkwFwYDVQQDExBUaW1lU3RhbXAtMjA0OC0zMB0GA1UdDgQW
BBSvY9bKo06FcuCnvEHzKaI4f4B1YjAfBgNVHSMEGDAWgBS2d/ppSEefUxLVwuoHMnYH0ZcHGTAN
BgkqhkiG9w0BAQsFAAOCAQEAdeqwLdU0GVwyRf4O4dRPpnjBb9fq3dxP86HIgYj3p48V5kApreZd
9KLZVmSEcTAq3R5hF2YgVgaYGY1dcfL4l7wJ/RyRR8ni6I0D+8yQL9YKbE4z7Na0k8hMkGNIOUAh
xN3WbomYPLWYl+ipBrcJyY9TV0GQL+EeTU7cyhB4bEJu8LbF+GFcUvVO9muN90p6vvPN/QPX2fYD
qA/jU/cKdezGdS6qZoUEmbf4Blfhxg726K/a7JsYH6q54zoAv86KlMsB257HOLsPUqvR45QDYApN
oP4nbRQy/D+XQOG/mYnb5DkUvdrk08PqK1qzlVhVBH3HmuwjA42FKtL/rqlhgTCCBUswggQzoAMC
AQICEHvU5a+6zAc/oQEjBCJBTRIwDQYJKoZIhvcNAQELBQAwdzELMAkGA1UEBhMCVVMxHTAbBgNV
BAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3Jr
MSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIENBMB4XDTE3MTIyMzAwMDAw
MFoXDTI5MDMyMjIzNTk1OVowgYAxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jw
b3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazExMC8GA1UEAxMoU3ltYW50
ZWMgU0hBMjU2IFRpbWVTdGFtcGluZyBTaWduZXIgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEP
ADCCAQoCggEBAK8Oiqr43L9pe1QXcUcJvY08gfh0FXdnkJz93k4Cnkt29uU2PmXVJCBtMPndHYPp
PydKM05tForkjUCNIqq+pwsb0ge2PLUaJCj4G3JRPcgJiCYIOvn6QyN1R3AMs19bjwgdckhXZU2v
AjxA9/TdMjiTP+UspvNZI8uA3hNN+RDJqgoYbFVhV9HxAizEtavybCPSnw0PGWythWJp/U6FwYpS
Matb2Ml0UuNXbCK/VX9vygarP0q3InZl7Ow28paVgSYs/buYqgE4068lQJsJU/ApV4VYXuqFSEEh
h+XetNMmsntAU1h5jlIxBk2UA0XEzjwD7LcA8joixbRv5e+wipsCAwEAAaOCAccwggHDMAwGA1Ud
EwEB/wQCMAAwZgYDVR0gBF8wXTBbBgtghkgBhvhFAQcXAzBMMCMGCCsGAQUFBwIBFhdodHRwczov
L2Quc3ltY2IuY29tL2NwczAlBggrBgEFBQcCAjAZGhdodHRwczovL2Quc3ltY2IuY29tL3JwYTBA
BgNVHR8EOTA3MDWgM6Axhi9odHRwOi8vdHMtY3JsLndzLnN5bWFudGVjLmNvbS9zaGEyNTYtdHNz
LWNhLmNybDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8BAf8EBAMCB4AwdwYIKwYBBQUH
AQEEazBpMCoGCCsGAQUFBzABhh5odHRwOi8vdHMtb2NzcC53cy5zeW1hbnRlYy5jb20wOwYIKwYB
BQUHMAKGL2h0dHA6Ly90cy1haWEud3Muc3ltYW50ZWMuY29tL3NoYTI1Ni10c3MtY2EuY2VyMCgG
A1UdEQQhMB+kHTAbMRkwFwYDVQQDExBUaW1lU3RhbXAtMjA0OC02MB0GA1UdDgQWBBSlEwGpn4XM
G24WHl87Map5NgB7HTAfBgNVHSMEGDAWgBSvY9bKo06FcuCnvEHzKaI4f4B1YjANBgkqhkiG9w0B
AQsFAAOCAQEARp6v8LiiX6KZSM+oJ0shzbK5pnJwYy/jVSl7OUZO535lBliLvFeKkg0I2BC6NiT6
Cnv7O9Niv0qUFeaC24pUbf8o/mfPcT/mMwnZolkQ9B5K/mXM3tRr41IpdQBKK6XMy5voqU33tBdZ
kkHDtz+G5vbAf0Q8RlwXWuOkO9VpJtUhfeGAZ35irLdOLhWa5Zwjr1sR6nGpQfkNeTipoQ3PtLHa
Ppp6xyLFdM3fRwmGxPyRJbIblumFCOjd6nRgbmClVnoNyERY3Ob5SBSe5b/eAL13sZgUchQk38cR
LB8AP8NLFMZnHMweBqOQX1xUiz7jM1uCD8W3hgJOcZ/pZkU/djGCAlowggJWAgEBMIGLMHcxCzAJ
BgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50
ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UEAxMfU3ltYW50ZWMgU0hBMjU2IFRpbWVTdGFtcGluZyBD
QQIQe9Tlr7rMBz+hASMEIkFNEjALBglghkgBZQMEAgGggaQwGgYJKoZIhvcNAQkDMQ0GCyqGSIb3
DQEJEAEEMBwGCSqGSIb3DQEJBTEPFw0yMDAxMjcxNDM3MjBaMC8GCSqGSIb3DQEJBDEiBCC2ESdA
W7MPutp79VtNPJjstVLY+E7yV9qrWHAfDx/YKTA3BgsqhkiG9w0BCRACLzEoMCYwJDAiBCDEdM52
AH0COU4NpeTefBTGgPniggE8/vZT7123H99h+DALBgkqhkiG9w0BAQEEggEAF5Tfw6uLe74GRJ0X
lxDnU+QPkBQSBNrUbyr9dfXnmyRGLRF3LWPfS7u9oBWyJG8q8nPu2xXgfPOFOY4VRo7nzIhYcPS8
JCYDSaZjQLqjHxz5w4YzZCPAteEgo7PC/BtI8ifxvlpS+/hO0WFP/sWkUndKmRIcP0GGT9+AfNQO
mdW6wlWnomxemQacp6ZUexD/XuKTNKNdYYAL/qiqXN8X3MD6OVOoQF+Q8RKDF8whlvTX/f8motEp
e2CQ+CQSFOUTm4CGs0HhHqNfTV1dn0EeRZj9suxugYzF30mDl+0DJxxirRC8slTXHkDpcg2c5Qet
b07VhZjoVVupIxgzlc9lMg==
MIIOFAYJKoZIhvcNAQcCoIIOBTCCDgECAQMxDTALBglghkgBZQMEAgEwgf8GCyqGSIb3DQEJEAEE
oIHvBIHsMIHpAgEBBgtghkgBhvhFAQcXAzAhMAkGBSsOAwIaBQAEFJcmZEOSas5AhRumw96vsb5o
nHw3AhUAleRc1jJlW6zfP9HD+nZrSxhy8zYYDzIwMjAwMTI3MTg0MjE5WjADAgEeoIGGpIGDMIGA
MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5
bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBp
bmcgU2lnbmVyIC0gRzOgggqLMIIFODCCBCCgAwIBAgIQewWx1EloUUT3yYnSnBmdEjANBgkqhkiG
9w0BAQsFADCBvTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5j
LiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwg
Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xNjAxMTIwMDAwMDBaFw0zMTAxMTEyMzU5
NTlaMHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UE
CxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UEAxMfU3ltYW50ZWMgU0hBMjU2IFRpbWVT
dGFtcGluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtZnVlVT52Mcl0agaLr
VfOwAa08cawyjwVrhponADKXak3JZBRLKbvC2Sm5Luxjs+HPPwtWkPhiG37rpgfi3n9ebUA41JEG
50F8eRzLy60bv9iVkfPw7mz4rZY5Ln/BJ7h4OcWEpe3tr4eOzo3HberSmLU6Hx45ncP0mqj0hOHE
0XxxxgYptD/kgw0mw3sIPk35CrczSf/KO9T1sptL4YiZGvXA6TMU1t/HgNuR7v68kldyd/TNqMz+
CfWTN76ViGrF3PSxS9TO6AmRX7WEeTWKeKwZMo8jwTJBG1kOqT6xzPnWK++32OTVHW0ROpL2k8mc
40juu1MO1DaXhnjFoTcCAwEAAaOCAXcwggFzMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAG
AQH/AgEAMGYGA1UdIARfMF0wWwYLYIZIAYb4RQEHFwMwTDAjBggrBgEFBQcCARYXaHR0cHM6Ly9k
LnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoXaHR0cHM6Ly9kLnN5bWNiLmNvbS9ycGEwLgYI
KwYBBQUHAQEEIjAgMB4GCCsGAQUFBzABhhJodHRwOi8vcy5zeW1jZC5jb20wNgYDVR0fBC8wLTAr
oCmgJ4YlaHR0cDovL3Muc3ltY2IuY29tL3VuaXZlcnNhbC1yb290LmNybDATBgNVHSUEDDAKBggr
BgEFBQcDCDAoBgNVHREEITAfpB0wGzEZMBcGA1UEAxMQVGltZVN0YW1wLTIwNDgtMzAdBgNVHQ4E
FgQUr2PWyqNOhXLgp7xB8ymiOH+AdWIwHwYDVR0jBBgwFoAUtnf6aUhHn1MS1cLqBzJ2B9GXBxkw
DQYJKoZIhvcNAQELBQADggEBAHXqsC3VNBlcMkX+DuHUT6Z4wW/X6t3cT/OhyIGI96ePFeZAKa3m
XfSi2VZkhHEwKt0eYRdmIFYGmBmNXXHy+Je8Cf0ckUfJ4uiNA/vMkC/WCmxOM+zWtJPITJBjSDlA
IcTd1m6JmDy1mJfoqQa3CcmPU1dBkC/hHk1O3MoQeGxCbvC2xfhhXFL1TvZrjfdKer7zzf0D19n2
A6gP41P3CnXsxnUuqmaFBJm3+AZX4cYO9uiv2uybGB+queM6AL/OipTLAduexzi7D1Kr0eOUA2AK
TaD+J20UMvw/l0Dhv5mJ2+Q5FL3a5NPD6itas5VYVQR9x5rsIwONhSrS/66pYYEwggVLMIIEM6AD
AgECAhB71OWvuswHP6EBIwQiQU0SMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNVBAYTAlVTMR0wGwYD
VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29y
azEoMCYGA1UEAxMfU3ltYW50ZWMgU0hBMjU2IFRpbWVTdGFtcGluZyBDQTAeFw0xNzEyMjMwMDAw
MDBaFw0yOTAzMjIyMzU5NTlaMIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29y
cG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFu
dGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcgU2lnbmVyIC0gRzMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQCvDoqq+Ny/aXtUF3FHCb2NPIH4dBV3Z5Cc/d5OAp5LdvblNj5l1SQgbTD53R2D
6T8nSjNObRaK5I1AjSKqvqcLG9IHtjy1GiQo+BtyUT3ICYgmCDr5+kMjdUdwDLNfW48IHXJIV2VN
rwI8QPf03TI4kz/lLKbzWSPLgN4TTfkQyaoKGGxVYVfR8QIsxLWr8mwj0p8NDxlsrYViaf1OhcGK
UjGrW9jJdFLjV2wiv1V/b8oGqz9KtyJ2ZezsNvKWlYEmLP27mKoBONOvJUCbCVPwKVeFWF7qhUhB
IYfl3rTTJrJ7QFNYeY5SMQZNlANFxM48A+y3API6IsW0b+XvsIqbAgMBAAGjggHHMIIBwzAMBgNV
HRMBAf8EAjAAMGYGA1UdIARfMF0wWwYLYIZIAYb4RQEHFwMwTDAjBggrBgEFBQcCARYXaHR0cHM6
Ly9kLnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoXaHR0cHM6Ly9kLnN5bWNiLmNvbS9ycGEw
QAYDVR0fBDkwNzA1oDOgMYYvaHR0cDovL3RzLWNybC53cy5zeW1hbnRlYy5jb20vc2hhMjU2LXRz
cy1jYS5jcmwwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/BAQDAgeAMHcGCCsGAQUF
BwEBBGswaTAqBggrBgEFBQcwAYYeaHR0cDovL3RzLW9jc3Aud3Muc3ltYW50ZWMuY29tMDsGCCsG
AQUFBzAChi9odHRwOi8vdHMtYWlhLndzLnN5bWFudGVjLmNvbS9zaGEyNTYtdHNzLWNhLmNlcjAo
BgNVHREEITAfpB0wGzEZMBcGA1UEAxMQVGltZVN0YW1wLTIwNDgtNjAdBgNVHQ4EFgQUpRMBqZ+F
zBtuFh5fOzGqeTYAex0wHwYDVR0jBBgwFoAUr2PWyqNOhXLgp7xB8ymiOH+AdWIwDQYJKoZIhvcN
AQELBQADggEBAEaer/C4ol+imUjPqCdLIc2yuaZycGMv41UpezlGTud+ZQZYi7xXipINCNgQujYk
+gp7+zvTYr9KlBXmgtuKVG3/KP5nz3E/5jMJ2aJZEPQeSv5lzN7Ua+NSKXUASiulzMub6KlN97QX
WZJBw7c/hub2wH9EPEZcF1rjpDvVaSbVIX3hgGd+Yqy3Ti4VmuWcI69bEepxqUH5DXk4qaENz7Sx
2j6aescixXTN30cJhsT8kSWyG5bphQjo3ep0YG5gpVZ6DchEWNzm+UgUnuW/3gC9d7GYFHIUJN/H
ESwfAD/DSxTGZxzMHgajkF9cVIs+4zNbgg/Ft4YCTnGf6WZFP3YxggJaMIICVgIBATCBizB3MQsw
CQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFu
dGVjIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcg
Q0ECEHvU5a+6zAc/oQEjBCJBTRIwCwYJYIZIAWUDBAIBoIGkMBoGCSqGSIb3DQEJAzENBgsqhkiG
9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjAwMTI3MTg0MjE5WjAvBgkqhkiG9w0BCQQxIgQgwCTi
rCA4K2x0sTh7iDKBMH0KH8czssJn3AtoCGZnkrIwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTO
dgB9AjlODaXk3nwUxoD54oIBPP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBADdNuEQhFWQvNHdG
GcAjymthutviRT+Tn11Fk3WPYKtCPw9+7k9lc4BlVPyHNAG3S6QJyx1AkYDx1O+Q67G8AUYk2v8O
2FUamYu025pN0FvStlulfPcTgz89d27kzzMeK3EGjf+LIOO8G4A5OsYdHv0g51FUYK5bijSw7P12
UC1uaDz3FPVI5aszFeoD25x2cUPLyzBYEL+wLLvCA7JFwRI4k4WHtetU0GxDP2u17rVppgrMW18J
ZgwvBfjwcSNwy89oXeLGLd5FIQQ/SepzgImQ+/wI+CMOtzzTpXa6uCL3OdbcTcAxMo/wNB8Pm8d1
uHrCPijg+WyBUdKWmhFoYFw=
</xades:EncapsulatedTimeStamp>
</xades:HashDataInfo>
</xades:SignatureTimeStamp>
Expand Down
Binary file modified bin/exporter/flump-exporter.swf
Binary file not shown.
1 change: 1 addition & 0 deletions exporter/src/main/as/flump/Util.as
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ public class Util
public static function nextPowerOfTwo (n :int) :int {
var p :int = 1;
while (p < n) p *= 2;

return p;
}
}
Expand Down
15 changes: 11 additions & 4 deletions exporter/src/main/as/flump/export/AtlasImpl.as
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class AtlasImpl implements Atlas
var constructed :Sprite = new Sprite();
var collapsedBounds :Rectangle = new Rectangle();
_nodes.forEach(function (node :Node, ..._) :void {
const bm :Bitmap = new Bitmap(node.texture.toBitmapData(_xBorderSize, _yBorderSize), "auto", true);
const bm :Bitmap = new Bitmap(node.texture.toBitmapData(!hasSingleTexture ? _xBorderSize : 0, !hasSingleTexture ? _yBorderSize : 0), "auto", true);
constructed.addChild(bm);
bm.x = node.paddedBounds.x;
bm.y = node.paddedBounds.y;
Expand All @@ -80,17 +80,24 @@ public class AtlasImpl implements Atlas
return _bitmapData;
}


private var hasSingleTexture:Boolean;
// Try to place a texture in this atlas
public function place (tex :SwfTexture, xx :uint, yy :uint) :void {
var w :int = tex.w + (!tex.isSingle ? (_xBorderSize * 2) : 0);
var h :int = tex.h + (!tex.isSingle ? (_yBorderSize * 2) : 0);
hasSingleTexture = tex.isSingle;

var padX:int = !tex.isSingle ? _xBorderSize : 0;
var padY:int = !tex.isSingle ? _yBorderSize : 0;

var w :int = tex.w + (padX * 2);
var h :int = tex.h + (padY * 2);
if (w > _width || h > _height) {
throw new Error("Tried to place a texture outside of the atlas. This is a bug.");
}
if (isMasked(xx, yy, w, h)) {
throw new Error("Tried to place a texture over another texture. This is a bug.");
}
var node :Node = new Node(xx, yy, _xBorderSize, _yBorderSize, tex);
var node :Node = new Node(xx, yy, padX, padY, tex);
_nodes.push(node);
setMasked(node.paddedBounds.x, node.paddedBounds.y, node.paddedBounds.width, node.paddedBounds.height);
}
Expand Down
4 changes: 3 additions & 1 deletion exporter/src/main/as/flump/export/AtlasUtil.as
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ import starling.textures.Texture;

public class AtlasUtil
{
public static var jpgQuality:int = 70;

public static function writePNG (atlas :Atlas, bytes :IDataOutput) :void {
bytes.writeBytes(atlas.jpg ? new JPEGEncoder(80).encode(atlas.toBitmap()) : PNGEncoder.encode(atlas.toBitmap()));
bytes.writeBytes(atlas.jpg ? new JPEGEncoder(jpgQuality).encode(atlas.toBitmap()) : PNGEncoder.encode(atlas.toBitmap()));
}

public static function toTexture (atlas :Atlas) :Texture {
Expand Down
9 changes: 9 additions & 0 deletions exporter/src/main/as/flump/export/FlumpApp.as
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@ public class FlumpApp
if (hasValueArgument(event.arguments, "--export")) {
var projectName :String = popValueArgument(event.arguments, "--export");
var exportUnmodified :Boolean = popFlagArgument(event.arguments, "--unmodified");

var jpgQualityIndex:int = event.arguments.indexOf("--jpgQuality");
if (jpgQualityIndex != -1)
{
AtlasUtil.jpgQuality = parseInt(event.arguments[jpgQualityIndex + 1]);
event.arguments.removeAt(jpgQualityIndex);
event.arguments.removeAt(jpgQualityIndex);
}

var headless :AutomaticExporter = new AutomaticExporter(new File(projectName), exportUnmodified);
headless.complete.connectNotify(function (complete :Boolean) :void {
if (!complete) return;
Expand Down
4 changes: 2 additions & 2 deletions haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"tags": [
],
"description": "Flump",
"version": "1.0.6",
"releasenote": "Added possibility to export JPG atlases by adding $jpg to library linkage",
"version": "1.0.7",
"releasenote": "Fix for images marked as '$single'",
"contributors": [
"CrazyFlasher",
"tconkling"
Expand Down

0 comments on commit 00766b0

Please sign in to comment.