diff options
| author | Robin Watts <robin.watts@artifex.com> | 2015-02-25 18:23:49 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2015-02-25 18:34:37 +0000 |
| commit | 76dff1dc896a57c9daa96df3177884f59f8cee6c (patch) | |
| tree | eeb31d2359b0ebd3b58e3a67434101ee291187ae /platform/x11 | |
| parent | 92770188d52bed40b9d370fae571897c2b469293 (diff) | |
| download | mupdf-76dff1dc896a57c9daa96df3177884f59f8cee6c.tar.xz | |
Add 64 bit windows builds to MSVC solution.
A few casts are required within the code, along with a few #ifdef
changes.
Some tweaks to curl are required too.
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/curl_stream.c | 16 | ||||
| -rw-r--r-- | platform/x11/pdfapp.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/platform/x11/curl_stream.c b/platform/x11/curl_stream.c index 07464d27..d2ddcbb3 100644 --- a/platform/x11/curl_stream.c +++ b/platform/x11/curl_stream.c @@ -17,7 +17,7 @@ #define BLOCK_SHIFT 20 #define BLOCK_SIZE (1<<BLOCK_SHIFT) -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) #include <windows.h> #else #include "pthread.h" @@ -49,7 +49,7 @@ struct curl_stream_state_s unsigned char public_buffer[4096]; -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) void *thread; DWORD thread_id; HANDLE mutex; @@ -61,7 +61,7 @@ struct curl_stream_state_s static void fetcher_thread(curl_stream_state *state); -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) static void lock(curl_stream_state *state) { @@ -113,7 +113,7 @@ static size_t header_arrived(void *ptr, size_t size, size_t nmemb, void *state_) if (strncmp(ptr, "Content-Range:", 14) == 0) { char *p = (char *)ptr; - int len = nmemb * size; + int len = (int)(nmemb * size); int start, end, total; while (len && !isdigit(*p)) p++, len--; @@ -208,7 +208,7 @@ static size_t data_arrived(void *ptr, size_t size, size_t nmemb, void *state_) } if (state->content_length < 0) { - int newsize = state->current_fill_point + size; + int newsize = (int)(state->current_fill_point + size); if (newsize > state->buffer_max) { /* Expand the buffer */ @@ -228,7 +228,7 @@ static size_t data_arrived(void *ptr, size_t size, size_t nmemb, void *state_) DEBUG_MESSAGE((state->ctx, "data arrived: offset=%d len=%d", state->current_fill_point, (int) size)); old_start = state->current_fill_point; memcpy(state->buffer + state->current_fill_point, ptr, size); - state->current_fill_point += size; + state->current_fill_point += (int)size; if (state->current_fill_point == state->content_length || (((state->current_fill_point ^ old_start) & ~(BLOCK_SIZE-1)) != 0)) { @@ -432,7 +432,7 @@ stream_close(fz_context *ctx, void *state_) state->kill_thread = 1; unlock(state); -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) WaitForSingleObject(state->thread, INFINITE); CloseHandle(state->thread); CloseHandle(state->mutex); @@ -523,7 +523,7 @@ fz_stream *fz_stream_from_curl(fz_context *ctx, char *filename, void (*more_data curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, header_arrived); -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) state->mutex = CreateMutex(NULL, FALSE, NULL); if (state->mutex == NULL) fz_throw(ctx, FZ_ERROR_GENERIC, "mutex creation failed"); diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c index 90e10f83..c27934e6 100644 --- a/platform/x11/pdfapp.c +++ b/platform/x11/pdfapp.c @@ -117,7 +117,7 @@ void pdfapp_init(fz_context *ctx, pdfapp_t *app) app->ctx = ctx; app->transition.duration = 0.25; app->transition.type = FZ_TRANSITION_FADE; -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) app->colorspace = fz_device_bgr(ctx); #else app->colorspace = fz_device_rgb(ctx); @@ -1740,7 +1740,7 @@ void pdfapp_oncopy(pdfapp_t *app, unsigned short *ucsbuf, int ucslen) if (need_newline) { -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) if (p < ucslen - 1) ucsbuf[p++] = '\r'; #endif |