1
0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-07-03 23:47:12 +02:00

Update POCO library.

This commit is contained in:
Sandu Liviu Catalin
2023-03-23 20:19:11 +02:00
parent 8d15f4b6e9
commit 233fc103f9
2521 changed files with 257092 additions and 72789 deletions

View File

@ -40,7 +40,7 @@ public:
/// Sets the position and zoom for destination.
void fit();
/// Sets the appearance of the page to displaying entire page within the window.
/// Sets the appearance of the page to displaying entire page within the window.
void fitHorizontal(float top);
/// Defines the appearance of a page to magnifying to fit the height of the
@ -58,7 +58,7 @@ public:
void fitWindow();
/// Sets the appearance of the page to magnifying to fit the bounding box of
/// the page within the window.
/// the page within the window.
void fitWindowHorizontal(float top);
/// Defines the appearance of a page to magnifying to fit the width of the

View File

@ -74,26 +74,26 @@ public:
enum PageLayout
{
PAGE_LAYOUT_SINGLE = HPDF_PAGE_LAYOUT_SINGLE,
PAGE_LAYOUT_SINGLE = HPDF_PAGE_LAYOUT_SINGLE,
/// Only one page is displayed.
PAGE_LAYOUT_ONE_COLUMN = HPDF_PAGE_LAYOUT_ONE_COLUMN,
/// Display the pages in one column.
PAGE_LAYOUT_TWO_COLUMN_LEFT = HPDF_PAGE_LAYOUT_TWO_COLUMN_LEFT,
/// Display the pages in two column. The page of the odd number is displayed left.
/// Display the pages in two column. The page of the odd number is displayed left.
PAGE_LAYOUT_TWO_COLUMN_RIGHT = HPDF_PAGE_LAYOUT_TWO_COLUMN_RIGHT
/// Display the pages in two column. The page of the odd number is displayed right.
/// Display the pages in two column. The page of the odd number is displayed right.
};
enum PageMode
{
PAGE_MODE_USE_NONE = HPDF_PAGE_MODE_USE_NONE,
/// Display the document with neither outline nor thumbnail.
PAGE_MODE_USE_NONE = HPDF_PAGE_MODE_USE_NONE,
/// Display the document with neither outline nor thumbnail.
PAGE_MODE_USE_OUTLINE = HPDF_PAGE_MODE_USE_OUTLINE,
/// Display the document with outline pain.
PAGE_MODE_USE_THUMBS = HPDF_PAGE_MODE_USE_THUMBS,
///Display the document with thumbnail pain.
PAGE_MODE_FULL_SCREEN = HPDF_PAGE_MODE_FULL_SCREEN
/// Display the document with full screen mode.
/// Display the document with full screen mode.
};
enum Compression
@ -101,13 +101,13 @@ public:
COMPRESSION_NONE = HPDF_COMP_NONE,
/// All contents are not compressed.
COMPRESSION_TEXT = HPDF_COMP_TEXT,
/// Compress the contents stream of the page.
/// Compress the contents stream of the page.
COMPRESSION_IMAGE = HPDF_COMP_IMAGE,
/// Compress the streams of the image objects.
/// Compress the streams of the image objects.
COMPRESSION_METADATA = HPDF_COMP_METADATA,
/// Other stream datas (fonts, cmaps and so on) are compressed.
COMPRESSION_ALL = HPDF_COMP_ALL
/// All stream datas are compressed.
COMPRESSION_ALL = HPDF_COMP_ALL
/// All stream datas are compressed.
/// (Same as HPDF_COMP_TEXT | HPDF_COMP_IMAGE | HPDF_COMP_METADATA)
};
@ -118,7 +118,7 @@ public:
/// The length of key is automatically set to 5(40bit).
ENCRYPT_R3 = HPDF_ENCRYPT_R3
/// Use "Revision 3" algorithm.
/// Between 5(40bit) and 16(128bit) can be specified for length of the key.
/// Between 5(40bit) and 16(128bit) can be specified for length of the key.
};
enum PageNumberStyle
@ -167,11 +167,11 @@ public:
/// the sz argument.
SizeType size();
/// Resets the document stream, reads the document into the stream and
/// Resets the document stream, reads the document into the stream and
/// returns the document data size.
void setPages(std::size_t pagePerPages);
/// Sets the number of pages per page.
/// Sets the number of pages per page.
/// See HARU library HPDF_SetPagesConfiguration API call
/// documentation for detailed explanation.
@ -220,7 +220,7 @@ public:
std::string loadTTFont(const std::string& fileName, bool embed, int index = -1);
/// Loads true type font from file. Returns font name.
/// If the embed parameter is true, the glyph data of the font is embedded,
/// If the embed parameter is true, the glyph data of the font is embedded,
/// otherwise only the matrix data is included in PDF file.
const Image& loadPNGImage(const std::string& fileName);
@ -228,9 +228,9 @@ public:
const Image& loadPNGImageInfo(const std::string& fileName);
/// Loads the specified PNG image information from the file and returns reference to it.
/// Unlike loadPNGImage, this function does not load the whole data immediately.
/// Only size and color properties are loaded. The image data is loaded just before the
/// image object is written to PDF, and the loaded data is deleted immediately.
/// Unlike loadPNGImage, this function does not load the whole data immediately.
/// Only size and color properties are loaded. The image data is loaded just before the
/// image object is written to PDF, and the loaded data is deleted immediately.
const Image& loadJPEGImage(const std::string& fileName);
/// Loads the specified PNG image from the file and returns reference to it.
@ -284,7 +284,7 @@ public:
/// Creates extended graphic state object.
/// Bumps up the version of PDF to 1.4.
/// NOTE:
/// In Acrobat Reader 5.0, when ExtGState object is used combined with HPDF_Page_Concat(),
/// In Acrobat Reader 5.0, when ExtGState object is used combined with HPDF_Page_Concat(),
/// there is a case that cannot be correctly displayed.
const Outline& createOutline(const std::string& title, const Outline& outline, const Encoder& encoder);
@ -292,7 +292,7 @@ public:
void setInfo(Info info, const std::string& value);
/// Sets the document info.
void setInfo(Info info, const LocalDateTime& dt);
/// Sets the document creation or moidification date.

View File

@ -32,7 +32,7 @@ class PDF_API Encoder: public Resource<HPDF_Encoder>
{
public:
enum Type
{
{
ENCODER_TYPE_SINGLE_BYTE = HPDF_ENCODER_TYPE_SINGLE_BYTE,
/// This encoder is an encoder for single byte characters.
ENCODER_TYPE_DOUBLE_BYTE = HPDF_ENCODER_TYPE_DOUBLE_BYTE,
@ -73,10 +73,10 @@ public:
/// Returns the type of an encoding object.
ByteType getByteType(const std::string& text, int index = 0) const;
/// Returns the type of byte in the text at position index
/// Returns the type of byte in the text at position index
WriteMode writeMode();
/// Returns the writing mode for the encoding object.
/// Returns the writing mode for the encoding object.
};
@ -95,7 +95,7 @@ inline Encoder::ByteType Encoder::getByteType(const std::string& text, int index
if (index < 0)
throw InvalidArgumentException("Negative values not allowed.");
return static_cast<ByteType>(HPDF_Encoder_GetByteType(handle(),
return static_cast<ByteType>(HPDF_Encoder_GetByteType(handle(),
text.c_str(),
static_cast<HPDF_UINT>(index)));
}

View File

@ -118,8 +118,8 @@ inline int Font::upperHeight() const
inline TextWidth Font::textWidth(const std::string& text)
{
return HPDF_Font_TextWidth(handle(),
reinterpret_cast<const HPDF_BYTE*>(text.data()),
return HPDF_Font_TextWidth(handle(),
reinterpret_cast<const HPDF_BYTE*>(text.data()),
static_cast<HPDF_UINT>(text.size()));
}

View File

@ -49,21 +49,21 @@ public:
enum Size
{
PAGE_SIZE_LETTER = HPDF_PAGE_SIZE_LETTER,
/// 8<> x 11 (Inches), 612 x 792 px
/// 8<> x 11 (Inches), 612 x 792 px
PAGE_SIZE_LEGAL = HPDF_PAGE_SIZE_LEGAL,
/// 8<> x 14 (Inches), 612 x 1008 px
/// 8<> x 14 (Inches), 612 x 1008 px
PAGE_SIZE_A3 = HPDF_PAGE_SIZE_A3,
/// 297 <20> 420 (mm), 841.89 x 1199.551 px
/// 297 <20> 420 (mm), 841.89 x 1199.551 px
PAGE_SIZE_A4 = HPDF_PAGE_SIZE_A4,
/// 210 <20> 297 (mm), 595.276 x 841.89 px
/// 210 <20> 297 (mm), 595.276 x 841.89 px
PAGE_SIZE_A5 = HPDF_PAGE_SIZE_A5,
/// 148 <20> 210 (mm), 419.528 x 595.276 px
/// 148 <20> 210 (mm), 419.528 x 595.276 px
PAGE_SIZE_B4 = HPDF_PAGE_SIZE_B4,
/// 250 <20> 353 (mm), 708.661 x 1000.63 px
/// 250 <20> 353 (mm), 708.661 x 1000.63 px
PAGE_SIZE_B5 = HPDF_PAGE_SIZE_B5,
/// 176 <20> 250 (mm), 498.898 x 708.661 px
/// 176 <20> 250 (mm), 498.898 x 708.661 px
PAGE_SIZE_EXECUTIVE = HPDF_PAGE_SIZE_EXECUTIVE,
/// 7<> x 10<31> (Inches), 522 x 756 px
/// 7<> x 10<31> (Inches), 522 x 756 px
PAGE_SIZE_US4x6 = HPDF_PAGE_SIZE_US4x6,
/// 4 x 6 (Inches), 288 x 432 px
PAGE_SIZE_US4x8 = HPDF_PAGE_SIZE_US4x8,
@ -165,7 +165,7 @@ public:
bool operator == (const Page& other) const;
/// Equality operator.
void swap(Page& other);
void swap(Page& other) noexcept;
/// Swaps this page with another.
void setWidth(float value);
@ -230,9 +230,9 @@ public:
void writeNextLine(const std::string& text);
/// Moves the current text position to the start of the next line and
/// prints the text at the current position on the page.
void writeNextLineEx(float wordSpace, float charSpace, const std::string& text);
/// Moves the current text position to the start of the next line, sets the word spacing,
/// Moves the current text position to the start of the next line, sets the word spacing,
/// character spacing and prints the text at the current position on the page.
int writeOnceInRectangle(float left,
@ -241,7 +241,7 @@ public:
float bottom,
const std::string& text,
TextAlignment align = TEXT_ALIGN_LEFT);
/// Begins, writes and ends text objectinside the specified region.
/// Begins, writes and ends text objectinside the specified region.
/// Returns the number of characters written.
int writeInRectangle(float left,
@ -250,7 +250,7 @@ public:
float bottom,
const std::string& text,
TextAlignment align);
/// Writes the text inside the specified region.
/// Writes the text inside the specified region.
/// Returns the number of characters written.
void drawImage(Image image, float x, float y, float width, float height);
@ -259,18 +259,18 @@ public:
const Destination& createDestination(const std::string& name);
/// Creates ad returns reference to destination.
const TextAnnotation& createTextAnnotation(const std::string& name,
const TextAnnotation& createTextAnnotation(const std::string& name,
const Rectangle& rect,
const std::string& text,
const Encoder& encoder);
/// Creates ad returns reference to text annotation.
const LinkAnnotation& createLinkAnnotation(const std::string& name,
const LinkAnnotation& createLinkAnnotation(const std::string& name,
const Rectangle& rect,
const Destination& dest);
/// Creates ad returns reference to destination link annotation.
const LinkAnnotation& createURILinkAnnotation(const std::string& name,
const LinkAnnotation& createURILinkAnnotation(const std::string& name,
const Rectangle& rect,
const std::string& uri);
/// Creates ad returns reference to URI annotation.
@ -301,23 +301,23 @@ public:
/// Appends a path from the current point to the specified point..
void curveTo(const std::vector<float>& values);
/// Appends a B<>zier curve to the current path using two specified points.
/// Appends a B<>zier curve to the current path using two specified points.
/// The point (x1, y1) and the point (x2, y2) are used as the control points
/// for a B<>zier curve and current point is moved to the point (x3, y3)
/// for a B<>zier curve and current point is moved to the point (x3, y3)
void curveToRight(float x2, float y2, float x3, float y3);
/// Appends a B<>zier curve to the right of the current point using two specified points.
/// Appends a B<>zier curve to the right of the current point using two specified points.
/// The current point and the point (x2, y2) are used as the control points
/// for a B<>zier curve and current point is moved to the point (x3, y3)
/// for a B<>zier curve and current point is moved to the point (x3, y3)
void curveToLeft(float x2, float y2, float x3, float y3);
/// Appends a B<>zier curve to the left of the current point using two specified points.
/// Appends a B<>zier curve to the left of the current point using two specified points.
/// The current point and the point (x2, y2) are used as the control points
/// for a B<>zier curve and current point is moved to the point (x3, y3)
/// for a B<>zier curve and current point is moved to the point (x3, y3)
void closePath();
/// Appends a straight line from the current point to the start point of sub path.
/// The current point is moved to the start point of sub path.
/// The current point is moved to the start point of sub path.
void rectangle(float x, float y, float width, float height);
/// Draws a rectangle.
@ -350,7 +350,7 @@ public:
/// Fills the current path using the even-odd rule and then paints it.
void closeFillAndStroke();
/// Closes the current path, fills the current path using the nonzero winding number
/// Closes the current path, fills the current path using the nonzero winding number
/// rule and then paints it.
void closeFillAndEOStroke();
@ -373,22 +373,22 @@ public:
void moveTextPos(float x, float y);
/// Moves the current text position to the start of the next line
/// using specified offset values. If the start position of the current
/// using specified offset values. If the start position of the current
/// line is (x1, y1), the start of the next line is (x1 + x, y1 + y).
void moveTextNextLine(float x, float y);
/// Moves the current text position to the start of the next line
/// using specified offset values, and sets the text leading to -y.
/// If the start position of the current line is (x1, y1), the start
/// of the next line is (x1 + x, y1 + y).
/// Moves the current text position to the start of the next line
/// using specified offset values, and sets the text leading to -y.
/// If the start position of the current line is (x1, y1), the start
/// of the next line is (x1 + x, y1 + y).
void moveTextNextLine();
/// Moves the current text position to the start of the next line.
/// If the start position of the current line is (x1, y1), the start of
/// If the start position of the current line is (x1, y1), the start of
/// the next line is (x1, y1 - text leading).
///
/// NOTE:
/// Since the default value of Text Leading is 0, an application has to
/// Since the default value of Text Leading is 0, an application has to
/// invoke HPDF_Page_SetTextLeading() before HPDF_Page_MoveTextPos2() to set
/// text leading.
@ -639,7 +639,7 @@ inline void Page::restoreGraphics()
inline void Page::concatenate(const std::vector<float>& values)
{
if (values.size() < 6)
if (values.size() < 6)
throw InvalidArgumentException("Needs six values");
HPDF_Page_Concat(_page,
@ -666,7 +666,7 @@ inline void Page::lineTo(float x, float y)
inline void Page::curveTo(const std::vector<float>& values)
{
if (values.size() < 6)
if (values.size() < 6)
throw InvalidArgumentException("Needs six values");
HPDF_Page_CurveTo(_page,
@ -786,13 +786,13 @@ inline void Page::moveTextPos(float x, float y)
HPDF_Page_MoveTextPos(_page, x, y);
}
inline void Page::moveTextNextLine(float x, float y)
{
HPDF_Page_MoveTextPos2(_page, x, y);
}
inline void Page::moveTextNextLine()
{
HPDF_Page_MoveToNextLine(_page);
@ -873,7 +873,7 @@ inline DashMode Page::getDashMode() const
inline void Page::setDashMode(const PatternVec& pattern, int paramNo, int phase) const
{
HPDF_Page_SetDash(_page, &pattern[0],
HPDF_Page_SetDash(_page, &pattern[0],
static_cast<HPDF_UINT>(paramNo),
static_cast<HPDF_UINT>(phase));
}

View File

@ -33,7 +33,7 @@ class Resource
public:
typedef R Type;
Resource(HPDF_Doc* pPDF, const R& resource, const std::string& name = ""):
Resource(HPDF_Doc* pPDF, const R& resource, const std::string& name = ""):
_pPDF(pPDF),
_resource(resource),
_name(name)
@ -41,7 +41,7 @@ public:
{
}
Resource(const Resource& other):
Resource(const Resource& other):
_pPDF(other._pPDF),
_resource(other._resource),
_name(other._name)
@ -74,10 +74,10 @@ public:
return _pPDF == other._pPDF && _resource == other._resource;
}
void swap(Resource& other)
void swap(Resource& other) noexcept
{
using std::swap;
swap(_pPDF, other._pPDF);
swap(_resource, other._resource);
swap(_name, other._name);

View File

@ -621,7 +621,7 @@ HPDF_EXPORT(HPDF_STATUS)
HPDF_TextMarkupAnnot_SetQuadPoints ( HPDF_Annotation annot, HPDF_Point lb, HPDF_Point rb, HPDF_Point rt, HPDF_Point lt); /* l-left, r-right, b-bottom, t-top positions */
HPDF_EXPORT(HPDF_STATUS)
HPDF_Annot_Set3DView ( HPDF_MMgr mmgr,
HPDF_Annot_Set3DView ( HPDF_MMgr mmgr,
HPDF_Annotation annot,
HPDF_Annotation annot3d,
HPDF_Dict view);
@ -643,8 +643,8 @@ HPDF_EXPORT(HPDF_STATUS)
HPDF_FreeTextAnnot_SetDefaultStyle (HPDF_Annotation annot, const char* style);
HPDF_EXPORT(HPDF_STATUS)
HPDF_LineAnnot_SetPosition (HPDF_Annotation annot,
HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle,
HPDF_LineAnnot_SetPosition (HPDF_Annotation annot,
HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle,
HPDF_Point endPoint, HPDF_LineAnnotEndingStyle endStyle);
HPDF_EXPORT(HPDF_STATUS)
@ -686,29 +686,29 @@ HPDF_Page_CreatePD33DMeasure(HPDF_Page page,
);
HPDF_EXPORT(HPDF_STATUS)
HPDF_3DMeasure_SetName(HPDF_3DMeasure measure,
HPDF_3DMeasure_SetName(HPDF_3DMeasure measure,
const char* name);
HPDF_EXPORT(HPDF_STATUS)
HPDF_3DMeasure_SetColor(HPDF_3DMeasure measure,
HPDF_3DMeasure_SetColor(HPDF_3DMeasure measure,
HPDF_RGBColor color);
HPDF_EXPORT(HPDF_STATUS)
HPDF_3DMeasure_SetTextSize(HPDF_3DMeasure measure,
HPDF_3DMeasure_SetTextSize(HPDF_3DMeasure measure,
HPDF_REAL textsize);
HPDF_EXPORT(HPDF_STATUS)
HPDF_3DC3DMeasure_SetTextBoxSize(HPDF_3DMeasure measure,
HPDF_3DC3DMeasure_SetTextBoxSize(HPDF_3DMeasure measure,
HPDF_INT32 x,
HPDF_INT32 y);
HPDF_EXPORT(HPDF_STATUS)
HPDF_3DC3DMeasure_SetText(HPDF_3DMeasure measure,
HPDF_3DC3DMeasure_SetText(HPDF_3DMeasure measure,
const char* text,
HPDF_Encoder encoder);
HPDF_EXPORT(HPDF_STATUS)
HPDF_3DC3DMeasure_SetProjectionAnotation(HPDF_3DMeasure measure,
HPDF_3DC3DMeasure_SetProjectionAnotation(HPDF_3DMeasure measure,
HPDF_Annotation projectionanotation);
/*--------------------------------------------------------------------------*/
@ -1551,14 +1551,14 @@ HPDF_EXPORT(HPDF_OutputIntent)
HPDF_ICC_LoadIccFromMem (HPDF_Doc pdf,
HPDF_MMgr mmgr,
HPDF_Stream iccdata,
HPDF_Xref xref,
HPDF_Xref xref,
int numcomponent);
HPDF_EXPORT(HPDF_OutputIntent)
HPDF_LoadIccProfileFromFile (HPDF_Doc pdf,
const char* icc_file_name,
int numcomponent);
#ifdef __cplusplus
}
#endif /* __cplusplus */

View File

@ -34,7 +34,7 @@ HPDF_3DC3DMeasure_New(HPDF_MMgr mmgr,
HPDF_Point3D firstanchorpoint,
HPDF_Point3D textanchorpoint
);
HPDF_3DMeasure
HPDF_PD33DMeasure_New(HPDF_MMgr mmgr,
HPDF_Xref xref,

View File

@ -31,7 +31,7 @@ HPDF_ExData
HPDF_3DAnnotExData_New(HPDF_MMgr mmgr,
HPDF_Xref xref );
#ifdef __cplusplus
}

View File

@ -25,7 +25,7 @@ extern "C" {
#endif
HPDF_Dict
HPDF_ExtGState_New (HPDF_MMgr mmgr,
HPDF_ExtGState_New (HPDF_MMgr mmgr,
HPDF_Xref xref);

View File

@ -65,7 +65,7 @@ typedef struct _HPDF_PageAttr_Rec {
HPDF_Stream stream;
HPDF_Xref xref;
HPDF_UINT compression_mode;
HPDF_PDFVer *ver;
HPDF_PDFVer *ver;
} HPDF_PageAttr_Rec;

View File

@ -33,7 +33,7 @@ HPDF_PDFA_AppendOutputIntents(HPDF_Doc pdf, const char *iccname, HPDF_Dict iccdi
HPDF_STATUS
HPDF_PDFA_SetPDFAConformance (HPDF_Doc pdf,
HPDF_PDFAType pdfatype);
HPDF_STATUS
HPDF_PDFA_GenerateID(HPDF_Doc);
#ifdef __cplusplus

View File

@ -152,7 +152,7 @@ typedef enum _HPDF_InfoType {
/* PDF-A Types */
typedef enum _HPDF_PDFA_TYPE
typedef enum _HPDF_PDFA_TYPE
{
HPDF_PDFA_1A = 0,
HPDF_PDFA_1B = 1
@ -499,7 +499,7 @@ typedef enum _HPDF_TransitionStyle {
HPDF_TS_GLITTER_TOP_LEFT_TO_BOTTOM_RIGHT,
HPDF_TS_REPLACE,
HPDF_TS_EOF
} HPDF_TransitionStyle;
} HPDF_TransitionStyle;
/*----------------------------------------------------------------------------*/

View File

@ -400,7 +400,7 @@
#define PNG_LIBPNG_BUILD_RC 3
#define PNG_LIBPNG_BUILD_STABLE 4
#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
/* Release-Specific Flags */
#define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with
PNG_LIBPNG_BUILD_STABLE only */
@ -431,12 +431,12 @@
/* Ref MSDN: Private as priority over Special
* VS_FF_PRIVATEBUILD File *was not* built using standard release
* procedures. If this value is given, the StringFileInfo block must
* contain a PrivateBuild string.
* contain a PrivateBuild string.
*
* VS_FF_SPECIALBUILD File *was* built by the original company using
* standard release procedures but is a variation of the standard
* file of the same version number. If this value is given, the
* StringFileInfo block must contain a SpecialBuild string.
* StringFileInfo block must contain a SpecialBuild string.
*/
#if defined(PNG_USER_PRIVATEBUILD)

View File

@ -19,7 +19,7 @@
#define PNG_1_2_X
/*
/*
* PNG_USER_CONFIG has to be defined on the compiler command line. This
* includes the resource compiler for Windows DLL configurations.
*/
@ -39,7 +39,7 @@
/*
* Added at libpng-1.2.8
*
*
* If you create a private DLL you need to define in "pngusr.h" the followings:
* #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
* the DLL was built>
@ -50,8 +50,8 @@
* number and must match your private DLL name>
* e.g. // private DLL "libpng13gx.dll"
* #define PNG_USER_DLLFNAME_POSTFIX "gx"
*
* The following macros are also at your disposal if you want to complete the
*
* The following macros are also at your disposal if you want to complete the
* DLL VERSIONINFO structure.
* - PNG_USER_VERSIONINFO_COMMENTS
* - PNG_USER_VERSIONINFO_COMPANYNAME
@ -147,9 +147,9 @@
* 'Cygwin' defines/defaults:
* PNG_BUILD_DLL -- (ignored) building the dll
* (no define) -- (ignored) building an application, linking to the dll
* PNG_STATIC -- (ignored) building the static lib, or building an
* PNG_STATIC -- (ignored) building the static lib, or building an
* application that links to the static lib.
* ALL_STATIC -- (ignored) building various static libs, or building an
* ALL_STATIC -- (ignored) building various static libs, or building an
* application that links to the static libs.
* Thus,
* a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
@ -162,12 +162,12 @@
* PNG_BUILD_DLL
* PNG_STATIC
* (nothing) == PNG_USE_DLL
*
*
* CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
* of auto-import in binutils, we no longer need to worry about
* of auto-import in binutils, we no longer need to worry about
* __declspec(dllexport) / __declspec(dllimport) and friends. Therefore,
* we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
* to __declspec() stuff. However, we DO need to worry about
* to __declspec() stuff. However, we DO need to worry about
* PNG_BUILD_DLL and PNG_STATIC because those change some defaults
* such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
*/
@ -211,8 +211,8 @@
# if !defined(PNG_DLL)
# define PNG_DLL
# endif
# endif
# endif
# endif
# endif
# endif
#endif
@ -731,7 +731,7 @@
# define PNG_EASY_ACCESS_SUPPORTED
#endif
/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
* and removed from version 1.2.20. The following will be removed
* from libpng-1.4.0
*/
@ -1306,7 +1306,7 @@ typedef z_stream FAR * png_zstreamp;
# define PNGAPI __cdecl
# undef PNG_IMPEXP
# define PNG_IMPEXP
#endif
#endif
/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
* you may get warnings regarding the linkage of png_zalloc and png_zfree.