Skip to content

Commit

Permalink
Merge visualstudio compilation patch by htoothrot
Browse files Browse the repository at this point in the history
  • Loading branch information
@antialize
antialize committed Mar 21, 2011
1 parent d30cd0f commit af42daf
Show file tree
Hide file tree
Showing 11 changed files with 166 additions and 154 deletions.
4 changes: 2 additions & 2 deletions include/wkhtmltox/dllbegin.inc
View file
Expand Up @@ -44,9 +44,9 @@
#endif

#ifdef __cplusplus
#define CAPI extern "C" DLL_PUBLIC CALLTYPE
#define CAPI(type) extern "C" DLL_PUBLIC type CALLTYPE
#else
#define CAPI DLL_PUBLIC CALLTYPE
#define CAPI(type) DLL_PUBLIC type CALLTYPE
#endif

#endif /*__WKHTMLTOPDF_DLLBEGIN__*/
46 changes: 23 additions & 23 deletions include/wkhtmltox/image.h
View file
Expand Up @@ -31,34 +31,34 @@ typedef void (*wkhtmltoimage_str_callback)(wkhtmltoimage_converter * converter,
typedef void (*wkhtmltoimage_int_callback)(wkhtmltoimage_converter * converter, const int val);
typedef void (*wkhtmltoimage_void_callback)(wkhtmltoimage_converter * converter);

CAPI int wkhtmltoimage_init(int use_graphics);
CAPI int wkhtmltoimage_deinit();
CAPI int wkhtmltoimage_extended_qt();
CAPI const char * wkhtmltoimage_version();
CAPI(int) wkhtmltoimage_init(int use_graphics);
CAPI(int) wkhtmltoimage_deinit();
CAPI(int) wkhtmltoimage_extended_qt();
CAPI(const char *) wkhtmltoimage_version();

CAPI wkhtmltoimage_global_settings * wkhtmltoimage_create_global_settings();
CAPI(wkhtmltoimage_global_settings *) wkhtmltoimage_create_global_settings();

CAPI int wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value);
CAPI int wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs);
CAPI(int) wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value);
CAPI(int) wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs);

CAPI wkhtmltoimage_converter * wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data);
CAPI void wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter);
CAPI(wkhtmltoimage_converter *) wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data);
CAPI(void) wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter);

CAPI void wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb);
CAPI void wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb);
CAPI void wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb);
CAPI void wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
CAPI void wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter);
/* CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */
/* CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */
CAPI(void) wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb);
CAPI(void) wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb);
CAPI(void) wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb);
CAPI(void) wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
CAPI(void) wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
CAPI(int) wkhtmltoimage_convert(wkhtmltoimage_converter * converter);
/* CAPI(void) wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */
/* CAPI(void) wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */

CAPI int wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter);
CAPI int wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter);
CAPI const char * wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase);
CAPI const char * wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter);
CAPI int wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter);
CAPI long wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char **);
CAPI(int) wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter);
CAPI(int) wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter);
CAPI(const char *) wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase);
CAPI(const char *) wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter);
CAPI(int) wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter);
CAPI(long) wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char **);

#include <wkhtmltox/dllend.inc>
#endif /*__IMAGE_H__*/
54 changes: 27 additions & 27 deletions include/wkhtmltox/pdf.h
View file
Expand Up @@ -34,40 +34,40 @@ typedef void (*wkhtmltopdf_str_callback)(wkhtmltopdf_converter * converter, cons
typedef void (*wkhtmltopdf_int_callback)(wkhtmltopdf_converter * converter, const int val);
typedef void (*wkhtmltopdf_void_callback)(wkhtmltopdf_converter * converter);

CAPI int wkhtmltopdf_init(int use_graphics);
CAPI int wkhtmltopdf_deinit();
CAPI int wkhtmltopdf_extended_qt();
CAPI const char * wkhtmltopdf_version();
CAPI(int) wkhtmltopdf_init(int use_graphics);
CAPI(int) wkhtmltopdf_deinit();
CAPI(int) wkhtmltopdf_extended_qt();
CAPI(const char *) wkhtmltopdf_version();

CAPI wkhtmltopdf_global_settings * wkhtmltopdf_create_global_settings();
CAPI wkhtmltopdf_object_settings * wkhtmltopdf_create_object_settings();
CAPI(wkhtmltopdf_global_settings *) wkhtmltopdf_create_global_settings();
CAPI(wkhtmltopdf_object_settings *) wkhtmltopdf_create_object_settings();

CAPI int wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, const char * name, const char * value);
CAPI int wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, const char * name, char * value, int vs);
CAPI int wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, const char * name, const char * value);
CAPI int wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, const char * name, char * value, int vs);
CAPI(int) wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, const char * name, const char * value);
CAPI(int) wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, const char * name, char * value, int vs);
CAPI(int) wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, const char * name, const char * value);
CAPI(int) wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, const char * name, char * value, int vs);


CAPI wkhtmltopdf_converter * wkhtmltopdf_create_converter(wkhtmltopdf_global_settings * settings);
CAPI void wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter);
CAPI(wkhtmltopdf_converter *) wkhtmltopdf_create_converter(wkhtmltopdf_global_settings * settings);
CAPI(void) wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter);

CAPI void wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb);
CAPI void wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb);
CAPI void wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_void_callback cb);
CAPI void wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb);
CAPI void wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb);
/* CAPI void wkhtmltopdf_begin_convertion(wkhtmltopdf_converter * converter); */
/* CAPI void wkhtmltopdf_cancel(wkhtmltopdf_converter * converter); */
CAPI int wkhtmltopdf_convert(wkhtmltopdf_converter * converter);
CAPI void wkhtmltopdf_add_object(
CAPI(void) wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb);
CAPI(void) wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb);
CAPI(void) wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_void_callback cb);
CAPI(void) wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb);
CAPI(void) wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb);
/* CAPI(void) wkhtmltopdf_begin_convertion(wkhtmltopdf_converter * converter); */
/* CAPI(void) wkhtmltopdf_cancel(wkhtmltopdf_converter * converter); */
CAPI(int) wkhtmltopdf_convert(wkhtmltopdf_converter * converter);
CAPI(void) wkhtmltopdf_add_object(
wkhtmltopdf_converter * converter, wkhtmltopdf_object_settings * setting, const char * data);

CAPI int wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter);
CAPI int wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter);
CAPI const char * wkhtmltopdf_phase_description(wkhtmltopdf_converter * converter, int phase);
CAPI const char * wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter);
CAPI int wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter);
CAPI long wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsigned char **);
CAPI(int) wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter);
CAPI(int) wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter);
CAPI(const char *) wkhtmltopdf_phase_description(wkhtmltopdf_converter * converter, int phase);
CAPI(const char *) wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter);
CAPI(int) wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter);
CAPI(long) wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsigned char **);

#include <wkhtmltox/dllend.inc>
#endif /*__PDF_H__*/
4 changes: 2 additions & 2 deletions src/lib/dllbegin.inc
View file
Expand Up @@ -46,9 +46,9 @@
#endif

#ifdef __cplusplus
#define CAPI extern "C" DLL_PUBLIC CALLTYPE
#define CAPI(type) extern "C" DLL_PUBLIC type CALLTYPE
#else
#define CAPI DLL_PUBLIC CALLTYPE
#define CAPI(type) DLL_PUBLIC type CALLTYPE
#endif

#endif /*__WKHTMLTOPDF_DLLBEGIN__*/
46 changes: 23 additions & 23 deletions src/lib/image.h
View file
Expand Up @@ -33,34 +33,34 @@ typedef void (*wkhtmltoimage_str_callback)(wkhtmltoimage_converter * converter,
typedef void (*wkhtmltoimage_int_callback)(wkhtmltoimage_converter * converter, const int val);
typedef void (*wkhtmltoimage_void_callback)(wkhtmltoimage_converter * converter);

CAPI int wkhtmltoimage_init(int use_graphics);
CAPI int wkhtmltoimage_deinit();
CAPI int wkhtmltoimage_extended_qt();
CAPI const char * wkhtmltoimage_version();
CAPI(int) wkhtmltoimage_init(int use_graphics);
CAPI(int) wkhtmltoimage_deinit();
CAPI(int) wkhtmltoimage_extended_qt();
CAPI(const char *)wkhtmltoimage_version();

CAPI wkhtmltoimage_global_settings * wkhtmltoimage_create_global_settings();
CAPI(wkhtmltoimage_global_settings *) wkhtmltoimage_create_global_settings();

CAPI int wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value);
CAPI int wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs);
CAPI(int) wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value);
CAPI(int) wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs);

CAPI wkhtmltoimage_converter * wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data);
CAPI void wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter);
CAPI(wkhtmltoimage_converter *) wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data);
CAPI(void) wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter);

CAPI void wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb);
CAPI void wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb);
CAPI void wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb);
CAPI void wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
CAPI void wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter);
/* CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */
/* CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */
CAPI(void) wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb);
CAPI(void) wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb);
CAPI(void) wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb);
CAPI(void) wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
CAPI(void) wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
CAPI(int) wkhtmltoimage_convert(wkhtmltoimage_converter * converter);
/* CAPI(void) wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */
/* CAPI(void) wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */

CAPI int wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter);
CAPI int wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter);
CAPI const char * wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase);
CAPI const char * wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter);
CAPI int wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter);
CAPI long wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char **);
CAPI(int) wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter);
CAPI(int) wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter);
CAPI(const char *) wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase);
CAPI(const char *) wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter);
CAPI(int) wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter);
CAPI(long) wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char **);

#include <wkhtmltox/dllend.inc>
#endif /*__IMAGE_H__*/

0 comments on commit af42daf

Please sign in to comment.