Typedef hd_wchar_t

Author: sjw

include/hdtd/system.h

@@ -26,6 +26,8 @@
 #include "memento.h"
 #define nelem(x) (sizeof(x)/sizeof((x)[0]))
 
+typedef unsigned short hd_wchar_t;
+
 #if defined(_MSC_VER) && (_MSC_VER < 1700) /* MSVC older than VS2012 */
 typedef signed char int8_t;
 typedef short int int16_t;

main.c

@@ -1,24 +1,6 @@
 #include "hdtd.h"
-#include <ctype.h>
-//============ patch get first char
-static unsigned patch_get_first_char(wchar_t *unicode) {
-    char buf[4];
-    wchar_t wc = unicode[0];
-    //Is it a letter?
-    if ((wc >= 'a' && wc <= 'z') || (wc >= 'A' && wc <= 'Z'))
-        wc = toupper(unicode[0]);
-
-    int size = wctomb(buf, wc);
-    //int size=wctomb(buf,toupper(unicode[0]));
-    if (size > 0) {
-        return (unsigned char)buf[0];
-    }
-    else {
-        return toupper(unicode[0]);
-    }
-}
 //================ patch unicode to utf8 ==================
-static int to_utf8(char *buf, wchar_t c, int buf_size) {
+static int to_utf8(char *buf, hd_wchar_t c, int buf_size) {
     int size = 0;
     //0x0000-0x007f
     if (c < 0x80) {
@@ -73,7 +55,7 @@ static int to_utf8(char *buf, wchar_t c, int buf_size) {
 
     return size;
 }
-static int unicode_to_utf8(char *buf, wchar_t *unicode, int buf_size) {
+static int unicode_to_utf8(char *buf, hd_wchar_t *unicode, int buf_size) {
     char *p = buf;
     int total_size = 0;
     //Used to store'\0'
@@ -115,33 +97,33 @@ int main() {
 
     /* Open the document. */
     hd_try(ctx)
-        doc = hd_open_document(ctx, "F:/pdf/file98.pdf");
+        doc = hd_open_document(ctx, "/Users/sjw/Documents/debugfile/f0711656.pdf");
     hd_catch(ctx) {
         fprintf(stderr, "cannot open document: %s\n", hd_caught_message(ctx));
         hd_drop_context(ctx);
         return EXIT_FAILURE;
     }
-    hd_page *page;
-    hd_try(ctx)
-        page = hd_load_page(ctx, doc, 0);
-    hd_catch(ctx) {
-        fprintf(stderr, "cannot load page: %s\n", hd_caught_message(ctx));
-        hd_drop_context(ctx);
-        return EXIT_FAILURE;
-    }
+
+    hd_page *page = hd_load_page(ctx, doc, 0);
     char buf[512] = {0};
 
     hd_try(ctx)
     {
         hd_run_page_contents(ctx, page, buf);
         unsigned char filenameUtf8[128];
         memset(filenameUtf8, 0, 128);
-        unicode_to_utf8(filenameUtf8, buf, 32);
-        FILE *fp;
+		unsigned int len;
+		len = (ctx->flush_size > 32) ? 32 : ctx->flush_size;
+		if (len > 0)
+		{
+			unicode_to_utf8(filenameUtf8, (hd_wchar_t* )buf, len);
+			FILE *fp;
+
+			fp=fopen("/Users/sjw/Documents/debugfile/test.txt","a+");
+			fprintf(fp,"%s",filenameUtf8);
+			fclose(fp);
+		}
 
-        fp=fopen("F:/test.txt","a+");
-        fprintf(fp,"%s",filenameUtf8);
-        fclose(fp);
     }
     hd_catch(ctx)
     {
@@ -153,5 +135,4 @@ int main() {
     hd_drop_document(ctx, doc);
     hd_drop_context(ctx);
     printf("hd_new_context is end\n");
-    return 0;
 }

source/pdf/pdf-op-run.c

@@ -37,7 +37,7 @@ pdf_show_char(hd_context *ctx, pdf_run_processor *pr, int cid)
 
 	if ((ctx->flush_size < 62) && cid > 0 && ucslen > 0)
 	{
-		wchar_t *wc = (wchar_t *)&ucsbuf[0];
+		hd_wchar_t *wc = (hd_wchar_t *)&ucsbuf[0];
 		switch (*wc)
 		{
 			case '/':
@@ -57,14 +57,14 @@ pdf_show_char(hd_context *ctx, pdf_run_processor *pr, int cid)
 					 || (*wc >= 'A' && *wc <= 'Z')
 					 || (*wc >= '0' && *wc <= '9')))
 				{
-					memcpy(ctx->contents + ctx->flush_size, (wchar_t *)&ucsbuf[0], 2);
+					memcpy(ctx->contents + ctx->flush_size, (hd_wchar_t *)&ucsbuf[0], 2);
 					ctx->flush_size += 2;
 				}
 				else if (isunicode)
 				{
 					if (*wc >= 0x4e00 && *wc <= 0x9fa5)
 					{
-						memcpy(ctx->contents + ctx->flush_size, (wchar_t *)&ucsbuf[0], 2);
+						memcpy(ctx->contents + ctx->flush_size, (hd_wchar_t *)&ucsbuf[0], 2);
 						ctx->flush_size += 2;
 					}
 				}