diff --git a/include/plutobook.h b/include/plutobook.h index 35705a1..eed27d4 100644 --- a/include/plutobook.h +++ b/include/plutobook.h @@ -236,14 +236,14 @@ PLUTOBOOK_API void plutobook_pdf_canvas_show_page(plutobook_canvas_t* canvas); typedef struct _plutobook_resource_data plutobook_resource_data_t; -PLUTOBOOK_API plutobook_resource_data_t* plutobook_resource_data_create(const char* mime_type, const char* text_encoding, const char* content, unsigned int content_length); +PLUTOBOOK_API plutobook_resource_data_t* plutobook_resource_data_create(const char* content, unsigned int content_length, const char* mime_type, const char* text_encoding); PLUTOBOOK_API plutobook_resource_data_t* plutobook_resource_data_reference(plutobook_resource_data_t* resource); PLUTOBOOK_API void plutobook_resource_data_destroy(plutobook_resource_data_t* resource); PLUTOBOOK_API unsigned int plutobook_resource_data_get_reference_count(const plutobook_resource_data_t* resource); -PLUTOBOOK_API const char* plutobook_resource_data_get_mime_type(const plutobook_resource_data_t* resource); -PLUTOBOOK_API const char* plutobook_resource_data_get_text_encoding(const plutobook_resource_data_t* resource); PLUTOBOOK_API const char* plutobook_resource_data_get_content(const plutobook_resource_data_t* resource); PLUTOBOOK_API unsigned int plutobook_resource_data_get_content_length(const plutobook_resource_data_t* resource); +PLUTOBOOK_API const char* plutobook_resource_data_get_mime_type(const plutobook_resource_data_t* resource); +PLUTOBOOK_API const char* plutobook_resource_data_get_text_encoding(const plutobook_resource_data_t* resource); typedef plutobook_resource_data_t* (*plutobook_resource_load_callback_t)(void* closure, const char* url); @@ -278,8 +278,8 @@ PLUTOBOOK_API plutobook_media_type_t plutobook_get_media_type(const plutobook_t* PLUTOBOOK_API unsigned int plutobook_get_page_count(const plutobook_t* book); PLUTOBOOK_API plutobook_status_t plutobook_load_url(plutobook_t* book, const char* url, const char* user_style, const char* user_script); -PLUTOBOOK_API plutobook_status_t plutobook_load_data(plutobook_t* book, const char* data, unsigned int size, const char* mime_type, const char* text_encoding, const char* user_style, const char* user_script, const char* base_url); -PLUTOBOOK_API plutobook_status_t plutobook_load_image(plutobook_t* book, const char* data, unsigned int size, const char* mime_type, const char* text_encoding, const char* user_style, const char* user_script, const char* base_url); +PLUTOBOOK_API plutobook_status_t plutobook_load_data(plutobook_t* book, const char* data, unsigned int length, const char* mime_type, const char* text_encoding, const char* user_style, const char* user_script, const char* base_url); +PLUTOBOOK_API plutobook_status_t plutobook_load_image(plutobook_t* book, const char* data, unsigned int length, const char* mime_type, const char* text_encoding, const char* user_style, const char* user_script, const char* base_url); PLUTOBOOK_API plutobook_status_t plutobook_load_xml(plutobook_t* book, const char* data, int length, const char* user_style, const char* user_script, const char* base_url); PLUTOBOOK_API plutobook_status_t plutobook_load_html(plutobook_t* book, const char* data, int length, const char* user_style, const char* user_script, const char* base_url); diff --git a/source/plutobook.cc b/source/plutobook.cc index 9432421..07cae23 100644 --- a/source/plutobook.cc +++ b/source/plutobook.cc @@ -237,7 +237,7 @@ struct _plutobook_resource_data { char* content; }; -plutobook_resource_data_t* plutobook_resource_data_create(const char* mime_type, const char* text_encoding, const char* content, unsigned int content_length) +plutobook_resource_data_t* plutobook_resource_data_create(const char* content, unsigned int content_length, const char* mime_type, const char* text_encoding) { auto mime_type_length = std::strlen(mime_type) + 1ul; auto text_encoding_length = std::strlen(text_encoding) + 1ul; @@ -279,32 +279,32 @@ unsigned int plutobook_resource_data_get_reference_count(const plutobook_resourc return resource->ref_count; } -const char* plutobook_resource_data_get_mime_type(const plutobook_resource_data_t* resource) +const char* plutobook_resource_data_get_content(const plutobook_resource_data_t* resource) { if(resource == nullptr) return nullptr; - return resource->mime_type; + return resource->content; } -const char* plutobook_resource_data_get_text_encoding(const plutobook_resource_data_t* resource) +unsigned int plutobook_resource_data_get_content_length(const plutobook_resource_data_t* resource) { if(resource == nullptr) - return nullptr; - return resource->text_encoding; + return 0; + return resource->content_length; } -const char* plutobook_resource_data_get_content(const plutobook_resource_data_t* resource) +const char* plutobook_resource_data_get_mime_type(const plutobook_resource_data_t* resource) { if(resource == nullptr) return nullptr; - return resource->content; + return resource->mime_type; } -unsigned int plutobook_resource_data_get_content_length(const plutobook_resource_data_t* resource) +const char* plutobook_resource_data_get_text_encoding(const plutobook_resource_data_t* resource) { if(resource == nullptr) - return 0; - return resource->content_length; + return nullptr; + return resource->text_encoding; } plutobook_resource_data_t* plutobook_default_resource_fetcher_load_url(const char* url) @@ -314,7 +314,7 @@ plutobook_resource_data_t* plutobook_default_resource_fetcher_load_url(const cha std::vector content; if(!plutobook::Book::defaultResourceFetcher()->loadUrl(url, mimeType, textEncoding, content)) return nullptr; - return plutobook_resource_data_create(mimeType.data(), textEncoding.data(), content.data(), content.size()); + return plutobook_resource_data_create(content.data(), content.size(), mimeType.data(), textEncoding.data()); } namespace {