diff --git a/DesktopEditor/cximage/raw/libdcr.h b/DesktopEditor/cximage/raw/libdcr.h index 72e4e88889..6880b554d9 100644 --- a/DesktopEditor/cximage/raw/libdcr.h +++ b/DesktopEditor/cximage/raw/libdcr.h @@ -35,14 +35,6 @@ #ifndef __LIBDCR #define __LIBDCR -#if defined(BUILDING_WASM_MODULE) -#include -#include -#include -#include -#define _swab swab -#endif - #if defined(WIN32) || defined(_WIN32_WCE) #include #include @@ -56,6 +48,11 @@ #define _getcwd getcwd #include +#if defined(BUILDING_WASM_MODULE) +#include +#include +#endif + #ifdef __ANDROID__ #include #if __ANDROID_API__ < 28 diff --git a/DesktopEditor/graphics/pro/js/graphics_make.py b/DesktopEditor/graphics/pro/js/graphics_make.py index 88a756d8f8..c6f024133c 100644 --- a/DesktopEditor/graphics/pro/js/graphics_make.py +++ b/DesktopEditor/graphics/pro/js/graphics_make.py @@ -67,7 +67,7 @@ libFreetype_src_path = "../../../freetype-2.10.4/src/" input_freetype_sources = ["base/ftinit.c", "base/ftlcdfil.c", "base/ftobjs.c", "base/ftglyph.c", "base/ftoutln.c", "base/ftutil.c", "base/ftgloadr.c", "base/ftfntfmt.c", "base/ftcalc.c", "base/ftbitmap.c", "base/ftstream.c", "base/fthash.c", "base/ftdebug.c", "base/fttrigon.c", "base/ftadvanc.c", "base/ftpsprop.c", "base/ftrfork.c", "bdf/bdfdrivr.c", "bdf/bdflib.c", "smooth/ftsmooth.c", "smooth/ftgrays.c", "../builds/unix/ftsystem.c", "autofit/afmodule.c", "autofit/afhints.c", "autofit/afloader.c", "autofit/afglobal.c", "autofit/afshaper.c", "autofit/afranges.c", "autofit/afdummy.c", "autofit/aflatin.c", "autofit/afcjk.c", "autofit/afindic.c", "autofit/afangles.c", "autofit/afblue.c", "autofit/afwarp.c", "truetype/ttdriver.c", "truetype/ttgload.c", "truetype/ttpload.c", "truetype/ttobjs.c", "truetype/ttgxvar.c", "truetype/ttinterp.c", "type1/t1driver.c", "type1/t1afm.c", "type1/t1load.c", "type1/t1gload.c", "type1/t1objs.c", "type1/t1parse.c", "cff/cffdrivr.c", "cff/cffgload.c", "cff/cffload.c", "cff/cffcmap.c", "cff/cffparse.c", "cff/cffobjs.c", "cid/cidriver.c", "cid/cidobjs.c", "cid/cidgload.c", "cid/cidload.c", "cid/cidparse.c", "pfr/pfrdrivr.c", "pfr/pfrobjs.c", "pfr/pfrload.c", "pfr/pfrgload.c", "pfr/pfrcmap.c", "pfr/pfrsbit.c", "type42/t42drivr.c", "type42/t42objs.c", "type42/t42parse.c", "winfonts/winfnt.c", "pcf/pcfdrivr.c", "pcf/pcfread.c", "pcf/pcfutil.c", "psaux/psauxmod.c", "psaux/psobjs.c", "psaux/t1decode.c", "psaux/psft.c", "psaux/afmparse.c", "psaux/t1cmap.c", "psaux/cffdecode.c", "psaux/psconv.c", "psaux/psfont.c", "psaux/psblues.c", "psaux/psintrp.c", "psaux/pserror.c", "psaux/psstack.c", "psaux/pshints.c", "psaux/psarrst.c", "psaux/psread.c", "psnames/psmodule.c", "pshinter/pshmod.c", "pshinter/pshrec.c", "pshinter/pshglob.c", "pshinter/pshalgo.c", "raster/ftrend1.c", "raster/ftraster.c", "sfnt/sfdriver.c", "sfnt/ttpost.c", "sfnt/sfobjs.c", "sfnt/ttload.c", "sfnt/ttbdf.c", "sfnt/ttmtx.c", "sfnt/ttkern.c", "sfnt/sfwoff.c", "sfnt/ttcmap.c", "sfnt/ttsbit.c", "sfnt/sfwoff2.c", "sfnt/ttcolr.c", "sfnt/woff2tags.c", "sfnt/ttcpal.c", "gzip/ftgzip.c", "lzw/ftlzw.c"] libCommon_src_path = "../../../common/" -input_common_sources = ["File.cpp", "Directory.cpp", "ByteBuilder.cpp", "Base64.cpp"] +input_common_sources = ["File.cpp", "Directory.cpp", "ByteBuilder.cpp", "Base64.cpp", "StringExt.cpp"] libUnicodeConverter_src_path = "../../../../UnicodeConverter/" input_unicodeconverter_sources = ["UnicodeConverter.cpp"] @@ -76,19 +76,22 @@ libIcu_src_path = "../../../../Common/3dParty/icu/icu/source/common/" input_icu_sources = ["ucnv.c", "ustr_wcs.cpp", "ucnv_err.c", "ucnv_bld.cpp", "ustrtrns.cpp", "ucnv_cb.c", "udata.cpp", "ucnv_io.cpp", "uhash.c", "udatamem.c", "cmemory.c", "ustring.cpp", "umutex.cpp", "putil.cpp", "ustr_cnv.cpp", "ucnvmbcs.cpp", "ucnvlat1.c", "ucnv_u16.c", "ucnv_u8.c", "ucnv_u32.c", "ucnv_u7.c", "ucln_cmn.cpp", "ucnv2022.cpp", "ucnv_lmb.c", "ucnvhz.c", "ucnvscsu.c", "ucnvisci.c", "ucnvbocu.cpp", "ucnv_ct.c", "ucnv_cnv.c", "stringpiece.cpp", "charstr.cpp", "umapfile.c", "ucmndata.c", "ucnv_ext.cpp", "uobject.cpp", "umath.c"] libXps_src_path = "../../../../XpsFile/XpsLib/" -input_xps_sources = ["Document.cpp", "Page.cpp", "StaticResources.cpp", "Utils.cpp"] +input_xps_sources = ["Document.cpp", "Page.cpp", "StaticResources.cpp", "Utils.cpp", "WString.cpp", "ContextState.cpp"] -libOfficeUtils_src_parh = "../../../../OfficeUtils/src/" -input_officeutils_sources = ["OfficeUtils.cpp", "ZipBuffer.cpp"] +libOfficeUtils_src_path = "../../../../OfficeUtils/src/" +input_officeutils_sources = ["OfficeUtils.cpp", "ZipBuffer.cpp", "ZipUtilsCP.cpp"] -libMinizip_src_parh = "../../../../OfficeUtils/src/zlib-1.2.11/contrib/minizip/" +libMinizip_src_path = "../../../../OfficeUtils/src/zlib-1.2.11/contrib/minizip/" input_minizip_sources = ["ioapi.c", "miniunz.c", "minizip.c", "mztools.c", "unzip.c", "zip.c", "ioapibuf.c"] -libZlib_src_parh = "../../../../OfficeUtils/src/zlib-1.2.11/" +libZlib_src_path = "../../../../OfficeUtils/src/zlib-1.2.11/" input_zlib_sources = ["adler32.c", "crc32.c", "deflate.c", "infback.c", "inffast.c", "inflate.c", "inftrees.c", "trees.c", "zutil.c", "compress.c"] input_xml_sources = ["xml/src/xmllight.cpp", "xml/src/xmldom.cpp", "xml/build/qt/libxml2_all.c", "xml/build/qt/libxml2_all2.c"] +libPdf_src_path = "../../../../PdfWriter/" +input_pdf_sources = ["PdfRenderer.cpp"] + # sources sources = [] for item in input_graphics_sources: @@ -106,11 +109,13 @@ for item in input_unicodeconverter_sources: sources.append("../../../../XpsFile/XpsFile.cpp") # xps for item in input_officeutils_sources: - sources.append(libOfficeUtils_src_parh + item) + sources.append(libOfficeUtils_src_path + item) # minizip # zlib for item in input_xml_sources: sources.append(item) +for item in input_pdf_sources: + sources.append(libPdf_src_path + item) sources.append("raster.o") sources.append("wasm/src/graphics.cpp") @@ -142,11 +147,11 @@ if base.host_platform() == "windows": libs += ("temp/" + item + ".o ") for item in input_minizip_sources: - windows_bat.append("call emcc -o temp/" + item + ".o -c " + arguments + libMinizip_src_parh + item) + windows_bat.append("call emcc -o temp/" + item + ".o -c " + arguments + libMinizip_src_path + item) libs += ("temp/" + item + ".o ") for item in input_zlib_sources: - windows_bat.append("call emcc -o temp/" + item + ".o -c " + arguments + libZlib_src_parh + item) + windows_bat.append("call emcc -o temp/" + item + ".o -c " + arguments + libZlib_src_path + item) libs += ("temp/" + item + ".o ") arguments += "-s EXPORTED_FUNCTIONS=\"[" @@ -177,11 +182,11 @@ else: libs += ("temp/" + item + ".o ") for item in input_minizip_sources: - windows_bat.append("emcc -o temp/" + item + ".o -c " + arguments + libMinizip_src_parh + item) + windows_bat.append("emcc -o temp/" + item + ".o -c " + arguments + libMinizip_src_path + item) libs += ("temp/" + item + ".o ") for item in input_zlib_sources: - windows_bat.append("emcc -o temp/" + item + ".o -c " + arguments + libZlib_src_parh + item) + windows_bat.append("emcc -o temp/" + item + ".o -c " + arguments + libZlib_src_path + item) libs += ("temp/" + item + ".o ") arguments += "-s EXPORTED_FUNCTIONS=\"[" diff --git a/DesktopEditor/graphics/pro/js/qt/nativegraphics.pro b/DesktopEditor/graphics/pro/js/qt/nativegraphics.pro index fab537974d..f9aaea840d 100644 --- a/DesktopEditor/graphics/pro/js/qt/nativegraphics.pro +++ b/DesktopEditor/graphics/pro/js/qt/nativegraphics.pro @@ -7,14 +7,17 @@ TEMPLATE = app CONFIG += console CONFIG -= app_bundle -DEFINES += TEST_AS_EXECUTABLE +DEFINES += TEST_AS_EXECUTABLE \ + GRAPHICS_NO_USE_DYNAMIC_LIBRARY \ + BUILDING_WASM_MODULE CORE_ROOT_DIR = $$PWD/../../../../.. PWD_ROOT_DIR = $$PWD include($$CORE_ROOT_DIR/Common/base.pri) include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri) +include(../../freetype.pri) -ADD_DEPENDENCY(kernel, graphics, UnicodeConverter, Raster, XpsFile) +ADD_DEPENDENCY(UnicodeConverter, kernel, PdfWriter) INCLUDEPATH += \ $$CORE_ROOT_DIR/DesktopEditor/agg-2.4/include \ @@ -24,13 +27,447 @@ INCLUDEPATH += \ $$CORE_ROOT_DIR/DesktopEditor/freetype-2.10.4/include \ $$CORE_ROOT_DIR/DesktopEditor/freetype-2.10.4/include/freetype +DEFINES += \ + _QT + win32 { +DEFINES += \ + JAS_WIN_MSVC_BUILD \ + NOMINMAX + +DEFINES -= UNICODE +DEFINES -= _UNICODE + LIBS += -lgdi32 \ -ladvapi32 \ -luser32 \ -lshell32 } -HEADERS += ../wasm/src/graphics.h +HEADERS += ../wasm/src/wasmgraphics.h -SOURCES += ../wasm/src/graphics.cpp +SOURCES += ../wasm/src/wasmgraphics.cpp + +# XpsFile + +XPS_ROOT_DIR = $$PWD/../../../../../XpsFile +HEADERS += \ + $$XPS_ROOT_DIR/XpsFile.h \ + $$XPS_ROOT_DIR/XpsLib/ContextState.h \ + $$XPS_ROOT_DIR/XpsLib/Document.h \ + $$XPS_ROOT_DIR/XpsLib/FontList.h \ + $$XPS_ROOT_DIR/XpsLib/Page.h \ + $$XPS_ROOT_DIR/XpsLib/StaticResources.h \ + $$XPS_ROOT_DIR/XpsLib/Utils.h \ + $$XPS_ROOT_DIR/XpsLib/WString.h + +SOURCES += \ + $$XPS_ROOT_DIR/XpsFile.cpp \ + $$XPS_ROOT_DIR/XpsLib/ContextState.cpp \ + $$XPS_ROOT_DIR/XpsLib/Document.cpp \ + $$XPS_ROOT_DIR/XpsLib/Page.cpp \ + $$XPS_ROOT_DIR/XpsLib/StaticResources.cpp \ + $$XPS_ROOT_DIR/XpsLib/Utils.cpp \ + $$XPS_ROOT_DIR/XpsLib/WString.cpp + +# graphics + +HEADERS += \ + ../../../config.h \ + \ + ../../../Matrix.h \ + ../../../Matrix_private.h \ + ../../../GraphicsPath.h \ + ../../../GraphicsPath_private.h \ + \ + ../../../../raster/BgraFrame.h \ + ../../../../raster/ImageFileFormatChecker.h \ + ../../../../raster/Metafile/Metafile.h \ + \ + ../../../ArrowHead.h \ + ../../../Brush.h \ + ../../../Clip.h \ + ../../../Color.h \ + ../../../Defines.h \ + ../../../Graphics.h \ + ../../../Image.h \ + ../../../ImageFilesCache.h \ + ../../../MetafileToRenderer.h \ + ../../../MetafileToRendererCheck.h \ + ../../../MetafileToGraphicsRenderer.h \ + ../../../structures.h \ + ../../../Graphics.h \ + ../../../GraphicsRenderer.h \ + \ + ../../../../fontengine/ApplicationFonts.h \ + ../../../../fontengine/FontFile.h \ + ../../../../fontengine/FontPath.h \ + ../../../../fontengine/GlyphString.h \ + ../../../../fontengine/FontManager.h \ + ../../../../fontengine/FontConverter.h \ + \ + ../../Fonts.h \ + ../../Graphics.h \ + ../../Image.h \ + ../../../../raster/Metafile/svg/SVGFramework.h \ + ../../../../raster/Metafile/svg/SVGTransformer.h + +SOURCES += \ + ../../../Matrix.cpp \ + ../../../GraphicsPath.cpp \ + ../../../../raster/BgraFrame.cpp \ + ../../../../raster/ImageFileFormatChecker.cpp \ + ../../../../raster/Metafile/MetaFile.cpp \ + \ + ../../../ArrowHead.cpp \ + ../../../Brush.cpp \ + ../../../Clip.cpp \ + ../../../Graphics.cpp \ + ../../../GraphicsRenderer.cpp \ + ../../../Image.cpp \ + ../../../MetafileToRenderer.cpp \ + ../../../MetafileToGraphicsRenderer.cpp \ + \ + ../../../../fontengine/ApplicationFonts.cpp \ + ../../../../fontengine/FontFile.cpp \ + ../../../../fontengine/FontManager.cpp \ + ../../../../fontengine/FontPath.cpp \ + ../../../../fontengine/GlyphString.cpp \ + \ + ../../pro_Fonts.cpp \ + ../../pro_Image.cpp \ + ../../pro_Graphics.cpp \ + ../../../../raster/Metafile/svg/SVGFramework.cpp \ + ../../../../raster/Metafile/svg/SVGTransformer.cpp + +SOURCES += \ + ../../../../agg-2.4/src/agg_arc.cpp \ + ../../../../agg-2.4/src/agg_bezier_arc.cpp \ + ../../../../agg-2.4/src/agg_arrowhead.cpp \ + ../../../../agg-2.4/src/ctrl/agg_cbox_ctrl.cpp \ + ../../../../agg-2.4/src/agg_curves.cpp \ + ../../../../agg-2.4/src/agg_gsv_text.cpp \ + ../../../../agg-2.4/src/agg_image_filters.cpp \ + ../../../../agg-2.4/src/agg_line_aa_basics.cpp \ + ../../../../agg-2.4/src/agg_line_profile_aa.cpp \ + ../../../../agg-2.4/src/agg_rounded_rect.cpp \ + ../../../../agg-2.4/src/agg_sqrt_tables.cpp \ + ../../../../agg-2.4/src/agg_trans_affine.cpp \ + ../../../../agg-2.4/src/agg_bspline.cpp \ + ../../../../agg-2.4/src/agg_vcgen_bspline.cpp \ + ../../../../agg-2.4/src/agg_vcgen_contour.cpp \ + ../../../../agg-2.4/src/agg_vcgen_dash.cpp \ + ../../../../agg-2.4/src/agg_vcgen_markers_term.cpp \ + ../../../../agg-2.4/src/agg_vcgen_smooth_poly1.cpp \ + ../../../../agg-2.4/src/agg_vcgen_stroke.cpp \ +\ + ../../../../fontengine/fontconverter/StringExt.cpp \ + ../../../../fontengine/fontconverter/Hash.cpp \ + ../../../../fontengine/fontconverter/FontConverter.cpp \ + ../../../../fontengine/fontconverter/FontFileEncodings.cpp \ + ../../../../fontengine/fontconverter/FontFileTrueType.cpp \ + ../../../../fontengine/fontconverter/FontFileType1.cpp \ + ../../../../fontengine/fontconverter/FontFileType1C.cpp \ +\ + ../../../../raster/Jp2/J2kFile.cpp \ + ../../../../raster/Jp2/Reader.cpp \ +\ + ../../../../raster/Metafile/Common/MetaFileTypes.cpp \ + ../../../../raster/Metafile/Common/MetaFileUtils.cpp \ + ../../../../raster/Metafile/Emf/EmfClip.cpp \ + ../../../../raster/Metafile/Emf/EmfObjects.cpp \ + ../../../../raster/Metafile/Emf/EmfPath.cpp \ + ../../../../raster/Metafile/Emf/EmfPlayer.cpp \ + ../../../../raster/Metafile/Emf/EmfFile.cpp \ + ../../../../raster/Metafile/Wmf/WmfClip.cpp \ + ../../../../raster/Metafile/Wmf/WmfObjects.cpp \ + ../../../../raster/Metafile/Wmf/WmfPlayer.cpp \ +\ + ../../../../raster/JBig2/source/JBig2File.cpp \ +\ + ../../../../raster/Metafile/StarView/SvmClip.cpp \ + ../../../../raster/Metafile/StarView/SvmFile.cpp \ + ../../../../raster/Metafile/StarView/SvmObjects.cpp \ + ../../../../raster/Metafile/StarView/SvmPlayer.cpp + +LIB_GRAPHICS_PRI_PATH = $$PWD/../../../.. + +SOURCES += \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_cm.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_debug.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_getopt.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_icc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_iccdata.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_image.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_init.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_malloc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_stream.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_seq.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_string.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_tvp.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_version.c \ + \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_cod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_dec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_enc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_cod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_dec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_enc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_bs.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_cs.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_dec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_enc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_math.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mct.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqcod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqdec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqenc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_qmfb.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1cod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1dec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1enc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2cod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2dec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2enc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_tagtree.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_tsfb.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_util.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpg/jpg_dummy.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpg/jpg_val.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/mif/mif_cod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pgx/pgx_cod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pgx/pgx_dec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pgx/pgx_enc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_cod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_dec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_enc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/ras/ras_cod.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/ras/ras_dec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/ras/ras_enc.c \ + \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jbig/jbig.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jbig/jbig_tab.c \ + \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrtarga.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrrle.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrppm.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrjpgcom.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrgif.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrbmp.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/transupp.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdtarga.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdswitch.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdrle.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdppm.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdjpgcom.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdgif.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdcolmap.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdbmp.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jutils.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jpegtran.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jquant1.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jquant2.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdpostct.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdsample.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdtrans.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jerror.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctflt.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctfst.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctint.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctflt.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctfst.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctint.c \ + #$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemansi.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemmgr.c \ + #$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemname.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemnobs.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jaricom.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcapimin.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcapistd.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcarith.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jccoefct.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jccolor.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcdctmgr.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jchuff.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcinit.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmainct.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmarker.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmaster.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcomapi.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcparam.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcprepct.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcsample.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jctrans.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdapimin.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdapistd.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdarith.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdatadst.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdatasrc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdcoefct.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdcolor.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jddctmgr.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdhuff.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdinput.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmainct.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmarker.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmaster.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmerge.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/cdjpeg.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/cjpeg.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/ckconfig.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/djpeg.c + +SOURCES += $$LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project/libpsd_pri.c +SOURCES += $$LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project/libpsd_pri2.c +SOURCES += $$LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project/libpsd_pri3.c + +SOURCES += \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_callback_xs.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_descr.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_io.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_prc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_xs.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_cms.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_display.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_dither.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_error.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_filter.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_hlapi.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_jpeg.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_object_prc.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_pixels.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_prop_xs.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_read.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_trace.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_write.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_zlib.c \ + \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/png.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngerror.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngget.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngmem.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngpread.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngread.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrio.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrtran.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrutil.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngset.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngtrans.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwio.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwrite.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwtran.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwutil.c \ + \ + $$LIB_GRAPHICS_PRI_PATH/cximage/raw/libdcr.c \ + \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_stream.cxx \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_aux.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_close.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_codec.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_color.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_compress.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dir.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirinfo.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirread.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirwrite.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dumpmode.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_error.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_extension.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_fax3.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_fax3sm.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_flush.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_getimage.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_jbig.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_jpeg.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_luv.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_lzw.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_next.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_ojpeg.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_open.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_packbits.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_pixarlog.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_predict.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_print.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_read.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_strip.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_swab.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_thunder.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_tile.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_unix.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_version.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_warning.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_write.c \ + $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_zip.c \ + \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/tif_xfile.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximabmp.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximadsp.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaenc.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaexif.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximage.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximagif.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximahist.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaico.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximainfo.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaint.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximajas.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximajbg.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximajpg.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximalpha.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximalyr.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximamng.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapal.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapcx.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapng.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapsd.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaraw.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximasel.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaska.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatga.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximath.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatif.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatran.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximawbmp.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximawmf.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximawnd.cpp \ + $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/xmemfile.cpp + +SOURCES += \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2arith.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2enc.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2sym.cpp + +SOURCES += $$LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project/lepton_lib_all.cpp + +SOURCES += \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/boxbasic.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ccbord.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/dwacomb.2.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/dwacomblow.2.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fhmtgen.1.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fliphmtgen.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fmorphauto.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fmorphgen.1.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/numabasic.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pix5.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixabasic.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixafunc1.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixcomp.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ptabasic.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ptra.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ropiplow.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/roplow.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/rotateam.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/rotateshear.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sarray.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sel1.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sel2.cpp \ + $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/skew.cpp + +HEADERS += \ + ../../../../fontengine/ApplicationFontsWorker.h \ + ../../../../fontengine/FontsAssistant.h + +SOURCES += \ + ../../../../fontengine/ApplicationFontsWorker.cpp \ + ../../../../fontengine/FontsAssistant.cpp diff --git a/DesktopEditor/graphics/pro/js/raster_make.py b/DesktopEditor/graphics/pro/js/raster_make.py index ea99ca1de3..3a681ac89e 100644 --- a/DesktopEditor/graphics/pro/js/raster_make.py +++ b/DesktopEditor/graphics/pro/js/raster_make.py @@ -110,7 +110,7 @@ libRaw_src_path = "../../../cximage/raw" input_raw_sources = ["libdcr.c"] libJBig2_src_path = "../../../raster/JBig2/source" -input_jbig2_sources = ["JBig2File.cpp", "Encoder/jbig2enc.cpp", "Encoder/jbig2arith.cpp", "Encoder/jbig2sym.cpp", "LeptonLib/pixconv.cpp", "LeptonLib/writefile.cpp", "LeptonLib/scale.cpp", "LeptonLib/pix1.cpp", "LeptonLib/pix2.cpp", "LeptonLib/pix3.cpp", "LeptonLib/pix5.cpp", "LeptonLib/grayquant.cpp", "LeptonLib/grayquantlow.cpp", "LeptonLib/seedfill.cpp", "LeptonLib/jbclass.cpp", "LeptonLib/pixabasic.cpp", "LeptonLib/numabasic.cpp", "LeptonLib/morphseq.cpp", "LeptonLib/binexpandlow.cpp", "LeptonLib/ptabasic.cpp", "LeptonLib/rop.cpp", "LeptonLib/colormap.cpp", "LeptonLib/pngiostub.cpp", "LeptonLib/lepton_utils.cpp", "LeptonLib/scalelow.cpp", "LeptonLib/enhance.cpp", "LeptonLib/jpegio.cpp", "LeptonLib/jpegiostub.cpp", "LeptonLib/spixio.cpp", "LeptonLib/webpio.cpp", "LeptonLib/webpiostub.cpp", "LeptonLib/psio2.cpp", "LeptonLib/gifio.cpp", "LeptonLib/gifiostub.cpp", "LeptonLib/pnmio.cpp", "LeptonLib/tiffio.cpp", "LeptonLib/tiffiostub.cpp", "LeptonLib/bmpio.cpp", "LeptonLib/binexpand.cpp", "LeptonLib/compare.cpp", "LeptonLib/boxbasic.cpp", "LeptonLib/conncomp.cpp", "LeptonLib/pixafunc1.cpp", "LeptonLib/boxfunc1.cpp", "LeptonLib/ptafunc1.cpp", "LeptonLib/binreduce.cpp", "LeptonLib/seedfilllow.cpp", "LeptonLib/sel1.cpp", "LeptonLib/morphapp.cpp", "LeptonLib/correlscore.cpp", "LeptonLib/sarray.cpp", "LeptonLib/morph.cpp"] +input_jbig2_sources = ["JBig2File.cpp", "Encoder/jbig2enc.cpp", "Encoder/jbig2arith.cpp", "Encoder/jbig2sym.cpp", "LeptonLib/pixconv.cpp", "LeptonLib/writefile.cpp", "LeptonLib/scale.cpp", "LeptonLib/pix1.cpp", "LeptonLib/pix2.cpp", "LeptonLib/pix3.cpp", "LeptonLib/pix4.cpp", "LeptonLib/pix5.cpp", "LeptonLib/grayquant.cpp", "LeptonLib/grayquantlow.cpp", "LeptonLib/seedfill.cpp", "LeptonLib/jbclass.cpp", "LeptonLib/pixabasic.cpp", "LeptonLib/numabasic.cpp", "LeptonLib/morphseq.cpp", "LeptonLib/binexpandlow.cpp", "LeptonLib/ptabasic.cpp", "LeptonLib/rop.cpp", "LeptonLib/colormap.cpp", "LeptonLib/pngiostub.cpp", "LeptonLib/lepton_utils.cpp", "LeptonLib/scalelow.cpp", "LeptonLib/enhance.cpp", "LeptonLib/jpegio.cpp", "LeptonLib/jpegiostub.cpp", "LeptonLib/spixio.cpp", "LeptonLib/webpio.cpp", "LeptonLib/webpiostub.cpp", "LeptonLib/psio2.cpp", "LeptonLib/gifio.cpp", "LeptonLib/gifiostub.cpp", "LeptonLib/pnmio.cpp", "LeptonLib/tiffio.cpp", "LeptonLib/tiffiostub.cpp", "LeptonLib/bmpio.cpp", "LeptonLib/binexpand.cpp", "LeptonLib/compare.cpp", "LeptonLib/boxbasic.cpp", "LeptonLib/conncomp.cpp", "LeptonLib/pixafunc1.cpp", "LeptonLib/boxfunc1.cpp", "LeptonLib/ptafunc1.cpp", "LeptonLib/binreduce.cpp", "LeptonLib/seedfilllow.cpp", "LeptonLib/sel1.cpp", "LeptonLib/morphapp.cpp", "LeptonLib/correlscore.cpp", "LeptonLib/sarray.cpp", "LeptonLib/morph.cpp", "LeptonLib/roplow.cpp", "LeptonLib/fpix1.cpp", "LeptonLib/stack.cpp", "LeptonLib/pixacc.cpp", "LeptonLib/pixarith.cpp", "LeptonLib/convolve.cpp", "LeptonLib/binreducelow.cpp", "LeptonLib/convolvelow.cpp", "LeptonLib/arithlow.cpp"] sources = [] for item in input_raster_sources: @@ -128,8 +128,7 @@ for item in input_j2k_sources: # psd for item in input_raw_sources: sources.append(libRaw_src_path + '/' + item) -for item in input_jbig2_sources: - sources.append(libJBig2_src_path + '/' + item) +# jbig2 sources.append("wasm/src/raster.cpp") compiler_flags.append("-I../../../../OfficeUtils/src/zlib-1.2.11") @@ -171,6 +170,10 @@ if base.host_platform() == "windows": windows_bat.append("call emcc -o temp/" + item + ".o -c " + arguments + libMng_src_path + '/' + item) libs += ("temp/" + item + ".o ") + for item in input_jbig2_sources: + windows_bat.append("call emcc -o temp/" + os.path.basename(item) + ".o -c " + arguments + libJBig2_src_path + '/' + item) + libs += ("temp/" + os.path.basename(item) + ".o ") + arguments2 = arguments for item in sources: arguments2 += (item + " ") @@ -217,6 +220,10 @@ else: windows_bat.append("emcc -o temp/" + item + ".o -c " + arguments + libMng_src_path + '/' + item) libs += ("temp/" + item + ".o ") + for item in input_jbig2_sources: + windows_bat.append("call emcc -o temp/" + os.path.basename(item) + ".o -c " + arguments + libJBig2_src_path + '/' + item) + libs += ("temp/" + os.path.basename(item) + ".o ") + arguments2 = arguments for item in sources: arguments2 += (item + " ") diff --git a/DesktopEditor/graphics/pro/js/wasm/js/graphics.js b/DesktopEditor/graphics/pro/js/wasm/js/graphics.js index 15a060fce0..442e09435f 100644 --- a/DesktopEditor/graphics/pro/js/wasm/js/graphics.js +++ b/DesktopEditor/graphics/pro/js/wasm/js/graphics.js @@ -21,6 +21,10 @@ this.engine = Module["_Graphics_Create"](); if (0 === this.engine) return null; + + var fonts = Module["_Fonts_Create"](); + if (0 === fonts) + return null; var imageFileRawDataSize = dataBuffer.byteLength; var imageFileRawData = Module["_Graphics_Malloc"](imageFileRawDataSize); @@ -52,6 +56,7 @@ canvasCtx.putImageData(canvasData, 0, 0); Module["_Graphics_Free"](imageFileRawData); + Module["_Fonts_Destroy"](); this.close(); return canvas; } diff --git a/DesktopEditor/graphics/pro/js/wasm/src/graphics.cpp b/DesktopEditor/graphics/pro/js/wasm/src/wasmgraphics.cpp similarity index 99% rename from DesktopEditor/graphics/pro/js/wasm/src/graphics.cpp rename to DesktopEditor/graphics/pro/js/wasm/src/wasmgraphics.cpp index 29f28c5f4b..083b3f4120 100644 --- a/DesktopEditor/graphics/pro/js/wasm/src/graphics.cpp +++ b/DesktopEditor/graphics/pro/js/wasm/src/wasmgraphics.cpp @@ -4,7 +4,7 @@ #include "../../../../GraphicsRenderer.h" #include "../../../../pro/Graphics.h" #include "../../../../../common/Base64.h" -#include "graphics.h" +#include "wasmgraphics.h" #ifdef _WIN32 #define WASM_EXPORT __declspec(dllexport) @@ -691,7 +691,7 @@ int main() NSFile::CFileBinary oFile; if (!oFile.ReadAllBytes(NSFile::GetProcessDirectory() + L"/test.xps", &pXpsData, nXpsBytesCount)) { - Fonts_Destroy(); + //Fonts_Destroy(); Graphics_Destroy(test); RELEASEARRAYOBJECTS(pXpsData); return 1; @@ -701,6 +701,7 @@ int main() Graphics_Load(test, pXpsData, nXpsBytesCount); int nHeight = Graphics_GetPageHeight(test, 0); int nWidth = Graphics_GetPageWidth(test, 0); + BYTE* res = Graphics_GetPage(test, 0, nWidth, nHeight); for (int i = 0; i < 100; i++) @@ -711,12 +712,14 @@ int main() resFrame->put_Width(nWidth); resFrame->put_Height(nHeight); resFrame->put_Stride(-4 * nWidth); - resFrame->SaveFile(NSFile::GetProcessDirectory() + L"/res.png", _CXIMAGE_FORMAT_PNG); + resFrame->ClearNoAttack(); + //Fonts_Destroy(); Graphics_Destroy(test); RELEASEARRAYOBJECTS(pXpsData); RELEASEARRAYOBJECTS(res); + RELEASEOBJECT(resFrame); return 0; } #endif diff --git a/DesktopEditor/graphics/pro/js/wasm/src/graphics.h b/DesktopEditor/graphics/pro/js/wasm/src/wasmgraphics.h similarity index 97% rename from DesktopEditor/graphics/pro/js/wasm/src/graphics.h rename to DesktopEditor/graphics/pro/js/wasm/src/wasmgraphics.h index acb420f14a..a82e01a4b5 100644 --- a/DesktopEditor/graphics/pro/js/wasm/src/graphics.h +++ b/DesktopEditor/graphics/pro/js/wasm/src/wasmgraphics.h @@ -15,7 +15,6 @@ public: CGraphicsFileDrawing() { pApplicationFonts = NSFonts::NSApplication::Create(); - //pApplicationFonts->Initialize(); pReader = new CXpsFile(pApplicationFonts); } ~CGraphicsFileDrawing()