mirror of
https://github.com/brechtsanders/xlsxio
synced 2025-03-28 21:13:24 +00:00
This commit is contained in:
Brecht Sanders
parent
f9c902c2ef
commit
29a41f0f83
@ -42,22 +42,26 @@ IF(BUILD_SHARED)
|
||||
ENDIF()
|
||||
|
||||
FOREACH(LINKTYPE ${LINKTYPES})
|
||||
SET(LINKTYPEDEFINE)
|
||||
IF(LINKTYPE STREQUAL "STATIC")
|
||||
SET(LINKTYPEDEFINE "BUILD_XLSXIO_STATIC")
|
||||
ENDIF()
|
||||
IF(LINKTYPE STREQUAL "SHARED")
|
||||
SET(LINKTYPEDEFINE "BUILD_XLSXIO_DLL")
|
||||
ENDIF()
|
||||
#SET(LINKTYPEDEFINE)
|
||||
#IF(LINKTYPE STREQUAL "STATIC")
|
||||
# SET(LINKTYPEDEFINE "BUILD_XLSXIO_STATIC")
|
||||
#ENDIF()
|
||||
#IF(LINKTYPE STREQUAL "SHARED")
|
||||
# SET(LINKTYPEDEFINE "BUILD_XLSXIO_DLL")
|
||||
#ENDIF()
|
||||
|
||||
ADD_LIBRARY(xlsxio_read_${LINKTYPE} ${LINKTYPE} lib/xlsxio_read.c)
|
||||
SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES DEFINE_SYMBOL ${LINKTYPEDEFINE})
|
||||
#SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS ${LINKTYPEDEFINE})
|
||||
SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO")
|
||||
SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES DEFINE_SYMBOL "BUILD_XLSXIO_DLL")
|
||||
SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES OUTPUT_NAME xlsxio_read)
|
||||
TARGET_LINK_LIBRARIES(xlsxio_read_${LINKTYPE} ${LIBZIP_LIBRARIES} ${EXPAT_LIBRARIES})
|
||||
SET(ALLTARGETS ${ALLTARGETS} xlsxio_read_${LINKTYPE})
|
||||
|
||||
ADD_LIBRARY(xlsxio_write_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c)
|
||||
SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES DEFINE_SYMBOL ${LINKTYPEDEFINE})
|
||||
#SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS ${LINKTYPEDEFINE})
|
||||
SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO")
|
||||
SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES DEFINE_SYMBOL "BUILD_XLSXIO_DLL")
|
||||
SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES OUTPUT_NAME xlsxio_write)
|
||||
TARGET_LINK_LIBRARIES(xlsxio_write_${LINKTYPE} ${LIBZIP_LIBRARIES} ${THREADLIB})
|
||||
SET(ALLTARGETS ${ALLTARGETS} xlsxio_write_${LINKTYPE})
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
0.2.3
|
||||
|
||||
2016-05-11 Brecht Sanders https://github.com/brechtsanders/
|
||||
|
||||
* fixed CMake build to use proper static/shared defines
|
||||
|
||||
0.2.2
|
||||
|
||||
2016-05-07 Brecht Sanders https://github.com/brechtsanders/
|
||||
|
||||
@ -50,7 +50,7 @@ typedef signed __int64 int64_t;
|
||||
#ifdef _WIN32
|
||||
#if defined(BUILD_XLSXIO_DLL)
|
||||
#define DLL_EXPORT_XLSXIO __declspec(dllexport)
|
||||
#elif !defined(STATIC) && !defined(BUILD_XLSXIO_STATIC)
|
||||
#elif !defined(STATIC) && !defined(BUILD_XLSXIO_STATIC) && !defined(BUILD_XLSXIO)
|
||||
#define DLL_EXPORT_XLSXIO __declspec(dllimport)
|
||||
#else
|
||||
#define DLL_EXPORT_XLSXIO
|
||||
|
||||
@ -49,7 +49,7 @@ THE SOFTWARE.
|
||||
/*! \brief minor version number */
|
||||
#define XLSXIO_VERSION_MINOR 2
|
||||
/*! \brief micro version number */
|
||||
#define XLSXIO_VERSION_MICRO 2
|
||||
#define XLSXIO_VERSION_MICRO 3
|
||||
/*! @} */
|
||||
|
||||
/*! \cond PRIVATE */
|
||||
|
||||
@ -47,7 +47,7 @@ typedef signed __int64 int64_t;
|
||||
#ifdef _WIN32
|
||||
#if defined(BUILD_XLSXIO_DLL)
|
||||
#define DLL_EXPORT_XLSXIO __declspec(dllexport)
|
||||
#elif !defined(STATIC) && !defined(BUILD_XLSXIO_STATIC)
|
||||
#elif !defined(STATIC) && !defined(BUILD_XLSXIO_STATIC) && !defined(BUILD_XLSXIO)
|
||||
#define DLL_EXPORT_XLSXIO __declspec(dllimport)
|
||||
#else
|
||||
#define DLL_EXPORT_XLSXIO
|
||||
|
||||
@ -3,12 +3,17 @@
|
||||
#include <stdlib.h>
|
||||
#include <inttypes.h>
|
||||
#include <string.h>
|
||||
#if defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL)
|
||||
#if defined(STATIC) || defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL) || (defined(BUILD_XLSXIO) && !defined(BUILD_XLSXIO_DLL))
|
||||
#define ZIP_STATIC
|
||||
#endif
|
||||
#include <zip.h>
|
||||
#include <expat.h>
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#undef DLL_EXPORT_XLSXIO
|
||||
#define DLL_EXPORT_XLSXIO
|
||||
#endif
|
||||
|
||||
#ifndef ZIP_RDONLY
|
||||
typedef struct zip zip_t;
|
||||
typedef struct zip_file zip_file_t;
|
||||
@ -19,7 +24,7 @@ typedef struct zip_file zip_file_t;
|
||||
#define stricmp strcasecmp
|
||||
#endif
|
||||
|
||||
void xlsxioread_get_version (int* pmajor, int* pminor, int* pmicro)
|
||||
DLL_EXPORT_XLSXIO void xlsxioread_get_version (int* pmajor, int* pminor, int* pmicro)
|
||||
{
|
||||
if (pmajor)
|
||||
*pmajor = XLSXIO_VERSION_MAJOR;
|
||||
@ -29,7 +34,7 @@ void xlsxioread_get_version (int* pmajor, int* pminor, int* pmicro)
|
||||
*pmicro = XLSXIO_VERSION_MICRO;
|
||||
}
|
||||
|
||||
const char* xlsxioread_get_version_string ()
|
||||
DLL_EXPORT_XLSXIO const char* xlsxioread_get_version_string ()
|
||||
{
|
||||
return XLSXIO_VERSION_STRING;
|
||||
}
|
||||
@ -354,7 +359,7 @@ struct xlsxio_read_struct {
|
||||
zip_t* zip;
|
||||
};
|
||||
|
||||
xlsxioreader xlsxioread_open (const char* filename)
|
||||
DLL_EXPORT_XLSXIO xlsxioreader xlsxioread_open (const char* filename)
|
||||
{
|
||||
xlsxioreader result;
|
||||
if ((result = (xlsxioreader)malloc(sizeof(struct xlsxio_read_struct))) != NULL) {
|
||||
@ -366,7 +371,7 @@ xlsxioreader xlsxioread_open (const char* filename)
|
||||
return result;
|
||||
}
|
||||
|
||||
void xlsxioread_close (xlsxioreader handle)
|
||||
DLL_EXPORT_XLSXIO void xlsxioread_close (xlsxioreader handle)
|
||||
{
|
||||
if (handle) {
|
||||
zip_close(handle->zip);
|
||||
@ -478,7 +483,7 @@ void xlsxioread_list_sheets_callback (zip_t* zip, const char* filename, const ch
|
||||
}
|
||||
|
||||
//list all worksheets
|
||||
void xlsxioread_list_sheets (xlsxioreader handle, xlsxioread_list_sheets_callback_fn callback, void* callbackdata)
|
||||
DLL_EXPORT_XLSXIO void xlsxioread_list_sheets (xlsxioreader handle, xlsxioread_list_sheets_callback_fn callback, void* callbackdata)
|
||||
{
|
||||
if (!handle || !callback)
|
||||
return;
|
||||
@ -905,7 +910,7 @@ struct xlsxio_read_sheet_struct {
|
||||
size_t paddingcol;
|
||||
};
|
||||
|
||||
int xlsxioread_process (xlsxioreader handle, const char* sheetname, unsigned int flags, xlsxioread_process_cell_callback_fn cell_callback, xlsxioread_process_row_callback_fn row_callback, void* callbackdata)
|
||||
DLL_EXPORT_XLSXIO int xlsxioread_process (xlsxioreader handle, const char* sheetname, unsigned int flags, xlsxioread_process_cell_callback_fn cell_callback, xlsxioread_process_row_callback_fn row_callback, void* callbackdata)
|
||||
{
|
||||
int result = 0;
|
||||
//determine sheet file name
|
||||
@ -990,7 +995,7 @@ void xlsxioread_find_main_sheet_file_callback (zip_t* zip, const char* filename,
|
||||
*data = strdup(filename);
|
||||
}
|
||||
|
||||
xlsxioreadersheetlist xlsxioread_sheetlist_open (xlsxioreader handle)
|
||||
DLL_EXPORT_XLSXIO xlsxioreadersheetlist xlsxioread_sheetlist_open (xlsxioreader handle)
|
||||
{
|
||||
//determine main sheet name
|
||||
char* mainsheetfile = NULL;
|
||||
@ -1014,7 +1019,7 @@ xlsxioreadersheetlist xlsxioread_sheetlist_open (xlsxioreader handle)
|
||||
return result;
|
||||
}
|
||||
|
||||
void xlsxioread_sheetlist_close (xlsxioreadersheetlist sheetlisthandle)
|
||||
DLL_EXPORT_XLSXIO void xlsxioread_sheetlist_close (xlsxioreadersheetlist sheetlisthandle)
|
||||
{
|
||||
if (sheetlisthandle->xmlparser)
|
||||
XML_ParserFree(sheetlisthandle->xmlparser);
|
||||
@ -1025,7 +1030,7 @@ void xlsxioread_sheetlist_close (xlsxioreadersheetlist sheetlisthandle)
|
||||
|
||||
}
|
||||
|
||||
const char* xlsxioread_sheetlist_next (xlsxioreadersheetlist sheetlisthandle)
|
||||
DLL_EXPORT_XLSXIO const char* xlsxioread_sheetlist_next (xlsxioreadersheetlist sheetlisthandle)
|
||||
{
|
||||
if (!sheetlisthandle->zipfile || !sheetlisthandle->xmlparser)
|
||||
return NULL;
|
||||
@ -1040,7 +1045,7 @@ const char* xlsxioread_sheetlist_next (xlsxioreadersheetlist sheetlisthandle)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
xlsxioreadersheet xlsxioread_sheet_open (xlsxioreader handle, const char* sheetname, unsigned int flags)
|
||||
DLL_EXPORT_XLSXIO xlsxioreadersheet xlsxioread_sheet_open (xlsxioreader handle, const char* sheetname, unsigned int flags)
|
||||
{
|
||||
xlsxioreadersheet result;
|
||||
if ((result = (xlsxioreadersheet)malloc(sizeof(struct xlsxio_read_sheet_struct))) == NULL)
|
||||
@ -1055,7 +1060,7 @@ xlsxioreadersheet xlsxioread_sheet_open (xlsxioreader handle, const char* sheetn
|
||||
return result;
|
||||
}
|
||||
|
||||
void xlsxioread_sheet_close (xlsxioreadersheet sheethandle)
|
||||
DLL_EXPORT_XLSXIO void xlsxioread_sheet_close (xlsxioreadersheet sheethandle)
|
||||
{
|
||||
if (!sheethandle)
|
||||
return;
|
||||
@ -1067,7 +1072,7 @@ void xlsxioread_sheet_close (xlsxioreadersheet sheethandle)
|
||||
free(sheethandle);
|
||||
}
|
||||
|
||||
int xlsxioread_sheet_next_row (xlsxioreadersheet sheethandle)
|
||||
DLL_EXPORT_XLSXIO int xlsxioread_sheet_next_row (xlsxioreadersheet sheethandle)
|
||||
{
|
||||
enum XML_Status status;
|
||||
if (!sheethandle)
|
||||
@ -1089,7 +1094,7 @@ int xlsxioread_sheet_next_row (xlsxioreadersheet sheethandle)
|
||||
return (status == XML_STATUS_SUSPENDED ? 1 : 0);
|
||||
}
|
||||
|
||||
char* xlsxioread_sheet_next_cell (xlsxioreadersheet sheethandle)
|
||||
DLL_EXPORT_XLSXIO char* xlsxioread_sheet_next_cell (xlsxioreadersheet sheethandle)
|
||||
{
|
||||
char* result;
|
||||
if (!sheethandle)
|
||||
@ -1146,7 +1151,7 @@ char* xlsxioread_sheet_next_cell (xlsxioreadersheet sheethandle)
|
||||
return result;
|
||||
}
|
||||
|
||||
int xlsxioread_sheet_next_cell_string (xlsxioreadersheet sheethandle, char** pvalue)
|
||||
DLL_EXPORT_XLSXIO int xlsxioread_sheet_next_cell_string (xlsxioreadersheet sheethandle, char** pvalue)
|
||||
{
|
||||
char* result;
|
||||
if (!sheethandle)
|
||||
@ -1157,7 +1162,7 @@ int xlsxioread_sheet_next_cell_string (xlsxioreadersheet sheethandle, char** pva
|
||||
return (result ? 1 : 0);
|
||||
}
|
||||
|
||||
int xlsxioread_sheet_next_cell_int (xlsxioreadersheet sheethandle, int64_t* pvalue)
|
||||
DLL_EXPORT_XLSXIO int xlsxioread_sheet_next_cell_int (xlsxioreadersheet sheethandle, int64_t* pvalue)
|
||||
{
|
||||
char* result;
|
||||
int status;
|
||||
@ -1172,7 +1177,7 @@ int xlsxioread_sheet_next_cell_int (xlsxioreadersheet sheethandle, int64_t* pval
|
||||
return (result ? 1 : 0);
|
||||
}
|
||||
|
||||
int xlsxioread_sheet_next_cell_float (xlsxioreadersheet sheethandle, double* pvalue)
|
||||
DLL_EXPORT_XLSXIO int xlsxioread_sheet_next_cell_float (xlsxioreadersheet sheethandle, double* pvalue)
|
||||
{
|
||||
char* result;
|
||||
if ((result = xlsxioread_sheet_next_cell(sheethandle)) != NULL) {
|
||||
@ -1182,7 +1187,7 @@ int xlsxioread_sheet_next_cell_float (xlsxioreadersheet sheethandle, double* pva
|
||||
return (result ? 1 : 0);
|
||||
}
|
||||
|
||||
int xlsxioread_sheet_next_cell_datetime (xlsxioreadersheet sheethandle, time_t* pvalue)
|
||||
DLL_EXPORT_XLSXIO int xlsxioread_sheet_next_cell_datetime (xlsxioreadersheet sheethandle, time_t* pvalue)
|
||||
{
|
||||
char* result;
|
||||
if ((result = xlsxioread_sheet_next_cell(sheethandle)) != NULL) {
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
#include <stdarg.h>
|
||||
#if defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL)
|
||||
#if defined(STATIC) || defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL) || (defined(BUILD_XLSXIO) && !defined(BUILD_XLSXIO_DLL))
|
||||
#define ZIP_STATIC
|
||||
#endif
|
||||
#include <zip.h>
|
||||
@ -22,6 +22,11 @@
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#undef DLL_EXPORT_XLSXIO
|
||||
#define DLL_EXPORT_XLSXIO
|
||||
#endif
|
||||
|
||||
#ifndef ZIP_RDONLY
|
||||
typedef struct zip zip_t;
|
||||
typedef struct zip_source zip_source_t;
|
||||
@ -41,7 +46,7 @@ typedef struct zip_source zip_source_t;
|
||||
//#undef WITHOUT_XLSX_STYLES
|
||||
#define DEFAULT_BUFFERED_ROWS 5
|
||||
|
||||
void xlsxiowrite_get_version (int* pmajor, int* pminor, int* pmicro)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_get_version (int* pmajor, int* pminor, int* pmicro)
|
||||
{
|
||||
if (pmajor)
|
||||
*pmajor = XLSXIO_VERSION_MAJOR;
|
||||
@ -51,7 +56,7 @@ void xlsxiowrite_get_version (int* pmajor, int* pminor, int* pmicro)
|
||||
*pmicro = XLSXIO_VERSION_MICRO;
|
||||
}
|
||||
|
||||
const char* xlsxiowrite_get_version_string ()
|
||||
DLL_EXPORT_XLSXIO const char* xlsxiowrite_get_version_string ()
|
||||
{
|
||||
return XLSXIO_VERSION_STRING;
|
||||
}
|
||||
@ -428,7 +433,7 @@ void* thread_proc (void* arg)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
xlsxiowriter xlsxiowrite_open (const char* filename, const char* sheetname)
|
||||
DLL_EXPORT_XLSXIO xlsxiowriter xlsxiowrite_open (const char* filename, const char* sheetname)
|
||||
{
|
||||
xlsxiowriter handle;
|
||||
if (!filename)
|
||||
@ -476,7 +481,7 @@ xlsxiowriter xlsxiowrite_open (const char* filename, const char* sheetname)
|
||||
|
||||
void flush_buffer (xlsxiowriter handle);
|
||||
|
||||
int xlsxiowrite_close (xlsxiowriter handle)
|
||||
DLL_EXPORT_XLSXIO int xlsxiowrite_close (xlsxiowriter handle)
|
||||
{
|
||||
struct column_info_struct* colinfo;
|
||||
struct column_info_struct* colinfonext;
|
||||
@ -690,7 +695,7 @@ void flush_buffer (xlsxiowriter handle)
|
||||
handle->sheetopen = 1;
|
||||
}
|
||||
|
||||
void xlsxiowrite_set_detection_rows (xlsxiowriter handle, size_t rows)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_set_detection_rows (xlsxiowriter handle, size_t rows)
|
||||
{
|
||||
//abort if currently not buffering
|
||||
if (!handle->rowstobuffer || handle->sheetopen)
|
||||
@ -702,12 +707,12 @@ void xlsxiowrite_set_detection_rows (xlsxiowriter handle, size_t rows)
|
||||
flush_buffer(handle);
|
||||
}
|
||||
|
||||
void xlsxiowrite_set_row_height (xlsxiowriter handle, size_t height)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_set_row_height (xlsxiowriter handle, size_t height)
|
||||
{
|
||||
handle->rowheight = height;
|
||||
}
|
||||
|
||||
void xlsxiowrite_add_column (xlsxiowriter handle, const char* value, int width)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_add_column (xlsxiowriter handle, const char* value, int width)
|
||||
{
|
||||
struct column_info_struct** pcolinfo = handle->pcurrentcolumn;
|
||||
if (value)
|
||||
@ -720,7 +725,7 @@ void xlsxiowrite_add_column (xlsxiowriter handle, const char* value, int width)
|
||||
handle->freezetop = 1;
|
||||
}
|
||||
|
||||
void xlsxiowrite_add_cell_string (xlsxiowriter handle, const char* value)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_add_cell_string (xlsxiowriter handle, const char* value)
|
||||
{
|
||||
if (value)
|
||||
write_cell_data(handle, NULL, "<c t=\"inlineStr\"" STYLE_ATTR(STYLE_TEXT) "><is><t>", "</t></is></c>", "%s", value);
|
||||
@ -728,17 +733,17 @@ void xlsxiowrite_add_cell_string (xlsxiowriter handle, const char* value)
|
||||
write_cell_data(handle, NULL, "<c" STYLE_ATTR(STYLE_TEXT) "/>", NULL, NULL);
|
||||
}
|
||||
|
||||
void xlsxiowrite_add_cell_int (xlsxiowriter handle, int64_t value)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_add_cell_int (xlsxiowriter handle, int64_t value)
|
||||
{
|
||||
write_cell_data(handle, NULL, "<c" STYLE_ATTR(STYLE_INTEGER) "><v>", "</v></c>", "%" PRIi64, value);
|
||||
}
|
||||
|
||||
void xlsxiowrite_add_cell_float (xlsxiowriter handle, double value)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_add_cell_float (xlsxiowriter handle, double value)
|
||||
{
|
||||
write_cell_data(handle, NULL, "<c" STYLE_ATTR(STYLE_GENERAL) "><v>", "</v></c>", "%.32G", value);
|
||||
}
|
||||
|
||||
void xlsxiowrite_add_cell_datetime (xlsxiowriter handle, time_t value)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_add_cell_datetime (xlsxiowriter handle, time_t value)
|
||||
{
|
||||
double timestamp = ((double)(value) + .499) / 86400 + 25569; //conversion from Unix to Excel timestamp
|
||||
write_cell_data(handle, NULL, "<c" STYLE_ATTR(STYLE_DATETIME) "><v>", "</v></c>", "%.16G", timestamp);
|
||||
@ -755,7 +760,7 @@ MAC OS X (pre Office 2011):
|
||||
Excel Timestamp = (Unix Timestamp / 86400) + 24107
|
||||
*/
|
||||
|
||||
void xlsxiowrite_next_row (xlsxiowriter handle)
|
||||
DLL_EXPORT_XLSXIO void xlsxiowrite_next_row (xlsxiowriter handle)
|
||||
{
|
||||
if (!handle)
|
||||
return;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user