From 7e805d1a6f3bf7ddd04b2c1ce857a2cf6d9ff873 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Thu, 10 Aug 2017 15:13:19 +0000 Subject: Revert "Add a build target and a proper export header for shared library builds." This reverts commit 00334675c18a0203f313cceb670c970a77280f49. Reason for revert: Breaking the deps roller - https://chromium-review.googlesource.com/c/609307 Original change's description: > Add a build target and a proper export header for shared library builds. > > This CL adds support for Chromium's component build feature to pdfium. > > The export header stub in fpdfview.h is expanded to match Chromium's > export mechanisms and patterns (fixes pdfium:825). > > A component/shared library build can be triggered by adding > > is_component_build = true > > as a gn argument. Please note that setting this will also affect some > of pdfiums dependencies like v8, which will be build as components > too. > > Additionally, this CL provides a "pdf_source_set" template which > dynamically enables the use of "source_set" when building a complete > static library or a shared library to reduce build time. > > When testing this it is recommended to only build the pdfium target as > most of pdfiums test rely on non-public functions which aren't exported > by the shared library. > > Bug: pdfium:825,pdfium:826 > Change-Id: Icedc538ec535e11d1e53c4d5fabc8c064b275752 > Reviewed-on: https://pdfium-review.googlesource.com/8970 > Reviewed-by: dsinclair > Commit-Queue: dsinclair TBR=thestig@chromium.org,tsepez@chromium.org,brucedawson@chromium.org,dsinclair@google.com,dsinclair@chromium.org,licorn@gmail.com Change-Id: Ib02af2298932481293f50d362ae87bfedf284821 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: pdfium:825, pdfium:826 Reviewed-on: https://pdfium-review.googlesource.com/10550 Reviewed-by: Henrique Nakashima Commit-Queue: Henrique Nakashima --- public/fpdf_edit.h | 256 +++++++++++++++++++++++++---------------------------- 1 file changed, 122 insertions(+), 134 deletions(-) (limited to 'public/fpdf_edit.h') diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h index f75744599f..54127d80ea 100644 --- a/public/fpdf_edit.h +++ b/public/fpdf_edit.h @@ -54,7 +54,7 @@ extern "C" { // Create a new PDF document. // // Returns a handle to a new document, or NULL on failure. -FPDF_EXPORT FPDF_DOCUMENT FPDF_CALLCONV FPDF_CreateNewDocument(); +DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_CreateNewDocument(); // Create a new PDF page. // @@ -69,17 +69,16 @@ FPDF_EXPORT FPDF_DOCUMENT FPDF_CALLCONV FPDF_CreateNewDocument(); // // The page should be closed with CPDF_ClosePage() when finished as // with any other page in the document. -FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDFPage_New(FPDF_DOCUMENT document, - int page_index, - double width, - double height); +DLLEXPORT FPDF_PAGE STDCALL FPDFPage_New(FPDF_DOCUMENT document, + int page_index, + double width, + double height); // Delete the page at |page_index|. // // document - handle to document. // page_index - the index of the page to delete. -FPDF_EXPORT void FPDF_CALLCONV FPDFPage_Delete(FPDF_DOCUMENT document, - int page_index); +DLLEXPORT void STDCALL FPDFPage_Delete(FPDF_DOCUMENT document, int page_index); // Get the rotation of |page|. // @@ -90,7 +89,7 @@ FPDF_EXPORT void FPDF_CALLCONV FPDFPage_Delete(FPDF_DOCUMENT document, // 1 - Rotated 90 degrees clockwise. // 2 - Rotated 180 degrees clockwise. // 3 - Rotated 270 degrees clockwise. -FPDF_EXPORT int FPDF_CALLCONV FPDFPage_GetRotation(FPDF_PAGE page); +DLLEXPORT int STDCALL FPDFPage_GetRotation(FPDF_PAGE page); // Set rotation for |page|. // @@ -100,22 +99,22 @@ FPDF_EXPORT int FPDF_CALLCONV FPDFPage_GetRotation(FPDF_PAGE page); // 1 - Rotated 90 degrees clockwise. // 2 - Rotated 180 degrees clockwise. // 3 - Rotated 270 degrees clockwise. -FPDF_EXPORT void FPDF_CALLCONV FPDFPage_SetRotation(FPDF_PAGE page, int rotate); +DLLEXPORT void STDCALL FPDFPage_SetRotation(FPDF_PAGE page, int rotate); // Insert |page_obj| into |page|. // // page - handle to a page // page_obj - handle to a page object. The |page_obj| will be automatically // freed. -FPDF_EXPORT void FPDF_CALLCONV FPDFPage_InsertObject(FPDF_PAGE page, - FPDF_PAGEOBJECT page_obj); +DLLEXPORT void STDCALL FPDFPage_InsertObject(FPDF_PAGE page, + FPDF_PAGEOBJECT page_obj); // Get number of page objects inside |page|. // // page - handle to a page. // // Returns the number of objects in |page|. -FPDF_EXPORT int FPDF_CALLCONV FPDFPage_CountObject(FPDF_PAGE page); +DLLEXPORT int STDCALL FPDFPage_CountObject(FPDF_PAGE page); // Get object in |page| at |index|. // @@ -123,15 +122,14 @@ FPDF_EXPORT int FPDF_CALLCONV FPDFPage_CountObject(FPDF_PAGE page); // index - the index of a page object. // // Returns the handle to the page object, or NULL on failed. -FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV FPDFPage_GetObject(FPDF_PAGE page, - int index); +DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPage_GetObject(FPDF_PAGE page, int index); // Checks if |page| contains transparency. // // page - handle to a page. // // Returns TRUE if |page| contains transparency. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPage_HasTransparency(FPDF_PAGE page); +DLLEXPORT FPDF_BOOL STDCALL FPDFPage_HasTransparency(FPDF_PAGE page); // Generate the content of |page|. // @@ -141,7 +139,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPage_HasTransparency(FPDF_PAGE page); // // Before you save the page to a file, or reload the page, you must call // |FPDFPage_GenerateContent| or any changes to |page| will be lost. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPage_GenerateContent(FPDF_PAGE page); +DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GenerateContent(FPDF_PAGE page); // Destroy |page_obj| by releasing its resources. |page_obj| must have been // created by FPDFPageObj_CreateNew{Path|Rect}() or @@ -150,14 +148,14 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPage_GenerateContent(FPDF_PAGE page); // FPDFPage_InsertObject() or to an annotation through FPDFAnnot_AppendObject(). // // page_obj - handle to a page object. -FPDF_EXPORT void FPDF_CALLCONV FPDFPageObj_Destroy(FPDF_PAGEOBJECT page_obj); +DLLEXPORT void STDCALL FPDFPageObj_Destroy(FPDF_PAGEOBJECT page_obj); // Checks if |page_object| contains transparency. // // page_object - handle to a page object. // // Returns TRUE if |pageObject| contains transparency. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +DLLEXPORT FPDF_BOOL STDCALL FPDFPageObj_HasTransparency(FPDF_PAGEOBJECT page_object); // Get type of |page_object|. @@ -166,7 +164,7 @@ FPDFPageObj_HasTransparency(FPDF_PAGEOBJECT page_object); // // Returns one of the FPDF_PAGEOBJ_* values on success, FPDF_PAGEOBJ_UNKNOWN on // error. -FPDF_EXPORT int FPDF_CALLCONV FPDFPageObj_GetType(FPDF_PAGEOBJECT page_object); +DLLEXPORT int STDCALL FPDFPageObj_GetType(FPDF_PAGEOBJECT page_object); // Transform |page_object| by the given matrix. // @@ -182,14 +180,13 @@ FPDF_EXPORT int FPDF_CALLCONV FPDFPageObj_GetType(FPDF_PAGEOBJECT page_object); // |a c e| // |b d f| // and can be used to scale, rotate, shear and translate the |page_object|. -FPDF_EXPORT void FPDF_CALLCONV -FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object, - double a, - double b, - double c, - double d, - double e, - double f); +DLLEXPORT void STDCALL FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object, + double a, + double b, + double c, + double d, + double e, + double f); // Transform all annotations in |page|. // @@ -205,20 +202,20 @@ FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object, // |a c e| // |b d f| // and can be used to scale, rotate, shear and translate the |page| annotations. -FPDF_EXPORT void FPDF_CALLCONV FPDFPage_TransformAnnots(FPDF_PAGE page, - double a, - double b, - double c, - double d, - double e, - double f); +DLLEXPORT void STDCALL FPDFPage_TransformAnnots(FPDF_PAGE page, + double a, + double b, + double c, + double d, + double e, + double f); // Create a new image object. // // document - handle to a document. // // Returns a handle to a new image object. -FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV +DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImageObj(FPDF_DOCUMENT document); // Load an image from a JPEG image file and then set it into |image_object|. @@ -235,7 +232,7 @@ FPDFPageObj_NewImageObj(FPDF_DOCUMENT document); // for all the loaded pages. Pass |pages| and page count (|nCount|) to this API // to clear the image cache. If the image is not previously shared, or NULL is a // valid |pages| value. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, int nCount, FPDF_PAGEOBJECT image_object, @@ -257,7 +254,7 @@ FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, // valid |pages| value. This function loads the JPEG image inline, so the image // content is copied to the file. This allows |fileAccess| and its associated // data to be deleted after this function returns. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_LoadJpegFileInline(FPDF_PAGE* pages, int nCount, FPDF_PAGEOBJECT image_object, @@ -279,14 +276,13 @@ FPDFImageObj_LoadJpegFileInline(FPDF_PAGE* pages, // and can be used to scale, rotate, shear and translate the |page| annotations. // // Returns TRUE on success. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFImageObj_SetMatrix(FPDF_PAGEOBJECT image_object, - double a, - double b, - double c, - double d, - double e, - double f); +DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetMatrix(FPDF_PAGEOBJECT image_object, + double a, + double b, + double c, + double d, + double e, + double f); // Set |bitmap| to |image_object|. // @@ -296,11 +292,10 @@ FPDFImageObj_SetMatrix(FPDF_PAGEOBJECT image_object, // bitmap - handle of the bitmap. // // Returns TRUE on success. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFImageObj_SetBitmap(FPDF_PAGE* pages, - int nCount, - FPDF_PAGEOBJECT image_object, - FPDF_BITMAP bitmap); +DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetBitmap(FPDF_PAGE* pages, + int nCount, + FPDF_PAGEOBJECT image_object, + FPDF_BITMAP bitmap); // Get a bitmap rasterisation of |image_object|. The returned bitmap will be // owned by the caller, and FPDFBitmap_Destroy() must be called on the returned @@ -309,7 +304,7 @@ FPDFImageObj_SetBitmap(FPDF_PAGE* pages, // image_object - handle to an image object. // // Returns the bitmap. -FPDF_EXPORT FPDF_BITMAP FPDF_CALLCONV +DLLEXPORT FPDF_BITMAP STDCALL FPDFImageObj_GetBitmap(FPDF_PAGEOBJECT image_object); // Get the decoded image data of |image_object|. The decoded data is the @@ -322,7 +317,7 @@ FPDFImageObj_GetBitmap(FPDF_PAGEOBJECT image_object); // buflen - length of the buffer. // // Returns the length of the decoded image data. -FPDF_EXPORT unsigned long FPDF_CALLCONV +DLLEXPORT unsigned long STDCALL FPDFImageObj_GetImageDataDecoded(FPDF_PAGEOBJECT image_object, void* buffer, unsigned long buflen); @@ -336,7 +331,7 @@ FPDFImageObj_GetImageDataDecoded(FPDF_PAGEOBJECT image_object, // buflen - length of the buffer. // // Returns the length of the raw image data. -FPDF_EXPORT unsigned long FPDF_CALLCONV +DLLEXPORT unsigned long STDCALL FPDFImageObj_GetImageDataRaw(FPDF_PAGEOBJECT image_object, void* buffer, unsigned long buflen); @@ -346,7 +341,7 @@ FPDFImageObj_GetImageDataRaw(FPDF_PAGEOBJECT image_object, // image_object - handle to an image object. // // Returns the number of |image_object|'s filters. -FPDF_EXPORT int FPDF_CALLCONV +DLLEXPORT int STDCALL FPDFImageObj_GetImageFilterCount(FPDF_PAGEOBJECT image_object); // Get the filter at |index| of |image_object|'s list of filters. Note that the @@ -360,7 +355,7 @@ FPDFImageObj_GetImageFilterCount(FPDF_PAGEOBJECT image_object); // buflen - length of the buffer. // // Returns the length of the filter string. -FPDF_EXPORT unsigned long FPDF_CALLCONV +DLLEXPORT unsigned long STDCALL FPDFImageObj_GetImageFilter(FPDF_PAGEOBJECT image_object, int index, void* buffer, @@ -372,8 +367,7 @@ FPDFImageObj_GetImageFilter(FPDF_PAGEOBJECT image_object, // y - initial vertical position. // // Returns a handle to a new path object. -FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV FPDFPageObj_CreateNewPath(float x, - float y); +DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_CreateNewPath(float x, float y); // Create a closed path consisting of a rectangle. // @@ -383,10 +377,10 @@ FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV FPDFPageObj_CreateNewPath(float x, // h - height of the rectangle. // // Returns a handle to the new path object. -FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV FPDFPageObj_CreateNewRect(float x, - float y, - float w, - float h); +DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_CreateNewRect(float x, + float y, + float w, + float h); // Get the bounding box of |page_object|. // @@ -397,12 +391,11 @@ FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV FPDFPageObj_CreateNewRect(float x, // top - pointer where the top coordinate will be stored // // Returns TRUE on success. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFPageObj_GetBounds(FPDF_PAGEOBJECT page_object, - float* left, - float* bottom, - float* right, - float* top); +DLLEXPORT FPDF_BOOL STDCALL FPDFPageObj_GetBounds(FPDF_PAGEOBJECT page_object, + float* left, + float* bottom, + float* right, + float* top); // Set the blend mode of |page_object|. // @@ -412,9 +405,8 @@ FPDFPageObj_GetBounds(FPDF_PAGEOBJECT page_object, // Blend mode can be one of following: Color, ColorBurn, ColorDodge, Darken, // Difference, Exclusion, HardLight, Hue, Lighten, Luminosity, Multiply, Normal, // Overlay, Saturation, Screen, SoftLight -FPDF_EXPORT void FPDF_CALLCONV -FPDFPageObj_SetBlendMode(FPDF_PAGEOBJECT page_object, - FPDF_BYTESTRING blend_mode); +DLLEXPORT void STDCALL FPDFPageObj_SetBlendMode(FPDF_PAGEOBJECT page_object, + FPDF_BYTESTRING blend_mode); // Set the stroke RGBA of a path. Range of values: 0 - 255. // @@ -425,12 +417,11 @@ FPDFPageObj_SetBlendMode(FPDF_PAGEOBJECT page_object, // A - the stroke alpha for the path. // // Returns TRUE on success. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFPath_SetStrokeColor(FPDF_PAGEOBJECT path, - unsigned int R, - unsigned int G, - unsigned int B, - unsigned int A); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_SetStrokeColor(FPDF_PAGEOBJECT path, + unsigned int R, + unsigned int G, + unsigned int B, + unsigned int A); // Get the stroke RGBA of a path. Range of values: 0 - 255. // @@ -441,12 +432,11 @@ FPDFPath_SetStrokeColor(FPDF_PAGEOBJECT path, // A - the stroke alpha of the path. // // Returns TRUE on success. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFPath_GetStrokeColor(FPDF_PAGEOBJECT path, - unsigned int* R, - unsigned int* G, - unsigned int* B, - unsigned int* A); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_GetStrokeColor(FPDF_PAGEOBJECT path, + unsigned int* R, + unsigned int* G, + unsigned int* B, + unsigned int* A); // Set the stroke width of a path. // @@ -454,8 +444,8 @@ FPDFPath_GetStrokeColor(FPDF_PAGEOBJECT path, // width - the width of the stroke. // // Returns TRUE on success -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFPath_SetStrokeWidth(FPDF_PAGEOBJECT path, float width); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_SetStrokeWidth(FPDF_PAGEOBJECT path, + float width); // Set the line join of |page_object|. // @@ -464,8 +454,8 @@ FPDFPath_SetStrokeWidth(FPDF_PAGEOBJECT path, float width); // // Line join can be one of following: FPDF_LINEJOIN_MITER, FPDF_LINEJOIN_ROUND, // FPDF_LINEJOIN_BEVEL -FPDF_EXPORT void FPDF_CALLCONV FPDF_CALLCONV -FPDFPath_SetLineJoin(FPDF_PAGEOBJECT page_object, int line_join); +DLLEXPORT void STDCALL STDCALL FPDFPath_SetLineJoin(FPDF_PAGEOBJECT page_object, + int line_join); // Set the line cap of |page_object|. // @@ -474,8 +464,8 @@ FPDFPath_SetLineJoin(FPDF_PAGEOBJECT page_object, int line_join); // // Line cap can be one of following: FPDF_LINECAP_BUTT, FPDF_LINECAP_ROUND, // FPDF_LINECAP_PROJECTING_SQUARE -FPDF_EXPORT void FPDF_CALLCONV FPDFPath_SetLineCap(FPDF_PAGEOBJECT page_object, - int line_cap); +DLLEXPORT void STDCALL FPDFPath_SetLineCap(FPDF_PAGEOBJECT page_object, + int line_cap); // Set the fill RGBA of a path. Range of values: 0 - 255. // @@ -486,11 +476,11 @@ FPDF_EXPORT void FPDF_CALLCONV FPDFPath_SetLineCap(FPDF_PAGEOBJECT page_object, // A - the fill alpha for the path. // // Returns TRUE on success. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_SetFillColor(FPDF_PAGEOBJECT path, - unsigned int R, - unsigned int G, - unsigned int B, - unsigned int A); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_SetFillColor(FPDF_PAGEOBJECT path, + unsigned int R, + unsigned int G, + unsigned int B, + unsigned int A); // Get the fill RGBA of a path. Range of values: 0 - 255. // @@ -501,11 +491,11 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_SetFillColor(FPDF_PAGEOBJECT path, // A - the fill alpha of the path. // // Returns TRUE on success. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_GetFillColor(FPDF_PAGEOBJECT path, - unsigned int* R, - unsigned int* G, - unsigned int* B, - unsigned int* A); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_GetFillColor(FPDF_PAGEOBJECT path, + unsigned int* R, + unsigned int* G, + unsigned int* B, + unsigned int* A); // Move a path's current point. // @@ -517,9 +507,9 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_GetFillColor(FPDF_PAGEOBJECT path, // new one. // // Returns TRUE on success -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_MoveTo(FPDF_PAGEOBJECT path, - float x, - float y); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_MoveTo(FPDF_PAGEOBJECT path, + float x, + float y); // Add a line between the current point and a new point in the path. // @@ -530,9 +520,9 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_MoveTo(FPDF_PAGEOBJECT path, // The path's current point is changed to (x, y). // // Returns TRUE on success -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_LineTo(FPDF_PAGEOBJECT path, - float x, - float y); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_LineTo(FPDF_PAGEOBJECT path, + float x, + float y); // Add a cubic Bezier curve to the given path, starting at the current point. // @@ -545,13 +535,13 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_LineTo(FPDF_PAGEOBJECT path, // y3 - the vertical position of the ending point of the Bezier curve. // // Returns TRUE on success -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_BezierTo(FPDF_PAGEOBJECT path, - float x1, - float y1, - float x2, - float y2, - float x3, - float y3); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_BezierTo(FPDF_PAGEOBJECT path, + float x1, + float y1, + float x2, + float y2, + float x3, + float y3); // Close the current subpath of a given path. // @@ -561,7 +551,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_BezierTo(FPDF_PAGEOBJECT path, // subpath, thus terminating the current subpath. // // Returns TRUE on success -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_Close(FPDF_PAGEOBJECT path); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_Close(FPDF_PAGEOBJECT path); // Set the drawing mode of a path. // @@ -571,9 +561,9 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_Close(FPDF_PAGEOBJECT path); // stroke - a boolean specifying if the path should be stroked or not. // // Returns TRUE on success -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_SetDrawMode(FPDF_PAGEOBJECT path, - int fillmode, - FPDF_BOOL stroke); +DLLEXPORT FPDF_BOOL STDCALL FPDFPath_SetDrawMode(FPDF_PAGEOBJECT path, + int fillmode, + FPDF_BOOL stroke); // Create a new text object using one of the standard PDF fonts. // @@ -582,10 +572,9 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_SetDrawMode(FPDF_PAGEOBJECT path, // font_size - the font size for the new text object. // // Returns a handle to a new text object, or NULL on failure -FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV -FPDFPageObj_NewTextObj(FPDF_DOCUMENT document, - FPDF_BYTESTRING font, - float font_size); +DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewTextObj(FPDF_DOCUMENT document, + FPDF_BYTESTRING font, + float font_size); // Set the text for a textobject. If it had text, it will be replaced. // @@ -593,8 +582,8 @@ FPDFPageObj_NewTextObj(FPDF_DOCUMENT document, // text - the UTF-16LE encoded string containing the text to be added. // // Returns TRUE on success -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFText_SetText(FPDF_PAGEOBJECT text_object, FPDF_WIDESTRING text); +DLLEXPORT FPDF_BOOL STDCALL FPDFText_SetText(FPDF_PAGEOBJECT text_object, + FPDF_WIDESTRING text); // Returns a font object loaded from a stream of data. The font is loaded // into the document. @@ -609,11 +598,11 @@ FPDFText_SetText(FPDF_PAGEOBJECT text_object, FPDF_WIDESTRING text); // The loaded font can be closed using FPDF_Font_Close. // // Returns NULL on failure -FPDF_EXPORT FPDF_FONT FPDF_CALLCONV FPDFText_LoadFont(FPDF_DOCUMENT document, - const uint8_t* data, - uint32_t size, - int font_type, - FPDF_BOOL cid); +DLLEXPORT FPDF_FONT STDCALL FPDFText_LoadFont(FPDF_DOCUMENT document, + const uint8_t* data, + uint32_t size, + int font_type, + FPDF_BOOL cid); // Set the fill RGBA of a text object. Range of values: 0 - 255. // @@ -624,17 +613,16 @@ FPDF_EXPORT FPDF_FONT FPDF_CALLCONV FPDFText_LoadFont(FPDF_DOCUMENT document, // A - the fill alpha for the path. // // Returns TRUE on success. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFText_SetFillColor(FPDF_PAGEOBJECT text_object, - unsigned int R, - unsigned int G, - unsigned int B, - unsigned int A); +DLLEXPORT FPDF_BOOL STDCALL FPDFText_SetFillColor(FPDF_PAGEOBJECT text_object, + unsigned int R, + unsigned int G, + unsigned int B, + unsigned int A); // Close a loaded PDF font. // // font - Handle to the loaded font. -FPDF_EXPORT void FPDF_CALLCONV FPDFFont_Close(FPDF_FONT font); +DLLEXPORT void STDCALL FPDFFont_Close(FPDF_FONT font); // Create a new text object using a loaded font. // @@ -643,7 +631,7 @@ FPDF_EXPORT void FPDF_CALLCONV FPDFFont_Close(FPDF_FONT font); // font_size - the font size for the new text object. // // Returns a handle to a new text object, or NULL on failure -FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV +DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_CreateTextObj(FPDF_DOCUMENT document, FPDF_FONT font, float font_size); -- cgit v1.2.3