Skip to content

O
onlyoffice_core
Commit be403aed authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov
Browse files
Options

сделал возможным подключать graphics.pri (конфликты имен, различные промлемы со сборкой) 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64001 954022d7-b5bf-4e40-9824-e11837661b57
parent 71a7d62f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1250 additions and 88 deletions
DesktopEditor/Qt_build/graphics/project/graphics.pri 0 → 100644
View file @ be403aed
This diff is collapsed.
DesktopEditor/Qt_build/graphics/project/graphics.pro
View file @ be403aed
...@@ -10,6 +10,8 @@ TARGET = graphics ...@@ -10,6 +10,8 @@ TARGET = graphics
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG += c++11
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../../SDK/lib
......
DesktopEditor/Qt_build/graphics/project/graphics_pri.cpp 0 → 100644
View file @ be403aed
This diff is collapsed.
DesktopEditor/Qt_build/graphics/project/lepton_lib_all.cpp 0 → 100644
View file @ be403aed
#include "../../../raster/JBig2/source/LeptonLib/adaptmap.cpp"
#include "../../../raster/JBig2/source/LeptonLib/affine.cpp"
#include "../../../raster/JBig2/source/LeptonLib/affinecompose.cpp"
#include "../../../raster/JBig2/source/LeptonLib/arithlow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/arrayaccess.cpp"
#include "../../../raster/JBig2/source/LeptonLib/bardecode.cpp"
#include "../../../raster/JBig2/source/LeptonLib/baseline.cpp"
#include "../../../raster/JBig2/source/LeptonLib/bbuffer.cpp"
#include "../../../raster/JBig2/source/LeptonLib/bilinear.cpp"
#include "../../../raster/JBig2/source/LeptonLib/binarize.cpp"
#include "../../../raster/JBig2/source/LeptonLib/binexpand.cpp"
#include "../../../raster/JBig2/source/LeptonLib/binexpandlow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/binreduce.cpp"
#include "../../../raster/JBig2/source/LeptonLib/binreducelow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/bmf.cpp"
#include "../../../raster/JBig2/source/LeptonLib/bmpio.cpp"
#include "../../../raster/JBig2/source/LeptonLib/bmpiostub.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/boxbasic.cpp"
#include "../../../raster/JBig2/source/LeptonLib/boxfunc1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/boxfunc2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/boxfunc3.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/ccbord.cpp"
#include "../../../raster/JBig2/source/LeptonLib/ccthin.cpp"
#include "../../../raster/JBig2/source/LeptonLib/classapp.cpp"
#include "../../../raster/JBig2/source/LeptonLib/colorcontent.cpp"
#include "../../../raster/JBig2/source/LeptonLib/colormap.cpp"
#include "../../../raster/JBig2/source/LeptonLib/colormorph.cpp"
#include "../../../raster/JBig2/source/LeptonLib/colorquant1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/colorquant2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/colorseg.cpp"
#include "../../../raster/JBig2/source/LeptonLib/compare.cpp"
#include "../../../raster/JBig2/source/LeptonLib/conncomp.cpp"
#include "../../../raster/JBig2/source/LeptonLib/convertfiles.cpp"
#include "../../../raster/JBig2/source/LeptonLib/convolve.cpp"
#include "../../../raster/JBig2/source/LeptonLib/convolvelow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/correlscore.cpp"
#include "../../../raster/JBig2/source/LeptonLib/dewarp.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/dwacomb.2.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/dwacomblow.2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/edge.cpp"
#include "../../../raster/JBig2/source/LeptonLib/enhance.cpp"
#include "../../../raster/JBig2/source/LeptonLib/fhmtauto.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/fhmtgen.1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/fhmtgenlow.1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/finditalic.cpp"
#include "../../../raster/JBig2/source/LeptonLib/flipdetect.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/fliphmtgen.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/fmorphauto.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/fmorphgen.1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/fmorphgenlow.1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/fpix1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/fpix2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/freetype.cpp"
#include "../../../raster/JBig2/source/LeptonLib/gifio.cpp"
#include "../../../raster/JBig2/source/LeptonLib/gifiostub.cpp"
#include "../../../raster/JBig2/source/LeptonLib/gplot.cpp"
#include "../../../raster/JBig2/source/LeptonLib/graphics1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/graymorph.cpp"
#include "../../../raster/JBig2/source/LeptonLib/graymorphlow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/grayquant.cpp"
#include "../../../raster/JBig2/source/LeptonLib/grayquantlow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/heap.cpp"
#include "../../../raster/JBig2/source/LeptonLib/jbclass.cpp"
#include "../../../raster/JBig2/source/LeptonLib/jpegio.cpp"
#include "../../../raster/JBig2/source/LeptonLib/jpegiostub.cpp"
#include "../../../raster/JBig2/source/LeptonLib/kernel.cpp"
#include "../../../raster/JBig2/source/LeptonLib/list.cpp"
#include "../../../raster/JBig2/source/LeptonLib/maze.cpp"
#include "../../../raster/JBig2/source/LeptonLib/morph.cpp"
#include "../../../raster/JBig2/source/LeptonLib/morphapp.cpp"
#include "../../../raster/JBig2/source/LeptonLib/morphdwa.cpp"
#include "../../../raster/JBig2/source/LeptonLib/morphseq.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/numabasic.cpp"
#include "../../../raster/JBig2/source/LeptonLib/numafunc1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/numafunc2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pageseg.cpp"
#include "../../../raster/JBig2/source/LeptonLib/paintcmap.cpp"
#include "../../../raster/JBig2/source/LeptonLib/parseprotos.cpp"
#include "../../../raster/JBig2/source/LeptonLib/partition.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pix1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pix2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pix3.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pix4.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/pix5.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/pixabasic.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pixacc.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/pixafunc1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pixafunc2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pixalloc.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pixarith.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/pixcomp.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pixconv.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pixtiling.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pngio.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pngiostub.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pnmio.cpp"
#include "../../../raster/JBig2/source/LeptonLib/pnmiostub.cpp"
#include "../../../raster/JBig2/source/LeptonLib/projective.cpp"
#include "../../../raster/JBig2/source/LeptonLib/psio1.cpp"
#include "../../../raster/JBig2/source/LeptonLib/psio1stub.cpp"
#include "../../../raster/JBig2/source/LeptonLib/psio2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/psio2stub.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/ptabasic.cpp"
#include "../../../raster/JBig2/source/LeptonLib/ptafunc1.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/ptra.cpp"
#include "../../../raster/JBig2/source/LeptonLib/queue.cpp"
#include "../../../raster/JBig2/source/LeptonLib/rank.cpp"
#include "../../../raster/JBig2/source/LeptonLib/readbarcode.cpp"
#include "../../../raster/JBig2/source/LeptonLib/readfile.cpp"
#include "../../../raster/JBig2/source/LeptonLib/regutils.cpp"
#include "../../../raster/JBig2/source/LeptonLib/rop.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/ropiplow.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/roplow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/rotate.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/rotateam.cpp"
#include "../../../raster/JBig2/source/LeptonLib/rotateamlow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/rotateorth.cpp"
#include "../../../raster/JBig2/source/LeptonLib/rotateorthlow.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/rotateshear.cpp"
#include "../../../raster/JBig2/source/LeptonLib/runlength.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/sarray.cpp"
#include "../../../raster/JBig2/source/LeptonLib/scale.cpp"
#include "../../../raster/JBig2/source/LeptonLib/scalelow.cpp"
#include "../../../raster/JBig2/source/LeptonLib/seedfill.cpp"
#include "../../../raster/JBig2/source/LeptonLib/seedfilllow.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/sel1.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/sel2.cpp"
#include "../../../raster/JBig2/source/LeptonLib/selgen.cpp"
#include "../../../raster/JBig2/source/LeptonLib/shear.cpp"
//#include "../../../raster/JBig2/source/LeptonLib/skew.cpp"
#include "../../../raster/JBig2/source/LeptonLib/spixio.cpp"
#include "../../../raster/JBig2/source/LeptonLib/stack.cpp"
#include "../../../raster/JBig2/source/LeptonLib/sudoku.cpp"
#include "../../../raster/JBig2/source/LeptonLib/textops.cpp"
#include "../../../raster/JBig2/source/LeptonLib/tiffio.cpp"
#include "../../../raster/JBig2/source/LeptonLib/tiffiostub.cpp"
#include "../../../raster/JBig2/source/LeptonLib/utils.cpp"
#include "../../../raster/JBig2/source/LeptonLib/viewfiles.cpp"
#include "../../../raster/JBig2/source/LeptonLib/warper.cpp"
#include "../../../raster/JBig2/source/LeptonLib/watershed.cpp"
#include "../../../raster/JBig2/source/LeptonLib/webpio.cpp"
#include "../../../raster/JBig2/source/LeptonLib/webpiostub.cpp"
#include "../../../raster/JBig2/source/LeptonLib/writefile.cpp"
#include "../../../raster/JBig2/source/LeptonLib/zlibmem.cpp"
#include "../../../raster/JBig2/source/LeptonLib/zlibmemstub.cpp"
#include "../../../raster/JBig2/source/LeptonLib/blend1.cpp"
DesktopEditor/Qt_build/graphics/project/libpsd_pri.c 0 → 100644
View file @ be403aed
#include "../../../cximage/libpsd/adjustment.c"
#include "../../../cximage/libpsd/bevel_emboss.c"
#include "../../../cximage/libpsd/bitmap.c"
#include "../../../cximage/libpsd/blend.c"
#include "../../../cximage/libpsd/boundary.c"
#include "../../../cximage/libpsd/brightness_contrast.c"
#include "../../../cximage/libpsd/channel_image.c"
#include "../../../cximage/libpsd/channel_mixer.c"
#include "../../../cximage/libpsd/color_balance.c"
#include "../../../cximage/libpsd/color_mode.c"
#include "../../../cximage/libpsd/color_overlay.c"
#include "../../../cximage/libpsd/color.c"
#include "../../../cximage/libpsd/curves.c"
#include "../../../cximage/libpsd/drop_shadow.c"
#include "../../../cximage/libpsd/effects.c"
#include "../../../cximage/libpsd/file_header.c"
#include "../../../cximage/libpsd/fixed.c"
#include "../../../cximage/libpsd/gaussian_blur.c"
#include "../../../cximage/libpsd/gradient_blend.c"
#include "../../../cximage/libpsd/gradient_fill.c"
#include "../../../cximage/libpsd/gradient_map.c"
#include "../../../cximage/libpsd/gradient_overlay.c"
#include "../../../cximage/libpsd/hue_saturation.c"
DesktopEditor/Qt_build/graphics/project/libpsd_pri2.c 0 → 100644
View file @ be403aed
#include "../../../cximage/libpsd/descriptor.c"
#include "../../../cximage/libpsd/image_data.c"
#include "../../../cximage/libpsd/image_resource.c"
#include "../../../cximage/libpsd/inner_glow.c"
#include "../../../cximage/libpsd/inner_shadow.c"
#include "../../../cximage/libpsd/invert.c"
#include "../../../cximage/libpsd/layer_mask.c"
#include "../../../cximage/libpsd/levels.c"
#include "../../../cximage/libpsd/outer_glow.c"
#include "../../../cximage/libpsd/path.c"
#include "../../../cximage/libpsd/pattern_fill.c"
#include "../../../cximage/libpsd/pattern_overlay.c"
#include "../../../cximage/libpsd/psd_zip.c"
DesktopEditor/Qt_build/graphics/project/libpsd_pri3.c 0 → 100644
View file @ be403aed
#include "../../../cximage/libpsd/pattern.c"
#include "../../../cximage/libpsd/photo_filter.c"
#include "../../../cximage/libpsd/posterize.c"
#include "../../../cximage/libpsd/psd_system.c"
#include "../../../cximage/libpsd/psd.c"
#include "../../../cximage/libpsd/rect.c"
#include "../../../cximage/libpsd/satin.c"
#include "../../../cximage/libpsd/selective_color.c"
#include "../../../cximage/libpsd/solid_color.c"
#include "../../../cximage/libpsd/stream.c"
#include "../../../cximage/libpsd/stroke.c"
#include "../../../cximage/libpsd/threshold.c"
#include "../../../cximage/libpsd/thumbnail.c"
#include "../../../cximage/libpsd/type_tool.c"
DesktopEditor/cximage/CxImage/ximawnd.cpp
View file @ be403aed
// xImaWnd.cpp : Windows functions // xImaWnd.cpp : Windows functions
/* 07/08/2001 v1.00 - Davide Pizzolato - www.xdp.it /* 07/08/2001 v1.00 - Davide Pizzolato - www.xdp.it
* CxImage version 7.0.2 07/Feb/2011 * CxImage version 7.0.2 07/Feb/2011
*/ */
...@@ -8,6 +8,13 @@ ...@@ -8,6 +8,13 @@
#include "ximaiter.h" #include "ximaiter.h"
#include "ximabmp.h" #include "ximabmp.h"
#ifndef min
#define min(a,b) (((a)<(b))?(a):(b))
#endif
#ifndef max
#define max(a,b) (((a)>(b))?(a):(b))
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#if defined (_WIN32_WCE) #if defined (_WIN32_WCE)
...@@ -230,7 +237,7 @@ bool CxImage::CreateFromHANDLE(HANDLE hMem) ...@@ -230,7 +237,7 @@ bool CxImage::CreateFromHANDLE(HANDLE hMem)
SetYDPI((int32_t)floor(head.biYPelsPerMeter * 254.0 / 10000.0 + 0.5)); SetYDPI((int32_t)floor(head.biYPelsPerMeter * 254.0 / 10000.0 + 0.5));
/*//copy the pixels (old way) /*//copy the pixels (old way)
if((pHead->biCompression != BI_RGB) || (pHead->biBitCount == 32)){ //<Jrgen Alfredsson> if((pHead->biCompression != BI_RGB) || (pHead->biBitCount == 32)){ //<Jцrgen Alfredsson>
// BITFIELD case // BITFIELD case
// set the internal header in the dib // set the internal header in the dib
memcpy(pDib,&head,sizeof(head)); memcpy(pDib,&head,sizeof(head));
......
DesktopEditor/cximage/jpeg/cjpeg.c
View file @ be403aed
...@@ -485,7 +485,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, ...@@ -485,7 +485,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
return argn; /* return index of next arg (file name) */ return argn; /* return index of next arg (file name) */
} }
#ifndef _IOS #if 0
/* /*
* The main program. * The main program.
......
DesktopEditor/cximage/jpeg/ckconfig.c
View file @ be403aed
...@@ -281,7 +281,7 @@ int is_shifting_signed (arg) ...@@ -281,7 +281,7 @@ int is_shifting_signed (arg)
return 0; /* try it with unsigned anyway */ return 0; /* try it with unsigned anyway */
} }
#ifndef _IOS #if 0
#ifdef HAVE_PROTOTYPES #ifdef HAVE_PROTOTYPES
int main (int argc, char ** argv) int main (int argc, char ** argv)
......
DesktopEditor/cximage/jpeg/djpeg.c
View file @ be403aed
...@@ -416,7 +416,7 @@ print_text_marker (j_decompress_ptr cinfo) ...@@ -416,7 +416,7 @@ print_text_marker (j_decompress_ptr cinfo)
return TRUE; return TRUE;
} }
#ifndef _IOS #if 0
/* /*
* The main program. * The main program.
......
DesktopEditor/cximage/jpeg/jpegtran.c
View file @ be403aed
...@@ -360,7 +360,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, ...@@ -360,7 +360,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
return argn; /* return index of next arg (file name) */ return argn; /* return index of next arg (file name) */
} }
#ifndef _IOS #if 0
/* /*
* The main program. * The main program.
......
DesktopEditor/cximage/jpeg/rdjpgcom.c
View file @ be403aed
...@@ -449,7 +449,7 @@ keymatch (char * arg, const char * keyword, int minchars) ...@@ -449,7 +449,7 @@ keymatch (char * arg, const char * keyword, int minchars)
/* /*
* The main program. * The main program.
*/ */
#ifndef _IOS #if 0
int int
main (int argc, char **argv) main (int argc, char **argv)
......
DesktopEditor/cximage/jpeg/wrjpgcom.c
View file @ be403aed
...@@ -404,7 +404,7 @@ keymatch (char * arg, const char * keyword, int minchars) ...@@ -404,7 +404,7 @@ keymatch (char * arg, const char * keyword, int minchars)
return 1; /* A-OK */ return 1; /* A-OK */
} }
#ifndef _IOS #if 0
/* /*
* The main program. * The main program.
......
DesktopEditor/graphics/Graphics.cpp
View file @ be403aed
#include "Graphics.h" #include "Graphics.h"
#include <algorithm>
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
namespace Aggplus namespace Aggplus
{ {
...@@ -366,10 +359,10 @@ namespace Aggplus ...@@ -366,10 +359,10 @@ namespace Aggplus
m_oFullTransform.TransformPoint(dx1, dy1); m_oFullTransform.TransformPoint(dx1, dy1);
m_oFullTransform.TransformPoint(dx2, dy2); m_oFullTransform.TransformPoint(dx2, dy2);
m_dClipLeft = max(0, dx1); m_dClipLeft = std::max(0.0, dx1);
m_dClipTop = max(0, dy1); m_dClipTop = std::max(0.0, dy1);
m_dClipWidth = min(dx2, m_dWidthPix - 1) - m_dClipLeft; m_dClipWidth = std::min(dx2, m_dWidthPix - 1) - m_dClipLeft;
m_dClipHeight = min(dy2, m_dHeightPix - 1) - m_dClipTop; m_dClipHeight = std::min(dy2, m_dHeightPix - 1) - m_dClipTop;
m_oClip.Reset(); m_oClip.Reset();
...@@ -377,10 +370,10 @@ namespace Aggplus ...@@ -377,10 +370,10 @@ namespace Aggplus
} }
Status CGraphics::SetClipRect2(double dLeft, double dTop, double dWidth, double dHeight) Status CGraphics::SetClipRect2(double dLeft, double dTop, double dWidth, double dHeight)
{ {
m_dClipLeft = max(0, dLeft); m_dClipLeft = std::max(0.0, dLeft);
m_dClipTop = max(0, dTop); m_dClipTop = std::max(0.0, dTop);
m_dClipWidth = min(dWidth, m_dWidthPix - 1 - m_dClipLeft); m_dClipWidth = std::min(dWidth, m_dWidthPix - 1 - m_dClipLeft);
m_dClipHeight = min(dHeight, m_dHeightPix - 1 - m_dClipTop); m_dClipHeight = std::min(dHeight, m_dHeightPix - 1 - m_dClipTop);
m_rasterizer.get_rasterizer().clip_box(m_dClipLeft, m_dClipTop, m_dClipWidth + m_dClipLeft, m_dClipHeight + m_dClipTop); m_rasterizer.get_rasterizer().clip_box(m_dClipLeft, m_dClipTop, m_dClipWidth + m_dClipLeft, m_dClipHeight + m_dClipTop);
m_oClip.Reset(); m_oClip.Reset();
......
DesktopEditor/graphics/GraphicsPath.cpp
View file @ be403aed
#include "GraphicsPath.h" #include "GraphicsPath.h"
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
namespace Aggplus namespace Aggplus
{ {
// GraphicsPath // GraphicsPath
...@@ -550,8 +542,8 @@ namespace Aggplus ...@@ -550,8 +542,8 @@ namespace Aggplus
// Выясним в каких четвертях находятся начальная и конечная точки // Выясним в каких четвертях находятся начальная и конечная точки
unsigned int nFirstPointQuard = int(fAngle1) / 90 + 1; unsigned int nFirstPointQuard = int(fAngle1) / 90 + 1;
unsigned int nSecondPointQuard = int(fAngle2) / 90 + 1; unsigned int nSecondPointQuard = int(fAngle2) / 90 + 1;
nSecondPointQuard = min( 4, max( 1, nSecondPointQuard ) ); nSecondPointQuard = std::min( 4, std::max( 1, (int)nSecondPointQuard ) );
nFirstPointQuard = min( 4, max( 1, nFirstPointQuard ) ); nFirstPointQuard = std::min( 4, std::max( 1, (int)nFirstPointQuard ) );
// Проведем линию в начальную точку дуги // Проведем линию в начальную точку дуги
double fStartX = 0.0, fStartY = 0.0, fEndX = 0.0, fEndY = 0.0; double fStartX = 0.0, fStartY = 0.0, fEndX = 0.0, fEndY = 0.0;
...@@ -1046,8 +1038,8 @@ namespace Aggplus ...@@ -1046,8 +1038,8 @@ namespace Aggplus
// Выясним в каких четвертях находятся начальная и конечная точки // Выясним в каких четвертях находятся начальная и конечная точки
unsigned int nFirstPointQuard = int(fAngle1) / 90 + 1; unsigned int nFirstPointQuard = int(fAngle1) / 90 + 1;
unsigned int nSecondPointQuard = int(fAngle2) / 90 + 1; unsigned int nSecondPointQuard = int(fAngle2) / 90 + 1;
nSecondPointQuard = min( 4, max( 1, nSecondPointQuard ) ); nSecondPointQuard = std::min( 4, std::max( 1, (int)nSecondPointQuard ) );
nFirstPointQuard = min( 4, max( 1, nFirstPointQuard ) ); nFirstPointQuard = std::min( 4, std::max( 1, (int)nFirstPointQuard ) );
// Проведем линию в начальную точку дуги // Проведем линию в начальную точку дуги
double fStartX = 0.0, fStartY = 0.0, fEndX = 0.0, fEndY = 0.0; double fStartX = 0.0, fStartY = 0.0, fEndX = 0.0, fEndY = 0.0;
......
DesktopEditor/raster/JBig2/source/LeptonLib/bbuffer.cpp
View file @ be403aed
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "allheaders.h" #include "allheaders.h"
static const l_int32 INITIAL_BUFFER_ARRAYSIZE = 1024; /* n'importe quoi */ static const l_int32 INITIAL_BUFFER_ARRAYSIZE_BBUFFER = 1024; /* n'importe quoi */
/*--------------------------------------------------------------------------* /*--------------------------------------------------------------------------*
...@@ -115,7 +115,7 @@ BBUFFER *bb; ...@@ -115,7 +115,7 @@ BBUFFER *bb;
PROCNAME("bbufferCreate"); PROCNAME("bbufferCreate");
if (nalloc <= 0) if (nalloc <= 0)
nalloc = INITIAL_BUFFER_ARRAYSIZE; nalloc = INITIAL_BUFFER_ARRAYSIZE_BBUFFER;
if ((bb = (BBUFFER *)CALLOC(1, sizeof(BBUFFER))) == NULL) if ((bb = (BBUFFER *)CALLOC(1, sizeof(BBUFFER))) == NULL)
return (BBUFFER *)ERROR_PTR("bb not made", procName, NULL); return (BBUFFER *)ERROR_PTR("bb not made", procName, NULL);
......
DesktopEditor/raster/JBig2/source/LeptonLib/heap.cpp
View file @ be403aed
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "allheaders.h" #include "allheaders.h"
static const l_int32 MIN_BUFFER_SIZE = 20; /* n'importe quoi */ static const l_int32 MIN_BUFFER_SIZE_HEAP = 20; /* n'importe quoi */
static const l_int32 INITIAL_BUFFER_ARRAYSIZE = 128; /* n'importe quoi */ //static const l_int32 INITIAL_BUFFER_ARRAYSIZE = 128; /* n'importe quoi */
#define SWAP_ITEMS(i, j) { void *tempitem = lh->array[(i)]; \ #define SWAP_ITEMS(i, j) { void *tempitem = lh->array[(i)]; \
lh->array[(i)] = lh->array[(j)]; \ lh->array[(i)] = lh->array[(j)]; \
...@@ -92,8 +92,8 @@ L_HEAP *lh; ...@@ -92,8 +92,8 @@ L_HEAP *lh;
PROCNAME("lheapCreate"); PROCNAME("lheapCreate");
if (nalloc < MIN_BUFFER_SIZE) if (nalloc < MIN_BUFFER_SIZE_HEAP)
nalloc = MIN_BUFFER_SIZE; nalloc = MIN_BUFFER_SIZE_HEAP;
/* Allocate ptr array and initialize counters. */ /* Allocate ptr array and initialize counters. */
if ((lh = (L_HEAP *)CALLOC(1, sizeof(L_HEAP))) == NULL) if ((lh = (L_HEAP *)CALLOC(1, sizeof(L_HEAP))) == NULL)
......
DesktopEditor/xml/build/qt/libxml2.pri
View file @ be403aed
...@@ -5,52 +5,53 @@ INCLUDEPATH += \ ...@@ -5,52 +5,53 @@ INCLUDEPATH += \
$$LIB_XML_PRI_PATH/libxml2/include/libxml \ $$LIB_XML_PRI_PATH/libxml2/include/libxml \
$$LIB_XML_PRI_PATH/build/qt $$LIB_XML_PRI_PATH/build/qt
SOURCES += $$LIB_XML_PRI_PATH/build/qt/libxml2_all.c
SOURCES += \ SOURCES += $$LIB_XML_PRI_PATH/build/qt/libxml2_all2.c
$$LIB_XML_PRI_PATH/libxml2/buf.c \ #SOURCES += \
$$LIB_XML_PRI_PATH/libxml2/c14n.c \ # $$LIB_XML_PRI_PATH/libxml2/buf.c \
$$LIB_XML_PRI_PATH/libxml2/catalog.c \ # $$LIB_XML_PRI_PATH/libxml2/c14n.c \
$$LIB_XML_PRI_PATH/libxml2/chvalid.c \ # $$LIB_XML_PRI_PATH/libxml2/catalog.c \
$$LIB_XML_PRI_PATH/libxml2/debugXML.c \ # $$LIB_XML_PRI_PATH/libxml2/chvalid.c \
$$LIB_XML_PRI_PATH/libxml2/dict.c \ # $$LIB_XML_PRI_PATH/libxml2/debugXML.c \
$$LIB_XML_PRI_PATH/libxml2/DOCBparser.c \ # $$LIB_XML_PRI_PATH/libxml2/dict.c \
$$LIB_XML_PRI_PATH/libxml2/encoding.c \ # $$LIB_XML_PRI_PATH/libxml2/DOCBparser.c \
$$LIB_XML_PRI_PATH/libxml2/entities.c \ # $$LIB_XML_PRI_PATH/libxml2/encoding.c \
$$LIB_XML_PRI_PATH/libxml2/error.c \ # $$LIB_XML_PRI_PATH/libxml2/entities.c \
$$LIB_XML_PRI_PATH/libxml2/globals.c \ # $$LIB_XML_PRI_PATH/libxml2/error.c \
$$LIB_XML_PRI_PATH/libxml2/HTMLparser.c \ # $$LIB_XML_PRI_PATH/libxml2/globals.c \
$$LIB_XML_PRI_PATH/libxml2/HTMLtree.c \ # $$LIB_XML_PRI_PATH/libxml2/HTMLparser.c \
$$LIB_XML_PRI_PATH/libxml2/legacy.c \ # $$LIB_XML_PRI_PATH/libxml2/HTMLtree.c \
$$LIB_XML_PRI_PATH/libxml2/list.c \ # $$LIB_XML_PRI_PATH/libxml2/legacy.c \
$$LIB_XML_PRI_PATH/libxml2/nanoftp.c \ # $$LIB_XML_PRI_PATH/libxml2/list.c \
$$LIB_XML_PRI_PATH/libxml2/nanohttp.c \ # $$LIB_XML_PRI_PATH/libxml2/nanoftp.c \
$$LIB_XML_PRI_PATH/libxml2/parser.c \ # $$LIB_XML_PRI_PATH/libxml2/nanohttp.c \
$$LIB_XML_PRI_PATH/libxml2/pattern.c \ # $$LIB_XML_PRI_PATH/libxml2/parser.c \
$$LIB_XML_PRI_PATH/libxml2/relaxng.c \ # $$LIB_XML_PRI_PATH/libxml2/pattern.c \
$$LIB_XML_PRI_PATH/libxml2/SAX.c \ # $$LIB_XML_PRI_PATH/libxml2/relaxng.c \
$$LIB_XML_PRI_PATH/libxml2/SAX2.c \ # $$LIB_XML_PRI_PATH/libxml2/SAX.c \
$$LIB_XML_PRI_PATH/libxml2/schematron.c \ # $$LIB_XML_PRI_PATH/libxml2/SAX2.c \
$$LIB_XML_PRI_PATH/libxml2/threads.c \ # $$LIB_XML_PRI_PATH/libxml2/schematron.c \
$$LIB_XML_PRI_PATH/libxml2/tree.c \ # $$LIB_XML_PRI_PATH/libxml2/threads.c \
$$LIB_XML_PRI_PATH/libxml2/uri.c \ # $$LIB_XML_PRI_PATH/libxml2/tree.c \
$$LIB_XML_PRI_PATH/libxml2/valid.c \ # $$LIB_XML_PRI_PATH/libxml2/uri.c \
$$LIB_XML_PRI_PATH/libxml2/xinclude.c \ # $$LIB_XML_PRI_PATH/libxml2/valid.c \
$$LIB_XML_PRI_PATH/libxml2/xlink.c \ # $$LIB_XML_PRI_PATH/libxml2/xinclude.c \
$$LIB_XML_PRI_PATH/libxml2/xmlIO.c \ # $$LIB_XML_PRI_PATH/libxml2/xlink.c \
$$LIB_XML_PRI_PATH/libxml2/xmlmemory.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlIO.c \
$$LIB_XML_PRI_PATH/libxml2/xmlmodule.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlmemory.c \
$$LIB_XML_PRI_PATH/libxml2/xmlreader.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlmodule.c \
$$LIB_XML_PRI_PATH/libxml2/xmlregexp.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlreader.c \
$$LIB_XML_PRI_PATH/libxml2/xmlsave.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlregexp.c \
$$LIB_XML_PRI_PATH/libxml2/xmlschemas.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlsave.c \
$$LIB_XML_PRI_PATH/libxml2/xmlschemastypes.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlschemas.c \
$$LIB_XML_PRI_PATH/libxml2/xmlstring.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlschemastypes.c \
$$LIB_XML_PRI_PATH/libxml2/xmlunicode.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlstring.c \
$$LIB_XML_PRI_PATH/libxml2/xmlwriter.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlunicode.c \
$$LIB_XML_PRI_PATH/libxml2/xpath.c \ # $$LIB_XML_PRI_PATH/libxml2/xmlwriter.c \
$$LIB_XML_PRI_PATH/libxml2/xpointer.c \ # $$LIB_XML_PRI_PATH/libxml2/xpath.c \
$$LIB_XML_PRI_PATH/libxml2/parserInternals.c \ # $$LIB_XML_PRI_PATH/libxml2/xpointer.c \
$$LIB_XML_PRI_PATH/libxml2/hash.c # $$LIB_XML_PRI_PATH/libxml2/parserInternals.c \
# $$LIB_XML_PRI_PATH/libxml2/hash.c
SOURCES += \ SOURCES += \
$$LIB_XML_PRI_PATH/src/xmllight.cpp \ $$LIB_XML_PRI_PATH/src/xmllight.cpp \
......
DesktopEditor/xml/build/qt/libxml2_all.c 0 → 100644
View file @ be403aed
#include "../../libxml2/buf.c"
#include "../../libxml2/c14n.c"
#include "../../libxml2/catalog.c"
#include "../../libxml2/chvalid.c"
#include "../../libxml2/debugXML.c"
#include "../../libxml2/dict.c"
#include "../../libxml2/DOCBparser.c"
#include "../../libxml2/encoding.c"
#include "../../libxml2/entities.c"
#include "../../libxml2/error.c"
#include "../../libxml2/globals.c"
#include "../../libxml2/HTMLparser.c"
#include "../../libxml2/HTMLtree.c"
#include "../../libxml2/legacy.c"
#include "../../libxml2/list.c"
#include "../../libxml2/nanoftp.c"
#include "../../libxml2/nanohttp.c"
//#include "../../libxml2/parser.c"
#include "../../libxml2/pattern.c"
#include "../../libxml2/relaxng.c"
#include "../../libxml2/SAX.c"
#include "../../libxml2/SAX2.c"
#include "../../libxml2/schematron.c"
#include "../../libxml2/threads.c"
#include "../../libxml2/tree.c"
#include "../../libxml2/uri.c"
//#include "../../libxml2/valid.c"
#include "../../libxml2/xinclude.c"
#include "../../libxml2/xlink.c"
#include "../../libxml2/xmlIO.c"
#include "../../libxml2/xmlmemory.c"
#include "../../libxml2/xmlmodule.c"
#include "../../libxml2/xmlreader.c"
#include "../../libxml2/xmlregexp.c"
#include "../../libxml2/xmlsave.c"
#include "../../libxml2/xmlschemas.c"
#include "../../libxml2/xmlschemastypes.c"
#include "../../libxml2/xmlstring.c"
#include "../../libxml2/xmlunicode.c"
#include "../../libxml2/xmlwriter.c"
#include "../../libxml2/xpath.c"
#include "../../libxml2/xpointer.c"
#include "../../libxml2/parserInternals.c"
#include "../../libxml2/hash.c"
DesktopEditor/xml/build/qt/libxml2_all2.c 0 → 100644
View file @ be403aed
#include "../../libxml2/valid.c"
#include "../../libxml2/parser.c"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7