From e480b04449d1c423799d38258a26cdebbb8015ec Mon Sep 17 00:00:00 2001 From: draekko Date: Sat, 21 Nov 2015 12:56:39 -0500 Subject: [PATCH] == 2015/11/21 == added support for android, modified HPDF_TRACE, fixed some warning on android compilation. --- include/hpdf_conf.h | 7 +- include/hpdf_types.h | 10 +- include/hpdf_utils.h | 17 +++- src/hpdf_3dmeasure.c | 4 +- src/hpdf_annotation.c | 86 +++++++++--------- src/hpdf_array.c | 40 ++++---- src/hpdf_catalog.c | 6 +- src/hpdf_destination.c | 18 ++-- src/hpdf_dict.c | 12 +-- src/hpdf_doc.c | 130 +++++++++++++------------- src/hpdf_doc_png.c | 8 +- src/hpdf_encoder.c | 52 +++++------ src/hpdf_encoder_utf.c | 6 +- src/hpdf_encrypt.c | 46 +++++----- src/hpdf_encryptdict.c | 12 +-- src/hpdf_error.c | 8 +- src/hpdf_exdata.c | 2 +- src/hpdf_ext_gstate.c | 2 +- src/hpdf_font.c | 24 ++--- src/hpdf_font_cid.c | 14 +-- src/hpdf_font_tt.c | 14 +-- src/hpdf_font_type1.c | 12 +-- src/hpdf_fontdef.c | 6 +- src/hpdf_fontdef_cid.c | 12 +-- src/hpdf_fontdef_cns.c | 4 +- src/hpdf_fontdef_cnt.c | 2 +- src/hpdf_fontdef_jp.c | 8 +- src/hpdf_fontdef_kr.c | 8 +- src/hpdf_fontdef_tt.c | 192 +++++++++++++++++++-------------------- src/hpdf_fontdef_type1.c | 22 ++--- src/hpdf_image.c | 22 ++--- src/hpdf_image_ccitt.c | 4 +- src/hpdf_image_png.c | 8 +- src/hpdf_info.c | 6 +- src/hpdf_list.c | 27 +++--- src/hpdf_mmgr.c | 18 ++-- src/hpdf_namedict.c | 4 +- src/hpdf_objects.c | 33 +++++-- src/hpdf_outline.c | 28 +++--- src/hpdf_page_label.c | 2 +- src/hpdf_page_operator.c | 124 ++++++++++++------------- src/hpdf_pages.c | 168 +++++++++++++++++----------------- src/hpdf_streams.c | 68 +++++++------- src/hpdf_string.c | 8 +- src/hpdf_u3d.c | 48 +++++----- src/hpdf_xref.c | 16 ++-- 46 files changed, 706 insertions(+), 662 deletions(-) diff --git a/include/hpdf_conf.h b/include/hpdf_conf.h index d25b464..00cc8db 100644 --- a/include/hpdf_conf.h +++ b/include/hpdf_conf.h @@ -20,6 +20,7 @@ #include #include + #if defined(_MSC_VER) #ifndef _USE_MATH_DEFINES #define _USE_MATH_DEFINES 1 @@ -46,7 +47,11 @@ #define HPDF_FREE free #define HPDF_FILEP FILE* #define HPDF_TIME time -#define HPDF_PRINTF printf +#ifdef __ANDROID__ +#define HPDF_PRINTF(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__) +#else +#define HPDF_PRINTF(...) printf(__VA_ARGS__) +#endif #define HPDF_SIN sin #define HPDF_COS cos diff --git a/include/hpdf_types.h b/include/hpdf_types.h index a35fe8f..a2d05ee 100644 --- a/include/hpdf_types.h +++ b/include/hpdf_types.h @@ -31,6 +31,9 @@ #endif #include +#ifdef __ANDROID64__ +#include +#endif #ifdef __cplusplus extern "C" { @@ -87,6 +90,11 @@ typedef signed int HPDF_BOOL; */ typedef unsigned long HPDF_STATUS; +#ifdef __ANDROID64__ +/* + */ +typedef uintptr_t HPDF_UINTPTR; +#endif /* charactor-code type (16bit) */ @@ -285,7 +293,7 @@ typedef struct _HPDF_CMYKColor { typedef enum _HPDF_LineCap { HPDF_BUTT_END = 0, HPDF_ROUND_END, - HPDF_PROJECTING_SCUARE_END, + HPDF_PROJECTING_SQUARE_END, HPDF_LINECAP_EOF } HPDF_LineCap; diff --git a/include/hpdf_utils.h b/include/hpdf_utils.h index 9028004..7cb7f0e 100644 --- a/include/hpdf_utils.h +++ b/include/hpdf_utils.h @@ -20,6 +20,9 @@ #include "hpdf_config.h" #include "hpdf_types.h" +#ifdef __ANDROID__ +#include +#endif #ifdef __cplusplus extern "C" { @@ -150,9 +153,19 @@ HPDF_UInt16Swap (HPDF_UINT16 *value); #endif /* LIBHPDF_DEBUG_TRACE */ #ifdef HPDF_PTRACE_ON -#define HPDF_PTRACE(ARGS) HPDF_PRINTF ARGS +#ifdef __ANDROID__ +#define LOG_TAG "HPDF_LOG" +#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__) +#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) +#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__) +#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) +#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__) +#define HPDF_PTRACE(...) LOGV(__VA_ARGS__) +#else +#define HPDF_PTRACE(...) HPDF_PRINTF (__VA_ARGS__) +#endif #else -#define HPDF_PTRACE(ARGS) /* do nothing */ +#define HPDF_PTRACE(...) /* do nothing */ #endif /* HPDF_PTRACE */ #ifdef LIBHPDF_DEBUG diff --git a/src/hpdf_3dmeasure.c b/src/hpdf_3dmeasure.c index aaa1e81..b30268d 100644 --- a/src/hpdf_3dmeasure.c +++ b/src/hpdf_3dmeasure.c @@ -57,7 +57,7 @@ HPDF_3DC3DMeasure_New(HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_3DC3DMeasure_New\n")); + HPDF_PTRACE (" HPDF_3DC3DMeasure_New\n"); measure = HPDF_Dict_New (mmgr); if (!measure) @@ -200,7 +200,7 @@ HPDF_PD33DMeasure_New(HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; HPDF_String s; - HPDF_PTRACE((" HPDF_3DC3DMeasure_New\n")); + HPDF_PTRACE (" HPDF_3DC3DMeasure_New\n"); measure = HPDF_Dict_New (mmgr); if (!measure) diff --git a/src/hpdf_annotation.c b/src/hpdf_annotation.c index 4bb9e13..65905e2 100644 --- a/src/hpdf_annotation.c +++ b/src/hpdf_annotation.c @@ -1,6 +1,4 @@ /* - * << Haru Free PDF Library >> -- hpdf_annotation.c - * * URL: http://libharu.org * * Copyright (c) 1999-2006 Takeshi Kanno @@ -117,7 +115,7 @@ HPDF_Annotation_New (HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; HPDF_REAL tmp; - HPDF_PTRACE((" HPDF_Annotation_New\n")); + HPDF_PTRACE (" HPDF_Annotation_New\n"); annot = HPDF_Dict_New (mmgr); if (!annot) @@ -169,7 +167,7 @@ HPDF_Annotation_SetBorderStyle (HPDF_Annotation annot, HPDF_Array dash; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_Annotation_SetBoderStyle\n")); + HPDF_PTRACE (" HPDF_Annotation_SetBoderStyle\n"); bs = HPDF_Dict_New (annot->mmgr); if (!bs) @@ -230,7 +228,7 @@ HPDF_WidgetAnnot_New (HPDF_MMgr mmgr, { HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_WidgetAnnot_New\n")); + HPDF_PTRACE (" HPDF_WidgetAnnot_New\n"); annot = HPDF_Annotation_New (mmgr, xref, HPDF_ANNOT_WIDGET, rect); if (!annot) @@ -247,7 +245,7 @@ HPDF_LinkAnnot_New (HPDF_MMgr mmgr, { HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_LinkAnnot_New\n")); + HPDF_PTRACE (" HPDF_LinkAnnot_New\n"); annot = HPDF_Annotation_New (mmgr, xref, HPDF_ANNOT_LINK, rect); if (!annot) @@ -273,7 +271,7 @@ HPDF_URILinkAnnot_New (HPDF_MMgr mmgr, HPDF_Dict action; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_URILinkAnnot_New\n")); + HPDF_PTRACE (" HPDF_URILinkAnnot_New\n"); annot = HPDF_Annotation_New (mmgr, xref, HPDF_ANNOT_LINK, rect); if (!annot) @@ -304,7 +302,7 @@ HPDF_LinkAnnot_SetJavaScript(HPDF_Annotation annot, HPDF_JavaScript javascript) HPDF_Dict action; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_LinkAnnot_SetJavaScript\n")); + HPDF_PTRACE (" HPDF_LinkAnnot_SetJavaScript\n"); if (!CheckSubType (annot, HPDF_ANNOT_LINK)) return HPDF_INVALID_ANNOTATION; @@ -336,7 +334,7 @@ HPDF_LinkAnnot_SetBorderStyle (HPDF_Annotation annot, HPDF_Array array; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_LinkAnnot_SetBorderStyle\n")); + HPDF_PTRACE (" HPDF_LinkAnnot_SetBorderStyle\n"); if (!CheckSubType (annot, HPDF_ANNOT_LINK)) return HPDF_INVALID_ANNOTATION; @@ -382,7 +380,7 @@ HPDF_LinkAnnot_SetHighlightMode (HPDF_Annotation annot, { HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_LinkAnnot_SetHighlightMode\n")); + HPDF_PTRACE (" HPDF_LinkAnnot_SetHighlightMode\n"); if (!CheckSubType (annot, HPDF_ANNOT_LINK)) return HPDF_INVALID_ANNOTATION; @@ -423,7 +421,7 @@ HPDF_3DAnnot_New (HPDF_MMgr mmgr, HPDF_Dict action, appearance, stream; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_3DAnnot_New\n")); + HPDF_PTRACE (" HPDF_3DAnnot_New\n"); annot = HPDF_Annotation_New (mmgr, xref, HPDF_ANNOT_3D, rect); if (!annot) { @@ -512,7 +510,7 @@ HPDF_MarkupAnnot_New (HPDF_MMgr mmgr, HPDF_Annotation annot; HPDF_String s; - HPDF_PTRACE((" HPDF_MarkupAnnot_New\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_New\n"); annot = HPDF_Annotation_New (mmgr, xref, subtype, rect); if (!annot) @@ -534,7 +532,7 @@ HPDF_Annot_SetRGBColor (HPDF_Annotation annot, HPDF_RGBColor color) HPDF_Array cArray; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Annot_SetRGBColor\n")); + HPDF_PTRACE (" HPDF_Annot_SetRGBColor\n"); cArray = HPDF_Array_New ( annot->mmgr); if (!cArray) @@ -557,7 +555,7 @@ HPDF_Annot_SetCMYKColor (HPDF_Annotation annot, HPDF_CMYKColor color) HPDF_Array cArray; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Annot_SetCMYKColor\n")); + HPDF_PTRACE (" HPDF_Annot_SetCMYKColor\n"); cArray = HPDF_Array_New (annot->mmgr); if (!cArray) @@ -581,7 +579,7 @@ HPDF_Annot_SetGrayColor (HPDF_Annotation annot, HPDF_REAL color) HPDF_Array cArray; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Annot_SetGrayColor\n")); + HPDF_PTRACE (" HPDF_Annot_SetGrayColor\n"); cArray = HPDF_Array_New (annot->mmgr); if (!cArray) @@ -602,7 +600,7 @@ HPDF_Annot_SetNoColor (HPDF_Annotation annot) HPDF_Array cArray; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Annot_SetNoColor\n")); + HPDF_PTRACE (" HPDF_Annot_SetNoColor\n"); cArray = HPDF_Array_New (annot->mmgr); if (!cArray) @@ -617,7 +615,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_TextAnnot_SetIcon (HPDF_Annotation annot, HPDF_AnnotIcon icon) { - HPDF_PTRACE((" HPDF_TextAnnot_SetIcon\n")); + HPDF_PTRACE (" HPDF_TextAnnot_SetIcon\n"); if (!CheckSubType (annot, HPDF_ANNOT_TEXT_NOTES)) return HPDF_INVALID_ANNOTATION; @@ -640,7 +638,7 @@ HPDF_TextAnnot_SetOpened (HPDF_Annotation annot, { HPDF_Boolean b; - HPDF_PTRACE((" HPDF_TextAnnot_SetOpend\n")); + HPDF_PTRACE (" HPDF_TextAnnot_SetOpend\n"); if (!CheckSubType (annot, HPDF_ANNOT_TEXT_NOTES)) return HPDF_INVALID_ANNOTATION; @@ -658,7 +656,7 @@ HPDF_PopupAnnot_SetOpened (HPDF_Annotation annot, { HPDF_Boolean b; - HPDF_PTRACE((" HPDF_TextAnnot_SetOpend\n")); + HPDF_PTRACE (" HPDF_TextAnnot_SetOpend\n"); if (!CheckSubType (annot, HPDF_ANNOT_POPUP)) return HPDF_INVALID_ANNOTATION; @@ -673,7 +671,7 @@ HPDF_PopupAnnot_SetOpened (HPDF_Annotation annot, HPDF_EXPORT(HPDF_STATUS) HPDF_MarkupAnnot_SetTitle (HPDF_Annotation annot, const char* name) { - HPDF_PTRACE((" HPDF_MarkupAnnot_SetTitle\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetTitle\n"); return HPDF_Dict_Add( annot, "T", HPDF_String_New( annot->mmgr, name, NULL)); } @@ -681,7 +679,7 @@ HPDF_MarkupAnnot_SetTitle (HPDF_Annotation annot, const char* name) HPDF_EXPORT(HPDF_STATUS) HPDF_MarkupAnnot_SetSubject (HPDF_Annotation annot, const char* name) { - HPDF_PTRACE((" HPDF_MarkupAnnot_SetSubject\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetSubject\n"); return HPDF_Dict_Add( annot, "Subj", HPDF_String_New( annot->mmgr, name, NULL)); } @@ -689,7 +687,7 @@ HPDF_MarkupAnnot_SetSubject (HPDF_Annotation annot, const char* name) HPDF_EXPORT(HPDF_STATUS) HPDF_MarkupAnnot_SetCreationDate (HPDF_Annotation annot, HPDF_Date value) { - HPDF_PTRACE((" HPDF_MarkupAnnot_SetCreationDate\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetCreationDate\n"); return HPDF_Info_SetInfoDateAttr( annot, HPDF_INFO_CREATION_DATE, value); } @@ -697,7 +695,7 @@ HPDF_MarkupAnnot_SetCreationDate (HPDF_Annotation annot, HPDF_Date value) HPDF_EXPORT(HPDF_STATUS) HPDF_MarkupAnnot_SetTransparency (HPDF_Annotation annot, HPDF_REAL value) { - HPDF_PTRACE((" HPDF_MarkupAnnot_SetTransparency\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetTransparency\n"); return HPDF_Dict_AddReal( annot, "CA", value); } @@ -706,7 +704,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_MarkupAnnot_SetIntent (HPDF_Annotation annot, HPDF_AnnotIntent intent) { - HPDF_PTRACE((" HPDF_MarkupAnnot_SetIntent\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetIntent\n"); if (HPDF_Dict_AddName (annot, "IT", HPDF_ANNOT_INTENT_NAMES[(HPDF_INT)intent]) != HPDF_OK) @@ -719,7 +717,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_MarkupAnnot_SetPopup (HPDF_Annotation annot, HPDF_Annotation popup) { - HPDF_PTRACE((" HPDF_MarkupAnnot_SetPopup\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetPopup\n"); return HPDF_Dict_Add( annot, "Popup", popup); } @@ -730,7 +728,7 @@ HPDF_MarkupAnnot_SetInteriorRGBColor (HPDF_Annotation annot, HPDF_RGBColor colo HPDF_Array cArray; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_MarkupAnnot_SetInteriorRGBColor\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetInteriorRGBColor\n"); cArray = HPDF_Array_New ( annot->mmgr); if (!cArray) @@ -753,7 +751,7 @@ HPDF_MarkupAnnot_SetInteriorCMYKColor (HPDF_Annotation annot, HPDF_CMYKColor co HPDF_Array cArray; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_MarkupAnnot_SetInteriorCMYKColor\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetInteriorCMYKColor\n"); cArray = HPDF_Array_New ( annot->mmgr); if (!cArray) @@ -777,7 +775,7 @@ HPDF_MarkupAnnot_SetInteriorGrayColor (HPDF_Annotation annot, HPDF_REAL color)/ HPDF_Array cArray; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_MarkupAnnot_SetInteriorGrayColor\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetInteriorGrayColor\n"); cArray = HPDF_Array_New ( annot->mmgr); if (!cArray) @@ -798,7 +796,7 @@ HPDF_MarkupAnnot_SetInteriorTransparent (HPDF_Annotation annot) /* IC with No C HPDF_Array cArray; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_MarkupAnnot_SetInteriorTransparent\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetInteriorTransparent\n"); cArray = HPDF_Array_New ( annot->mmgr); if (!cArray) @@ -812,7 +810,7 @@ HPDF_MarkupAnnot_SetInteriorTransparent (HPDF_Annotation annot) /* IC with No C HPDF_BOOL HPDF_Annotation_Validate (HPDF_Annotation annot) { - HPDF_PTRACE((" HPDF_Annotation_Validate\n")); + HPDF_PTRACE (" HPDF_Annotation_Validate\n"); if (!annot) return HPDF_FALSE; @@ -830,7 +828,7 @@ CheckSubType (HPDF_Annotation annot, { HPDF_Name subtype; - HPDF_PTRACE((" HPDF_Annotation_CheckSubType\n")); + HPDF_PTRACE (" HPDF_Annotation_CheckSubType\n"); if (!HPDF_Annotation_Validate (annot)) return HPDF_FALSE; @@ -876,7 +874,7 @@ HPDF_PopupAnnot_New (HPDF_MMgr mmgr, { HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_PopupAnnot_New\n")); + HPDF_PTRACE (" HPDF_PopupAnnot_New\n"); annot = HPDF_Annotation_New (mmgr, xref, HPDF_ANNOT_POPUP, rect); if (!annot) @@ -898,7 +896,7 @@ HPDF_StampAnnot_New (HPDF_MMgr mmgr, { HPDF_Annotation annot; HPDF_String s; - HPDF_PTRACE((" HPDF_StampAnnot_New\n")); + HPDF_PTRACE (" HPDF_StampAnnot_New\n"); annot = HPDF_Annotation_New (mmgr, xref, HPDF_ANNOT_STAMP, rect); if (!annot) @@ -926,7 +924,7 @@ HPDF_ProjectionAnnot_New(HPDF_MMgr mmgr, { HPDF_Annotation annot; HPDF_String s; - HPDF_PTRACE((" HPDF_StampAnnot_New\n")); + HPDF_PTRACE (" HPDF_StampAnnot_New\n"); annot = HPDF_Annotation_New (mmgr, xref, HPDF_ANNOT_PROJECTION, rect); if (!annot) @@ -949,7 +947,7 @@ HPDF_TextMarkupAnnot_SetQuadPoints ( HPDF_Annotation annot, HPDF_Point lb, HPDF_ HPDF_Array quadPoints; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_TextMarkupAnnot_SetQuadPoints\n")); + HPDF_PTRACE (" HPDF_TextMarkupAnnot_SetQuadPoints\n"); quadPoints = HPDF_Array_New ( annot->mmgr); if ( !quadPoints) @@ -979,7 +977,7 @@ HPDF_FreeTextAnnot_SetLineEndingStyle (HPDF_Annotation annot, HPDF_LineAnnotEndi HPDF_Array lineEndStyles; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_FreeTextAnnot_SetLineEndingStyle\n")); + HPDF_PTRACE (" HPDF_FreeTextAnnot_SetLineEndingStyle\n"); lineEndStyles = HPDF_Array_New ( annot->mmgr); if ( !lineEndStyles) @@ -1004,7 +1002,7 @@ HPDF_MarkupAnnot_SetRectDiff (HPDF_Annotation annot, HPDF_Rect rect) /* RD ent HPDF_STATUS ret = HPDF_OK; HPDF_REAL tmp; - HPDF_PTRACE((" HPDF_MarkupAnnot_SetRectDiff\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetRectDiff\n"); array = HPDF_Array_New ( annot->mmgr); if ( !array) @@ -1037,7 +1035,7 @@ HPDF_FreeTextAnnot_SetDefaultStyle (HPDF_Annotation annot, HPDF_String s; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_FreeTextAnnot_SetDefaultStyle\n")); + HPDF_PTRACE (" HPDF_FreeTextAnnot_SetDefaultStyle\n"); s = HPDF_String_New ( annot->mmgr, style, NULL); if ( !s) @@ -1054,7 +1052,7 @@ HPDF_FreeTextAnnot_Set3PointCalloutLine ( HPDF_Annotation annot, HPDF_Point star HPDF_Array clPoints; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_FreeTextAnnot_Set3PointCalloutLine\n")); + HPDF_PTRACE (" HPDF_FreeTextAnnot_Set3PointCalloutLine\n"); clPoints = HPDF_Array_New ( annot->mmgr); if ( !clPoints) @@ -1082,7 +1080,7 @@ HPDF_FreeTextAnnot_Set2PointCalloutLine ( HPDF_Annotation annot, HPDF_Point star HPDF_Array clPoints; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_FreeTextAnnot_Set3PointCalloutLine\n")); + HPDF_PTRACE (" HPDF_FreeTextAnnot_Set3PointCalloutLine\n"); clPoints = HPDF_Array_New ( annot->mmgr); if ( !clPoints) @@ -1108,7 +1106,7 @@ HPDF_MarkupAnnot_SetCloudEffect (HPDF_Annotation annot, HPDF_INT cloudIntensity HPDF_Dict borderEffect; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_MarkupAnnot_SetCloudEffect\n")); + HPDF_PTRACE (" HPDF_MarkupAnnot_SetCloudEffect\n"); borderEffect = HPDF_Dict_New ( annot->mmgr); if (!borderEffect) @@ -1133,7 +1131,7 @@ HPDF_LineAnnot_SetPosition (HPDF_Annotation annot, HPDF_Array lineEndStyles; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_LineAnnot_SetPosition\n")); + HPDF_PTRACE (" HPDF_LineAnnot_SetPosition\n"); lineEndPoints = HPDF_Array_New ( annot->mmgr); if ( !lineEndPoints) @@ -1171,7 +1169,7 @@ HPDF_LineAnnot_SetLeader (HPDF_Annotation annot, HPDF_INT leaderLen, HPDF_INT le { HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_LineAnnot_SetLeader\n")); + HPDF_PTRACE (" HPDF_LineAnnot_SetLeader\n"); ret += HPDF_Dict_AddNumber ( annot, "LL", leaderLen); ret += HPDF_Dict_AddNumber ( annot, "LLE", leaderExtLen); @@ -1188,7 +1186,7 @@ HPDF_LineAnnot_SetCaption (HPDF_Annotation annot, HPDF_BOOL showCaption, HPDF_Li { HPDF_STATUS ret = HPDF_OK; HPDF_Array capOffset; - HPDF_PTRACE((" HPDF_LineAnnot_SetCaption\n")); + HPDF_PTRACE (" HPDF_LineAnnot_SetCaption\n"); ret += HPDF_Dict_AddBoolean ( annot, "Cap", showCaption); ret += HPDF_Dict_AddName( annot, "CP", HPDF_LINE_ANNOT_CAP_POSITION_NAMES[(HPDF_INT)position]); diff --git a/src/hpdf_array.c b/src/hpdf_array.c index 14715ea..d7d3463 100644 --- a/src/hpdf_array.c +++ b/src/hpdf_array.c @@ -24,7 +24,7 @@ HPDF_Array_New (HPDF_MMgr mmgr) { HPDF_Array obj; - HPDF_PTRACE((" HPDF_Array_New\n")); + HPDF_PTRACE (" HPDF_Array_New\n"); obj = HPDF_GetMem (mmgr, sizeof(HPDF_Array_Rec)); if (obj) { @@ -50,7 +50,7 @@ HPDF_Box_Array_New (HPDF_MMgr mmgr, HPDF_Array obj; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Box_Array_New\n")); + HPDF_PTRACE (" HPDF_Box_Array_New\n"); obj = HPDF_Array_New (mmgr); if (!obj) @@ -76,7 +76,7 @@ HPDF_Array_Free (HPDF_Array array) if (!array) return; - HPDF_PTRACE((" HPDF_Array_Free\n")); + HPDF_PTRACE (" HPDF_Array_Free\n"); HPDF_Array_Clear (array); @@ -96,7 +96,7 @@ HPDF_Array_Write (HPDF_Array array, HPDF_UINT i; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_Array_Write\n")); + HPDF_PTRACE (" HPDF_Array_Write\n"); ret = HPDF_Stream_WriteStr (stream, "[ "); if (ret != HPDF_OK) @@ -126,7 +126,7 @@ HPDF_Array_AddNumber (HPDF_Array array, { HPDF_Number n = HPDF_Number_New (array->mmgr, value); - HPDF_PTRACE((" HPDF_Array_AddNumber\n")); + HPDF_PTRACE (" HPDF_Array_AddNumber\n"); if (!n) return HPDF_Error_GetCode (array->error); @@ -141,7 +141,7 @@ HPDF_Array_AddReal (HPDF_Array array, { HPDF_Real r = HPDF_Real_New (array->mmgr, value); - HPDF_PTRACE((" HPDF_Array_AddReal\n")); + HPDF_PTRACE (" HPDF_Array_AddReal\n"); if (!r) return HPDF_Error_GetCode (array->error); @@ -154,7 +154,7 @@ HPDF_Array_AddNull (HPDF_Array array) { HPDF_Null n = HPDF_Null_New (array->mmgr); - HPDF_PTRACE((" HPDF_Array_AddNull\n")); + HPDF_PTRACE (" HPDF_Array_AddNull\n"); if (!n) return HPDF_Error_GetCode (array->error); @@ -168,7 +168,7 @@ HPDF_Array_AddName (HPDF_Array array, { HPDF_Name n = HPDF_Name_New (array->mmgr, value); - HPDF_PTRACE((" HPDF_Array_AddName\n")); + HPDF_PTRACE (" HPDF_Array_AddName\n"); if (!n) return HPDF_Error_GetCode (array->error); @@ -183,7 +183,7 @@ HPDF_Array_Add (HPDF_Array array, HPDF_Obj_Header *header; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_Array_Add\n")); + HPDF_PTRACE (" HPDF_Array_Add\n"); if (!obj) { if (HPDF_Error_GetCode (array->error) == HPDF_OK) @@ -198,8 +198,8 @@ HPDF_Array_Add (HPDF_Array array, return HPDF_SetError (array->error, HPDF_INVALID_OBJECT, 0); if (array->list->count >= HPDF_LIMIT_MAX_ARRAY) { - HPDF_PTRACE((" HPDF_Array_Add exceed limitatin of array count(%d)\n", - HPDF_LIMIT_MAX_ARRAY)); + HPDF_PTRACE (" HPDF_Array_Add exceed limitatin of array count(%d)\n", + HPDF_LIMIT_MAX_ARRAY); HPDF_Obj_Free (array->mmgr, obj); return HPDF_SetError (array->error, HPDF_ARRAY_COUNT_ERR, 0); @@ -242,7 +242,7 @@ HPDF_Array_Insert (HPDF_Array array, HPDF_STATUS ret; HPDF_UINT i; - HPDF_PTRACE((" HPDF_Array_Insert\n")); + HPDF_PTRACE (" HPDF_Array_Insert\n"); if (!obj) { if (HPDF_Error_GetCode (array->error) == HPDF_OK) @@ -254,15 +254,19 @@ HPDF_Array_Insert (HPDF_Array array, header = (HPDF_Obj_Header *)obj; if (header->obj_id & HPDF_OTYPE_DIRECT) { - HPDF_PTRACE((" HPDF_Array_Add this object cannot owned by array " - "obj=0x%08X\n", (HPDF_UINT)array)); + HPDF_PTRACE (" HPDF_Array_Add this object cannot owned by array " +#ifdef __ANDROID64__ + "obj=0x%08X\n", (HPDF_UINT)(HPDF_UINTPTR)array); +#else + "obj=0x%08X\n", (HPDF_UINT)array); +#endif return HPDF_SetError (array->error, HPDF_INVALID_OBJECT, 0); } if (array->list->count >= HPDF_LIMIT_MAX_ARRAY) { - HPDF_PTRACE((" HPDF_Array_Add exceed limitatin of array count(%d)\n", - HPDF_LIMIT_MAX_ARRAY)); + HPDF_PTRACE (" HPDF_Array_Add exceed limitatin of array count(%d)\n", + HPDF_LIMIT_MAX_ARRAY); HPDF_Obj_Free (array->mmgr, obj); @@ -318,7 +322,7 @@ HPDF_Array_GetItem (HPDF_Array array, void *obj; HPDF_Obj_Header *header; - HPDF_PTRACE((" HPDF_Array_GetItem\n")); + HPDF_PTRACE (" HPDF_Array_GetItem\n"); obj = HPDF_List_ItemAt (array->list, index); @@ -348,7 +352,7 @@ HPDF_Array_Clear (HPDF_Array array) { HPDF_UINT i; - HPDF_PTRACE((" HPDF_Array_Clear\n")); + HPDF_PTRACE (" HPDF_Array_Clear\n"); if (!array) return; diff --git a/src/hpdf_catalog.c b/src/hpdf_catalog.c index 6c31071..3c75cfe 100644 --- a/src/hpdf_catalog.c +++ b/src/hpdf_catalog.c @@ -203,7 +203,7 @@ HPDF_Catalog_AddPageLabel (HPDF_Catalog catalog, HPDF_Dict labels = HPDF_Dict_GetItem (catalog, "PageLabels", HPDF_OCLASS_DICT); - HPDF_PTRACE ((" HPDF_Catalog_AddPageLabel\n")); + HPDF_PTRACE (" HPDF_Catalog_AddPageLabel\n"); if (!labels) { labels = HPDF_Dict_New (catalog->mmgr); @@ -240,7 +240,7 @@ HPDF_Catalog_SetViewerPreference (HPDF_Catalog catalog, HPDF_STATUS ret; HPDF_Dict preferences; - HPDF_PTRACE ((" HPDF_Catalog_SetViewerPreference\n")); + HPDF_PTRACE (" HPDF_Catalog_SetViewerPreference\n"); if (!value) { ret = HPDF_Dict_RemoveElement (catalog, "ViewerPreferences"); @@ -337,7 +337,7 @@ HPDF_Catalog_GetViewerPreference (HPDF_Catalog catalog) HPDF_UINT value = 0; HPDF_Boolean obj; - HPDF_PTRACE ((" HPDF_Catalog_GetViewerPreference\n")); + HPDF_PTRACE (" HPDF_Catalog_GetViewerPreference\n"); preferences = (HPDF_Dict)HPDF_Dict_GetItem (catalog, "ViewerPreferences", HPDF_OCLASS_DICT); diff --git a/src/hpdf_destination.c b/src/hpdf_destination.c index e2566c8..41e936e 100644 --- a/src/hpdf_destination.c +++ b/src/hpdf_destination.c @@ -41,7 +41,7 @@ HPDF_Destination_New (HPDF_MMgr mmgr, { HPDF_Destination dst; - HPDF_PTRACE((" HPDF_Destination_New\n")); + HPDF_PTRACE (" HPDF_Destination_New\n"); if (!HPDF_Page_Validate (target)) { HPDF_SetError (mmgr->error, HPDF_INVALID_PAGE, 0); @@ -103,7 +103,7 @@ HPDF_Destination_SetXYZ (HPDF_Destination dst, HPDF_STATUS ret = HPDF_OK; HPDF_Page target; - HPDF_PTRACE((" HPDF_Destination_SetXYZ\n")); + HPDF_PTRACE (" HPDF_Destination_SetXYZ\n"); if (!HPDF_Destination_Validate (dst)) return HPDF_INVALID_DESTINATION; @@ -138,7 +138,7 @@ HPDF_Destination_SetFit (HPDF_Destination dst) HPDF_STATUS ret = HPDF_OK; HPDF_Page target; - HPDF_PTRACE((" HPDF_Destination_SetFit\n")); + HPDF_PTRACE (" HPDF_Destination_SetFit\n"); if (!HPDF_Destination_Validate (dst)) return HPDF_INVALID_DESTINATION; @@ -167,7 +167,7 @@ HPDF_Destination_SetFitH (HPDF_Destination dst, HPDF_STATUS ret = HPDF_OK; HPDF_Page target; - HPDF_PTRACE((" HPDF_Destination_SetFitH\n")); + HPDF_PTRACE (" HPDF_Destination_SetFitH\n"); if (!HPDF_Destination_Validate (dst)) return HPDF_INVALID_DESTINATION; @@ -196,7 +196,7 @@ HPDF_Destination_SetFitV (HPDF_Destination dst, HPDF_STATUS ret = HPDF_OK; HPDF_Page target; - HPDF_PTRACE((" HPDF_Destination_SetFitV\n")); + HPDF_PTRACE (" HPDF_Destination_SetFitV\n"); if (!HPDF_Destination_Validate (dst)) return HPDF_INVALID_DESTINATION; @@ -229,7 +229,7 @@ HPDF_Destination_SetFitR (HPDF_Destination dst, HPDF_STATUS ret = HPDF_OK; HPDF_Page target; - HPDF_PTRACE((" HPDF_Destination_SetFitR\n")); + HPDF_PTRACE (" HPDF_Destination_SetFitR\n"); if (!HPDF_Destination_Validate (dst)) return HPDF_INVALID_DESTINATION; @@ -261,7 +261,7 @@ HPDF_Destination_SetFitB (HPDF_Destination dst) HPDF_STATUS ret = HPDF_OK; HPDF_Page target; - HPDF_PTRACE((" HPDF_Destination_SetFitB\n")); + HPDF_PTRACE (" HPDF_Destination_SetFitB\n"); if (!HPDF_Destination_Validate (dst)) return HPDF_INVALID_DESTINATION; @@ -290,7 +290,7 @@ HPDF_Destination_SetFitBH (HPDF_Destination dst, HPDF_STATUS ret = HPDF_OK; HPDF_Page target; - HPDF_PTRACE((" HPDF_Destination_SetFitBH\n")); + HPDF_PTRACE (" HPDF_Destination_SetFitBH\n"); if (!HPDF_Destination_Validate (dst)) return HPDF_INVALID_DESTINATION; @@ -319,7 +319,7 @@ HPDF_Destination_SetFitBV (HPDF_Destination dst, HPDF_STATUS ret = HPDF_OK; HPDF_Page target; - HPDF_PTRACE((" HPDF_Destination_SetFitBV\n")); + HPDF_PTRACE (" HPDF_Destination_SetFitBV\n"); if (!HPDF_Destination_Validate (dst)) return HPDF_INVALID_DESTINATION; diff --git a/src/hpdf_dict.c b/src/hpdf_dict.c index b537649..2f6b339 100644 --- a/src/hpdf_dict.c +++ b/src/hpdf_dict.c @@ -204,8 +204,8 @@ HPDF_Dict_Write (HPDF_Dict dict, return HPDF_SetError (dict->error, HPDF_INVALID_OBJECT, 0); if (header->obj_id & HPDF_OTYPE_HIDDEN) { - HPDF_PTRACE((" HPDF_Dict_Write obj=%p skipped obj_id=0x%08X\n", - element->value, (HPDF_UINT)header->obj_id)); + HPDF_PTRACE (" HPDF_Dict_Write obj=%p skipped obj_id=0x%08X\n", + element->value, (HPDF_UINT)header->obj_id); } else { ret = HPDF_Stream_WriteEscapeName (stream, element->key); if (ret != HPDF_OK) @@ -304,8 +304,8 @@ HPDF_Dict_Add (HPDF_Dict dict, } if (dict->list->count >= HPDF_LIMIT_MAX_DICT_ELEMENT) { - HPDF_PTRACE((" HPDF_Dict_Add exceed limitatin of dict count(%d)\n", - HPDF_LIMIT_MAX_DICT_ELEMENT)); + HPDF_PTRACE (" HPDF_Dict_Add exceed limitatin of dict count(%d)\n", + HPDF_LIMIT_MAX_DICT_ELEMENT); HPDF_Obj_Free (dict->mmgr, obj); return HPDF_SetError (dict->error, HPDF_DICT_COUNT_ERR, 0); @@ -435,8 +435,8 @@ HPDF_Dict_GetItem (HPDF_Dict dict, obj = element->value; if ((header->obj_class & HPDF_OCLASS_ANY) != obj_class) { - HPDF_PTRACE((" HPDF_Dict_GetItem dict=%p key=%s obj_class=0x%08X\n", - dict, key, (HPDF_UINT)header->obj_class)); + HPDF_PTRACE (" HPDF_Dict_GetItem dict=%p key=%s obj_class=0x%08X\n", + dict, key, (HPDF_UINT)header->obj_class); HPDF_SetError (dict->error, HPDF_DICT_ITEM_UNEXPECTED_TYPE, 0); return NULL; diff --git a/src/hpdf_doc.c b/src/hpdf_doc.c index f294322..43fc86e 100644 --- a/src/hpdf_doc.c +++ b/src/hpdf_doc.c @@ -97,7 +97,7 @@ HPDF_GetVersion (void) HPDF_BOOL HPDF_Doc_Validate (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_Doc_Validate\n")); + HPDF_PTRACE (" HPDF_Doc_Validate\n"); if (!pdf || pdf->sig_bytes != HPDF_SIG_BYTES) return HPDF_FALSE; @@ -109,7 +109,7 @@ HPDF_Doc_Validate (HPDF_Doc pdf) HPDF_EXPORT(HPDF_BOOL) HPDF_HasDoc (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_HasDoc\n")); + HPDF_PTRACE (" HPDF_HasDoc\n"); if (!pdf || pdf->sig_bytes != HPDF_SIG_BYTES) return HPDF_FALSE; @@ -126,7 +126,7 @@ HPDF_EXPORT(HPDF_Doc) HPDF_New (HPDF_Error_Handler user_error_fn, void *user_data) { - HPDF_PTRACE ((" HPDF_New\n")); + HPDF_PTRACE (" HPDF_New\n"); return HPDF_NewEx (user_error_fn, NULL, NULL, 0, user_data); } @@ -143,7 +143,7 @@ HPDF_NewEx (HPDF_Error_Handler user_error_fn, HPDF_MMgr mmgr; HPDF_Error_Rec tmp_error; - HPDF_PTRACE ((" HPDF_NewEx\n")); + HPDF_PTRACE (" HPDF_NewEx\n"); /* initialize temporary-error object */ HPDF_Error_Init (&tmp_error, user_data); @@ -192,7 +192,7 @@ HPDF_NewEx (HPDF_Error_Handler user_error_fn, HPDF_EXPORT(void) HPDF_Free (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_Free\n")); + HPDF_PTRACE (" HPDF_Free\n"); if (pdf) { HPDF_MMgr mmgr = pdf->mmgr; @@ -215,7 +215,7 @@ HPDF_NewDoc (HPDF_Doc pdf) char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; const char *version; - HPDF_PTRACE ((" HPDF_NewDoc\n")); + HPDF_PTRACE (" HPDF_NewDoc\n"); if (!HPDF_Doc_Validate (pdf)) return HPDF_DOC_INVALID_OBJECT; @@ -260,7 +260,7 @@ HPDF_NewDoc (HPDF_Doc pdf) pdf->cur_pages = pdf->root_pages; - ptr = (char *)HPDF_StrCpy (ptr, (const char *)"Haru Free PDF Library ", eptr); + ptr = (char *)HPDF_StrCpy (ptr, (const char *)"RxRelease / Haru", eptr); version = HPDF_GetVersion (); HPDF_StrCpy (ptr, version, eptr); @@ -274,7 +274,7 @@ HPDF_NewDoc (HPDF_Doc pdf) HPDF_EXPORT(void) HPDF_FreeDoc (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_FreeDoc\n")); + HPDF_PTRACE (" HPDF_FreeDoc\n"); if (HPDF_Doc_Validate (pdf)) { if (pdf->xref) { @@ -325,7 +325,7 @@ HPDF_FreeDoc (HPDF_Doc pdf) HPDF_EXPORT(void) HPDF_FreeDocAll (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_FreeDocAll\n")); + HPDF_PTRACE (" HPDF_FreeDocAll\n"); if (HPDF_Doc_Validate (pdf)) { HPDF_FreeDoc (pdf); @@ -347,7 +347,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_SetPagesConfiguration (HPDF_Doc pdf, HPDF_UINT page_per_pages) { - HPDF_PTRACE ((" HPDF_SetPagesConfiguration\n")); + HPDF_PTRACE (" HPDF_SetPagesConfiguration\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -377,7 +377,7 @@ WriteHeader (HPDF_Doc pdf, { HPDF_UINT idx = (HPDF_INT)pdf->pdf_version; - HPDF_PTRACE ((" WriteHeader\n")); + HPDF_PTRACE (" WriteHeader\n"); if (HPDF_Stream_WriteStr (stream, HPDF_VERSION_STR[idx]) != HPDF_OK) return pdf->error.error_no; @@ -389,7 +389,7 @@ WriteHeader (HPDF_Doc pdf, static HPDF_STATUS PrepareTrailer (HPDF_Doc pdf) { - HPDF_PTRACE ((" PrepareTrailer\n")); + HPDF_PTRACE (" PrepareTrailer\n"); if (HPDF_Dict_Add (pdf->trailer, "Root", pdf->catalog) != HPDF_OK) return pdf->error.error_no; @@ -404,7 +404,7 @@ PrepareTrailer (HPDF_Doc pdf) HPDF_STATUS HPDF_Doc_SetEncryptOn (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_Doc_SetEncryptOn\n")); + HPDF_PTRACE (" HPDF_Doc_SetEncryptOn\n"); if (pdf->encrypt_on) return HPDF_OK; @@ -430,7 +430,7 @@ HPDF_SetPassword (HPDF_Doc pdf, const char *owner_passwd, const char *user_passwd) { - HPDF_PTRACE ((" HPDF_SetPassword\n")); + HPDF_PTRACE (" HPDF_SetPassword\n"); if (!HPDF_HasDoc (pdf)) return HPDF_DOC_INVALID_OBJECT; @@ -456,7 +456,7 @@ HPDF_SetPermission (HPDF_Doc pdf, { HPDF_Encrypt e; - HPDF_PTRACE ((" HPDF_SetPermission\n")); + HPDF_PTRACE (" HPDF_SetPermission\n"); if (!HPDF_HasDoc (pdf)) return HPDF_DOC_INVALID_OBJECT; @@ -480,7 +480,7 @@ HPDF_SetEncryptionMode (HPDF_Doc pdf, { HPDF_Encrypt e; - HPDF_PTRACE ((" HPDF_SetEncryptionMode\n")); + HPDF_PTRACE (" HPDF_SetEncryptionMode\n"); if (!HPDF_Doc_Validate (pdf)) return HPDF_DOC_INVALID_OBJECT; @@ -518,7 +518,7 @@ HPDF_SetEncryptionMode (HPDF_Doc pdf, HPDF_STATUS HPDF_Doc_SetEncryptOff (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_Doc_SetEncryptOff\n")); + HPDF_PTRACE (" HPDF_Doc_SetEncryptOff\n"); if (!pdf->encrypt_on) return HPDF_OK; @@ -634,7 +634,7 @@ InternalSaveToStream (HPDF_Doc pdf, HPDF_EXPORT(HPDF_STATUS) HPDF_SaveToStream (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_SaveToStream\n")); + HPDF_PTRACE (" HPDF_SaveToStream\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -662,7 +662,7 @@ HPDF_GetContents (HPDF_Doc pdf, HPDF_UINT isize = *size; HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_GetContents\n")); + HPDF_PTRACE (" HPDF_GetContents\n"); if (!HPDF_HasDoc (pdf)) { return HPDF_INVALID_DOCUMENT; @@ -690,7 +690,7 @@ HPDF_GetContents (HPDF_Doc pdf, HPDF_EXPORT(HPDF_UINT32) HPDF_GetStreamSize (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_GetStreamSize\n")); + HPDF_PTRACE (" HPDF_GetStreamSize\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -749,7 +749,7 @@ HPDF_SaveToFile (HPDF_Doc pdf, { HPDF_Stream stream; - HPDF_PTRACE ((" HPDF_SaveToFile\n")); + HPDF_PTRACE (" HPDF_SaveToFile\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -769,7 +769,7 @@ HPDF_SaveToFile (HPDF_Doc pdf, HPDF_EXPORT(HPDF_Page) HPDF_GetCurrentPage (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_GetCurrentPage\n")); + HPDF_PTRACE (" HPDF_GetCurrentPage\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -784,7 +784,7 @@ HPDF_GetPageByIndex (HPDF_Doc pdf, { HPDF_Page ret; - HPDF_PTRACE ((" HPDF_GetPageByIndex\n")); + HPDF_PTRACE (" HPDF_GetPageByIndex\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -802,7 +802,7 @@ HPDF_GetPageByIndex (HPDF_Doc pdf, HPDF_Pages HPDF_Doc_GetCurrentPages (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_GetCurrentPages\n")); + HPDF_PTRACE (" HPDF_GetCurrentPages\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -815,7 +815,7 @@ HPDF_STATUS HPDF_Doc_SetCurrentPages (HPDF_Doc pdf, HPDF_Pages pages) { - HPDF_PTRACE ((" HPDF_Doc_SetCurrentPages\n")); + HPDF_PTRACE (" HPDF_Doc_SetCurrentPages\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -837,7 +837,7 @@ HPDF_STATUS HPDF_Doc_SetCurrentPage (HPDF_Doc pdf, HPDF_Page page) { - HPDF_PTRACE ((" HPDF_Doc_SetCurrentPage\n")); + HPDF_PTRACE (" HPDF_Doc_SetCurrentPage\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -861,7 +861,7 @@ HPDF_AddPage (HPDF_Doc pdf) HPDF_Page page; HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_AddPage\n")); + HPDF_PTRACE (" HPDF_AddPage\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -908,7 +908,7 @@ HPDF_Doc_AddPagesTo (HPDF_Doc pdf, { HPDF_Pages pages; - HPDF_PTRACE ((" HPDF_AddPagesTo\n")); + HPDF_PTRACE (" HPDF_AddPagesTo\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -942,7 +942,7 @@ HPDF_InsertPage (HPDF_Doc pdf, HPDF_Page page; HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_InsertPage\n")); + HPDF_PTRACE (" HPDF_InsertPage\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1003,7 +1003,7 @@ FreeFontDefList (HPDF_Doc pdf) HPDF_List list = pdf->fontdef_list; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_Doc_FreeFontDefList\n")); + HPDF_PTRACE (" HPDF_Doc_FreeFontDefList\n"); for (i = 0; i < list->count; i++) { HPDF_FontDef def = (HPDF_FontDef)HPDF_List_ItemAt (list, i); @@ -1022,7 +1022,7 @@ CleanupFontDefList (HPDF_Doc pdf) HPDF_List list = pdf->fontdef_list; HPDF_UINT i; - HPDF_PTRACE ((" CleanupFontDefList\n")); + HPDF_PTRACE (" CleanupFontDefList\n"); for (i = 0; i < list->count; i++) { HPDF_FontDef def = (HPDF_FontDef)HPDF_List_ItemAt (list, i); @@ -1039,7 +1039,7 @@ HPDF_Doc_FindFontDef (HPDF_Doc pdf, HPDF_List list = pdf->fontdef_list; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_Doc_FindFontDef\n")); + HPDF_PTRACE (" HPDF_Doc_FindFontDef\n"); for (i = 0; i < list->count; i++) { HPDF_FontDef def = (HPDF_FontDef)HPDF_List_ItemAt (list, i); @@ -1065,7 +1065,7 @@ HPDF_Doc_RegisterFontDef (HPDF_Doc pdf, { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_Doc_RegisterFontDef\n")); + HPDF_PTRACE (" HPDF_Doc_RegisterFontDef\n"); if (!fontdef) return HPDF_SetError (&pdf->error, HPDF_INVALID_OBJECT, 0); @@ -1092,7 +1092,7 @@ HPDF_GetFontDef (HPDF_Doc pdf, HPDF_STATUS ret; HPDF_FontDef def; - HPDF_PTRACE ((" HPDF_GetFontDef\n")); + HPDF_PTRACE (" HPDF_GetFontDef\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1126,7 +1126,7 @@ HPDF_Doc_FindEncoder (HPDF_Doc pdf, HPDF_List list = pdf->encoder_list; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_Doc_FindEncoder\n")); + HPDF_PTRACE (" HPDF_Doc_FindEncoder\n"); for (i = 0; i < list->count; i++) { HPDF_Encoder encoder = (HPDF_Encoder)HPDF_List_ItemAt (list, i); @@ -1179,7 +1179,7 @@ HPDF_GetEncoder (HPDF_Doc pdf, HPDF_Encoder encoder; HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_GetEncoder\n")); + HPDF_PTRACE (" HPDF_GetEncoder\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1241,7 +1241,7 @@ FreeEncoderList (HPDF_Doc pdf) HPDF_List list = pdf->encoder_list; HPDF_UINT i; - HPDF_PTRACE ((" FreeEncoderList\n")); + HPDF_PTRACE (" FreeEncoderList\n"); for (i = 0; i < list->count; i++) { HPDF_Encoder encoder = (HPDF_Encoder)HPDF_List_ItemAt (list, i); @@ -1266,7 +1266,7 @@ HPDF_Doc_FindFont (HPDF_Doc pdf, HPDF_UINT i; HPDF_Font font; - HPDF_PTRACE ((" HPDF_Doc_FindFont\n")); + HPDF_PTRACE (" HPDF_Doc_FindFont\n"); for (i = 0; i < pdf->font_mgr->count; i++) { HPDF_FontAttr attr; @@ -1292,7 +1292,7 @@ HPDF_GetFont (HPDF_Doc pdf, HPDF_Encoder encoder = NULL; HPDF_Font font; - HPDF_PTRACE ((" HPDF_GetFont\n")); + HPDF_PTRACE (" HPDF_GetFont\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1400,7 +1400,7 @@ HPDF_LoadType1FontFromFile (HPDF_Doc pdf, HPDF_Stream pfm = NULL; const char *ret; - HPDF_PTRACE ((" HPDF_LoadType1FontFromFile\n")); + HPDF_PTRACE (" HPDF_LoadType1FontFromFile\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1439,7 +1439,7 @@ LoadType1FontFromStream (HPDF_Doc pdf, { HPDF_FontDef def; - HPDF_PTRACE ((" HPDF_LoadType1FontFromStream\n")); + HPDF_PTRACE (" HPDF_LoadType1FontFromStream\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1470,7 +1470,7 @@ HPDF_GetTTFontDefFromFile (HPDF_Doc pdf, HPDF_Stream font_data; HPDF_FontDef def; - HPDF_PTRACE ((" HPDF_GetTTFontDefFromFile\n")); + HPDF_PTRACE (" HPDF_GetTTFontDefFromFile\n"); /* create file stream */ font_data = HPDF_FileReader_New (pdf->mmgr, file_name); @@ -1493,7 +1493,7 @@ HPDF_LoadTTFontFromFile (HPDF_Doc pdf, HPDF_Stream font_data; const char *ret; - HPDF_PTRACE ((" HPDF_LoadTTFontFromFile\n")); + HPDF_PTRACE (" HPDF_LoadTTFontFromFile\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1521,7 +1521,7 @@ LoadTTFontFromStream (HPDF_Doc pdf, { HPDF_FontDef def; - HPDF_PTRACE ((" HPDF_LoadTTFontFromStream\n")); + HPDF_PTRACE (" HPDF_LoadTTFontFromStream\n"); HPDF_UNUSED (file_name); def = HPDF_TTFontDef_Load (pdf->mmgr, font_data, embedding); @@ -1570,7 +1570,7 @@ HPDF_LoadTTFontFromFile2 (HPDF_Doc pdf, HPDF_Stream font_data; const char *ret; - HPDF_PTRACE ((" HPDF_LoadTTFontFromFile2\n")); + HPDF_PTRACE (" HPDF_LoadTTFontFromFile2\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1599,7 +1599,7 @@ LoadTTFontFromStream2 (HPDF_Doc pdf, { HPDF_FontDef def; - HPDF_PTRACE ((" HPDF_LoadTTFontFromStream2\n")); + HPDF_PTRACE (" HPDF_LoadTTFontFromStream2\n"); HPDF_UNUSED (file_name); def = HPDF_TTFontDef_Load2 (pdf->mmgr, font_data, index, embedding); @@ -1649,7 +1649,7 @@ HPDF_LoadRawImageFromFile (HPDF_Doc pdf, HPDF_Stream imagedata; HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadRawImageFromFile\n")); + HPDF_PTRACE (" HPDF_LoadRawImageFromFile\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1686,7 +1686,7 @@ HPDF_LoadRawImageFromMem (HPDF_Doc pdf, { HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadRawImageFromMem\n")); + HPDF_PTRACE (" HPDF_LoadRawImageFromMem\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1716,7 +1716,7 @@ HPDF_LoadJpegImageFromFile (HPDF_Doc pdf, HPDF_Stream imagedata; HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadJpegImageFromFile\n")); + HPDF_PTRACE (" HPDF_LoadJpegImageFromFile\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -1745,7 +1745,7 @@ HPDF_LoadJpegImageFromMem (HPDF_Doc pdf, { HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadJpegImageFromMem\n")); + HPDF_PTRACE (" HPDF_LoadJpegImageFromMem\n"); if (!HPDF_HasDoc (pdf)) { return NULL; @@ -1765,7 +1765,7 @@ HPDF_LoadJpegImageFromMem (HPDF_Doc pdf, HPDF_EXPORT(HPDF_PageLayout) HPDF_GetPageLayout (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_GetPageLayout\n")); + HPDF_PTRACE (" HPDF_GetPageLayout\n"); if (!HPDF_HasDoc (pdf)) return HPDF_PAGE_LAYOUT_SINGLE; @@ -1780,7 +1780,7 @@ HPDF_SetPageLayout (HPDF_Doc pdf, { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_GetPageLayout\n")); + HPDF_PTRACE (" HPDF_GetPageLayout\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -1802,7 +1802,7 @@ HPDF_SetPageLayout (HPDF_Doc pdf, HPDF_EXPORT(HPDF_PageMode) HPDF_GetPageMode (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_GetPageMode\n")); + HPDF_PTRACE (" HPDF_GetPageMode\n"); if (!HPDF_HasDoc (pdf)) return HPDF_PAGE_MODE_USE_NONE; @@ -1817,7 +1817,7 @@ HPDF_SetPageMode (HPDF_Doc pdf, { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_GetPageMode\n")); + HPDF_PTRACE (" HPDF_GetPageMode\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -1840,7 +1840,7 @@ HPDF_SetOpenAction (HPDF_Doc pdf, { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_SetOpenAction\n")); + HPDF_PTRACE (" HPDF_SetOpenAction\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -1859,7 +1859,7 @@ HPDF_SetOpenAction (HPDF_Doc pdf, HPDF_EXPORT(HPDF_UINT) HPDF_GetViewerPreference (HPDF_Doc pdf) { - HPDF_PTRACE ((" HPDF_Catalog_GetViewerPreference\n")); + HPDF_PTRACE (" HPDF_Catalog_GetViewerPreference\n"); if (!HPDF_HasDoc (pdf)) return 0; @@ -1874,7 +1874,7 @@ HPDF_SetViewerPreference (HPDF_Doc pdf, { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_Catalog_SetViewerPreference\n")); + HPDF_PTRACE (" HPDF_Catalog_SetViewerPreference\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -1899,7 +1899,7 @@ HPDF_AddPageLabel (HPDF_Doc pdf, HPDF_Dict page_label; HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_AddPageLabel\n")); + HPDF_PTRACE (" HPDF_AddPageLabel\n"); if (!HPDF_HasDoc (pdf)) return HPDF_INVALID_DOCUMENT; @@ -1931,7 +1931,7 @@ HPDF_AttachFile (HPDF_Doc pdf, HPDF_String name; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_AttachFile\n")); + HPDF_PTRACE (" HPDF_AttachFile\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -2000,7 +2000,7 @@ HPDF_SetInfoAttr (HPDF_Doc pdf, HPDF_STATUS ret; HPDF_Dict info = GetInfo (pdf); - HPDF_PTRACE((" HPDF_SetInfoAttr\n")); + HPDF_PTRACE (" HPDF_SetInfoAttr\n"); if (!info) return HPDF_CheckError (&pdf->error); @@ -2020,7 +2020,7 @@ HPDF_GetInfoAttr (HPDF_Doc pdf, const char *ret = NULL; HPDF_Dict info = GetInfo (pdf); - HPDF_PTRACE((" HPDF_GetInfoAttr\n")); + HPDF_PTRACE (" HPDF_GetInfoAttr\n"); if (info) ret = HPDF_Info_GetInfoAttr (info, type); @@ -2039,7 +2039,7 @@ HPDF_SetInfoDateAttr (HPDF_Doc pdf, HPDF_STATUS ret; HPDF_Dict info = GetInfo (pdf); - HPDF_PTRACE((" HPDF_SetInfoDateAttr\n")); + HPDF_PTRACE (" HPDF_SetInfoDateAttr\n"); if (!info) return HPDF_CheckError (&pdf->error); @@ -2183,7 +2183,7 @@ HPDF_OutputIntent_New (HPDF_Doc pdf, HPDF_OutputIntent intent; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_OutputIntent_New\n")); + HPDF_PTRACE (" HPDF_OutputIntent_New\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -2254,7 +2254,7 @@ HPDF_ICC_LoadIccFromMem (HPDF_Doc pdf, HPDF_OutputIntent icc; HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_ICC_LoadIccFromMem\n")); + HPDF_PTRACE (" HPDF_ICC_LoadIccFromMem\n"); icc = HPDF_DictStream_New (mmgr, xref); if (!icc) @@ -2344,7 +2344,7 @@ HPDF_LoadIccProfileFromFile (HPDF_Doc pdf, HPDF_Stream iccdata; HPDF_OutputIntent iccentry; - HPDF_PTRACE ((" HPDF_LoadIccProfileFromFile\n")); + HPDF_PTRACE (" HPDF_LoadIccProfileFromFile\n"); if (!HPDF_HasDoc (pdf)) return NULL; diff --git a/src/hpdf_doc_png.c b/src/hpdf_doc_png.c index bad87c6..8e0f192 100644 --- a/src/hpdf_doc_png.c +++ b/src/hpdf_doc_png.c @@ -35,7 +35,7 @@ HPDF_LoadPngImageFromMem (HPDF_Doc pdf, HPDF_Stream imagedata; HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadPngImageFromFile\n")); + HPDF_PTRACE (" HPDF_LoadPngImageFromFile\n"); if (!HPDF_HasDoc (pdf)) { return NULL; @@ -75,7 +75,7 @@ HPDF_LoadPngImageFromFile (HPDF_Doc pdf, HPDF_Stream imagedata; HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadPngImageFromFile\n")); + HPDF_PTRACE (" HPDF_LoadPngImageFromFile\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -107,7 +107,7 @@ HPDF_LoadPngImageFromFile2 (HPDF_Doc pdf, HPDF_Image image; HPDF_String fname; - HPDF_PTRACE ((" HPDF_LoadPngImageFromFile\n")); + HPDF_PTRACE (" HPDF_LoadPngImageFromFile\n"); if (!HPDF_HasDoc (pdf)) return NULL; @@ -156,7 +156,7 @@ LoadPngImageFromStream (HPDF_Doc pdf, { HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadPngImageFromStream\n")); + HPDF_PTRACE (" HPDF_LoadPngImageFromStream\n"); image = HPDF_Image_LoadPngImage (pdf->mmgr, imagedata, pdf->xref, delayed_loading); diff --git a/src/hpdf_encoder.c b/src/hpdf_encoder.c index a1cbb4b..8a95200 100644 --- a/src/hpdf_encoder.c +++ b/src/hpdf_encoder.c @@ -2211,7 +2211,7 @@ HPDF_BasicEncoder_New (HPDF_MMgr mmgr, const HPDF_BuiltinEncodingData *data; char *eptr; - HPDF_PTRACE((" HPDF_BasicEncoder_New\n")); + HPDF_PTRACE (" HPDF_BasicEncoder_New\n"); if (mmgr == NULL) return NULL; @@ -2292,7 +2292,7 @@ HPDF_BasicEncoder_FindBuiltinData (const char *encoding_name) { HPDF_UINT i = 0; - HPDF_PTRACE((" HPDF_BasicEncoder_FindBuiltinData\n")); + HPDF_PTRACE (" HPDF_BasicEncoder_FindBuiltinData\n"); while (HPDF_BUILTIN_ENCODINGS[i].encoding_name) { if (HPDF_StrCmp (HPDF_BUILTIN_ENCODINGS[i].encoding_name, @@ -2335,7 +2335,7 @@ HPDF_BasicEncoder_CopyMap (HPDF_Encoder encoder, HPDF_UNICODE* dst = ((HPDF_BasicEncoderAttr)encoder->attr)->unicode_map + HPDF_BASIC_ENCODER_FIRST_CHAR; - HPDF_PTRACE((" HPDF_BasicEncoder_CopyMap\n")); + HPDF_PTRACE (" HPDF_BasicEncoder_CopyMap\n"); for (i = 0; i <= HPDF_BASIC_ENCODER_LAST_CHAR - HPDF_BASIC_ENCODER_FIRST_CHAR; i++) @@ -2351,7 +2351,7 @@ HPDF_BasicEncoder_OverrideMap (HPDF_Encoder encoder, HPDF_UNICODE* dst; HPDF_BYTE* flgs; - HPDF_PTRACE ((" HPDF_BasicEncoder_OverrideMap\n")); + HPDF_PTRACE (" HPDF_BasicEncoder_OverrideMap\n"); if (data->has_differences) return HPDF_SetError (encoder->error, HPDF_INVALID_OPERATION, 0); @@ -2377,7 +2377,7 @@ HPDF_BasicEncoder_OverrideMap (HPDF_Encoder encoder, void HPDF_Encoder_Free (HPDF_Encoder encoder) { - HPDF_PTRACE ((" HPDF_Encoder_Free\n")); + HPDF_PTRACE (" HPDF_Encoder_Free\n"); if (!encoder) return; @@ -2393,7 +2393,7 @@ HPDF_UnicodeToGryphName (HPDF_UNICODE unicode) { const HPDF_UnicodeGryphPair* map = HPDF_UNICODE_GRYPH_NAME_MAP; - HPDF_PTRACE ((" HPDF_UnicodeToGryphName\n")); + HPDF_PTRACE (" HPDF_UnicodeToGryphName\n"); while (map->unicode <= unicode) { if (map->unicode == unicode) @@ -2409,7 +2409,7 @@ HPDF_GryphNameToUnicode (const char *gryph_name) { const HPDF_UnicodeGryphPair* map = HPDF_UNICODE_GRYPH_NAME_MAP; - HPDF_PTRACE ((" HPDF_GryphNameToUnicode\n")); + HPDF_PTRACE (" HPDF_GryphNameToUnicode\n"); while (map->unicode != 0xFFFF) { if (HPDF_StrCmp (gryph_name, map->gryph_name) == 0) @@ -2423,7 +2423,7 @@ HPDF_GryphNameToUnicode (const char *gryph_name) void HPDF_BasicEncoder_Free (HPDF_Encoder encoder) { - HPDF_PTRACE ((" HPDF_BasicEncoder_Free\n")); + HPDF_PTRACE (" HPDF_BasicEncoder_Free\n"); HPDF_FreeMem (encoder->mmgr, encoder->attr); encoder->attr = NULL; @@ -2436,7 +2436,7 @@ HPDF_BasicEncoder_Write (HPDF_Encoder encoder, HPDF_STATUS ret; HPDF_BasicEncoderAttr attr = (HPDF_BasicEncoderAttr)encoder->attr; - HPDF_PTRACE ((" HPDF_BasicEncoder_Write\n")); + HPDF_PTRACE (" HPDF_BasicEncoder_Write\n"); /* if HPDF_ENCODING_FONT_SPECIFIC is selected, no Encoding object will be " * written. @@ -2506,7 +2506,7 @@ HPDF_BasicEncoder_Write (HPDF_Encoder encoder, HPDF_STATUS HPDF_Encoder_Validate (HPDF_Encoder encoder) { - HPDF_PTRACE ((" HPDF_Encoder_Validate\n")); + HPDF_PTRACE (" HPDF_Encoder_Validate\n"); if (!encoder || encoder->sig_bytes != HPDF_ENCODER_SIG_BYTES) return HPDF_FALSE; @@ -2526,7 +2526,7 @@ HPDF_CMapEncoder_New (HPDF_MMgr mmgr, { HPDF_Encoder encoder; - HPDF_PTRACE ((" HPDF_CMapEncoder_New\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_New\n"); if (mmgr == NULL) return NULL; @@ -2559,7 +2559,7 @@ HPDF_CMapEncoder_InitAttr (HPDF_Encoder encoder) HPDF_UINT i; HPDF_UINT j; - HPDF_PTRACE ((" HPDF_CMapEncoder_InitAttr\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_InitAttr\n"); if (encoder->attr) return HPDF_INVALID_ENCODER; @@ -2633,7 +2633,7 @@ HPDF_CMapEncoder_Free (HPDF_Encoder encoder) HPDF_UINT i; HPDF_CidRange_Rec *data; - HPDF_PTRACE ((" HPDF_CMapEncoder_Free\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_Free\n"); attr = (HPDF_CMapEncoderAttr)encoder->attr; @@ -2690,7 +2690,7 @@ HPDF_Encoder_SetParseText (HPDF_Encoder encoder, const HPDF_BYTE *text, HPDF_UINT len) { - HPDF_PTRACE ((" HPDF_CMapEncoder_SetParseText\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_SetParseText\n"); HPDF_UNUSED (encoder); state->text = text; @@ -2706,7 +2706,7 @@ HPDF_CMapEncoder_ByteType (HPDF_Encoder encoder, { HPDF_CMapEncoderAttr attr = (HPDF_CMapEncoderAttr)encoder->attr; - HPDF_PTRACE ((" HPDF_CMapEncoder_ByteType\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_ByteType\n"); if (state->index >= state->len) return HPDF_BYTE_TYPE_UNKNOWN; @@ -2733,7 +2733,7 @@ HPDF_ByteType HPDF_Encoder_ByteType (HPDF_Encoder encoder, HPDF_ParseText_Rec *state) { - HPDF_PTRACE ((" HPDF_Encoder_ByteType\n")); + HPDF_PTRACE (" HPDF_Encoder_ByteType\n"); if (encoder->byte_type_fn) return encoder->byte_type_fn (encoder, state); @@ -2748,7 +2748,7 @@ HPDF_CMapEncoder_AddCMap (HPDF_Encoder encoder, { HPDF_CMapEncoderAttr attr = (HPDF_CMapEncoderAttr)encoder->attr; - HPDF_PTRACE ((" HPDF_CMapEncoder_AddCMap\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_AddCMap\n"); /* Copy specified pdf_cid_range array to fRangeArray. */ while (range->from != 0xffff || range->to != 0xffff) { @@ -2824,7 +2824,7 @@ HPDF_CMapEncoder_AddNotDefRange (HPDF_Encoder encoder, { HPDF_CMapEncoderAttr attr = (HPDF_CMapEncoderAttr)encoder->attr; - HPDF_PTRACE ((" HPDF_CMapEncoder_AddNotDefRange\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_AddNotDefRange\n"); return AddCidRainge (encoder->mmgr, range, attr->notdef_range); } @@ -2836,7 +2836,7 @@ HPDF_CMapEncoder_AddCodeSpaceRange (HPDF_Encoder encoder, { HPDF_CMapEncoderAttr attr = (HPDF_CMapEncoderAttr)encoder->attr; - HPDF_PTRACE ((" HPDF_CMapEncoder_AddNotDefRange\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_AddNotDefRange\n"); return AddCidRainge (encoder->mmgr, range, attr->code_space_range); } @@ -2848,7 +2848,7 @@ HPDF_CMapEncoder_SetUnicodeArray (HPDF_Encoder encoder, { HPDF_CMapEncoderAttr attr = (HPDF_CMapEncoderAttr)encoder->attr; - HPDF_PTRACE ((" HPDF_CMapEncoder_SetUnicodeArray\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_SetUnicodeArray\n"); if (array != NULL) while (array->unicode != 0xffff) { @@ -2867,7 +2867,7 @@ HPDF_CMapEncoder_AddJWWLineHead (HPDF_Encoder encoder, HPDF_CMapEncoderAttr attr = (HPDF_CMapEncoderAttr)encoder->attr; HPDF_UINT i, j; - HPDF_PTRACE ((" HPDF_CMapEncoder_AddJWWLineHead\n")); + HPDF_PTRACE (" HPDF_CMapEncoder_AddJWWLineHead\n"); for (i = 0; i < HPDF_MAX_JWW_NUM; i++) { if (*code == 0) @@ -2901,7 +2901,7 @@ HPDF_Encoder_CheckJWWLineHead (HPDF_Encoder encoder, HPDF_CMapEncoderAttr attr; HPDF_UINT j; - HPDF_PTRACE ((" HPDF_Encoder_CheckJWWLineHead\n")); + HPDF_PTRACE (" HPDF_Encoder_CheckJWWLineHead\n"); if (!HPDF_Encoder_Validate (encoder)) return HPDF_FALSE; @@ -2930,7 +2930,7 @@ HPDF_EXPORT(HPDF_UNICODE) HPDF_Encoder_GetUnicode (HPDF_Encoder encoder, HPDF_UINT16 code) { - HPDF_PTRACE ((" HPDF_Encoder_GetUnicode\n")); + HPDF_PTRACE (" HPDF_Encoder_GetUnicode\n"); if (!HPDF_Encoder_Validate (encoder)) return 0; @@ -2947,7 +2947,7 @@ HPDF_Encoder_GetByteType (HPDF_Encoder encoder, HPDF_ParseText_Rec parse_state; HPDF_ByteType btype; - HPDF_PTRACE ((" HPDF_Encoder_GetByteType\n")); + HPDF_PTRACE (" HPDF_Encoder_GetByteType\n"); if (!HPDF_Encoder_Validate (encoder)) return HPDF_BYTE_TYPE_UNKNOWN; @@ -2976,7 +2976,7 @@ HPDF_Encoder_GetByteType (HPDF_Encoder encoder, HPDF_EXPORT(HPDF_EncoderType) HPDF_Encoder_GetType (HPDF_Encoder encoder) { - HPDF_PTRACE ((" HPDF_Encoder_GetType\n")); + HPDF_PTRACE (" HPDF_Encoder_GetType\n"); if (!HPDF_Encoder_Validate (encoder)) return HPDF_ENCODER_UNKNOWN; @@ -2988,7 +2988,7 @@ HPDF_Encoder_GetType (HPDF_Encoder encoder) HPDF_EXPORT(HPDF_WritingMode) HPDF_Encoder_GetWritingMode (HPDF_Encoder encoder) { - HPDF_PTRACE ((" HPDF_Encoder_GetWritingMode\n")); + HPDF_PTRACE (" HPDF_Encoder_GetWritingMode\n"); if (!HPDF_Encoder_Validate (encoder)) return HPDF_WMODE_HORIZONTAL; diff --git a/src/hpdf_encoder_utf.c b/src/hpdf_encoder_utf.c index b8dd734..cd65c5e 100644 --- a/src/hpdf_encoder_utf.c +++ b/src/hpdf_encoder_utf.c @@ -82,8 +82,8 @@ UTF8_Encoder_ByteType_Func (HPDF_Encoder encoder, if (state->index == 0) { //First byte, initialize. - HPDF_PTRACE ((" UTF8_Encoder_ByteType_Func - Initialize: (%u) %s\n", - state->len, state->text)); + HPDF_PTRACE (" UTF8_Encoder_ByteType_Func - Initialize: (%u) %s\n", + state->len, state->text); utf8_attr->current_byte = 0; } @@ -91,7 +91,7 @@ UTF8_Encoder_ByteType_Func (HPDF_Encoder encoder, byte = state->text[state->index]; state->index++; - HPDF_PTRACE ((" UTF8_Encoder_ByteType_Func - Byte: %hx\n", byte)); + HPDF_PTRACE (" UTF8_Encoder_ByteType_Func - Byte: %hx\n", byte); if (utf8_attr->current_byte == 0) { utf8_attr->utf8_bytes[0] = byte; diff --git a/src/hpdf_encrypt.c b/src/hpdf_encrypt.c index a534995..db4dbe6 100644 --- a/src/hpdf_encrypt.c +++ b/src/hpdf_encrypt.c @@ -313,7 +313,7 @@ HPDF_PadOrTrancatePasswd (const char *pwd, { HPDF_UINT len = HPDF_StrLen (pwd, HPDF_PASSWD_LEN + 1); - HPDF_PTRACE((" HPDF_PadOrTrancatePasswd\n")); + HPDF_PTRACE (" HPDF_PadOrTrancatePasswd\n"); HPDF_MemSet (new_pwd, 0x00, HPDF_PASSWD_LEN); @@ -349,7 +349,7 @@ HPDF_Encrypt_CreateOwnerKey (HPDF_Encrypt attr) HPDF_BYTE digest[HPDF_MD5_KEY_LEN]; HPDF_BYTE tmppwd[HPDF_PASSWD_LEN]; - HPDF_PTRACE((" HPDF_Encrypt_CreateOwnerKey\n")); + HPDF_PTRACE (" HPDF_Encrypt_CreateOwnerKey\n"); /* create md5-digest using the value of owner_passwd */ @@ -357,7 +357,7 @@ HPDF_Encrypt_CreateOwnerKey (HPDF_Encrypt attr) HPDF_MD5Init(&md5_ctx); HPDF_MD5Update(&md5_ctx, attr->owner_passwd, HPDF_PASSWD_LEN); - HPDF_PTRACE(("@ Algorithm 3.3 step 2\n")); + HPDF_PTRACE ("@ Algorithm 3.3 step 2\n"); HPDF_MD5Final(digest, &md5_ctx); @@ -372,23 +372,23 @@ HPDF_Encrypt_CreateOwnerKey (HPDF_Encrypt attr) HPDF_MD5Update (&md5_ctx, digest, attr->key_len); HPDF_MD5Final(digest, &md5_ctx); - HPDF_PTRACE(("@ Algorithm 3.3 step 3 loop %u\n", i)); + HPDF_PTRACE ("@ Algorithm 3.3 step 3 loop %u\n", i); } } /* Algorithm 3.3 step 4 */ - HPDF_PTRACE(("@ Algorithm 3.3 step 7 loop 0\n")); + HPDF_PTRACE ("@ Algorithm 3.3 step 7 loop 0\n"); ARC4Init (&rc4_ctx, digest, attr->key_len); - HPDF_PTRACE(("@ Algorithm 3.3 step 5\n")); + HPDF_PTRACE ("@ Algorithm 3.3 step 5\n"); /* Algorithm 3.3 step 6 */ - HPDF_PTRACE(("@ Algorithm 3.3 step 6\n")); + HPDF_PTRACE ("@ Algorithm 3.3 step 6\n"); ARC4CryptBuf (&rc4_ctx, attr->user_passwd, tmppwd, HPDF_PASSWD_LEN); /* Algorithm 3.3 step 7 */ - HPDF_PTRACE(("@ Algorithm 3.3 step 7\n")); + HPDF_PTRACE ("@ Algorithm 3.3 step 7\n"); if (attr->mode == HPDF_ENCRYPT_R3) { HPDF_BYTE tmppwd2[HPDF_PASSWD_LEN]; HPDF_UINT i; @@ -400,7 +400,7 @@ HPDF_Encrypt_CreateOwnerKey (HPDF_Encrypt attr) for (j = 0; j < attr->key_len; j++) new_key[j] = (HPDF_BYTE)(digest[j] ^ i); - HPDF_PTRACE(("@ Algorithm 3.3 step 7 loop %u\n", i)); + HPDF_PTRACE ("@ Algorithm 3.3 step 7 loop %u\n", i); HPDF_MemCpy (tmppwd2, tmppwd, HPDF_PASSWD_LEN); ARC4Init(&rc4_ctx, new_key, attr->key_len); @@ -409,7 +409,7 @@ HPDF_Encrypt_CreateOwnerKey (HPDF_Encrypt attr) } /* Algorithm 3.3 step 8 */ - HPDF_PTRACE(("@ Algorithm 3.3 step 8\n")); + HPDF_PTRACE ("@ Algorithm 3.3 step 8\n"); HPDF_MemCpy (attr->owner_key, tmppwd, HPDF_PASSWD_LEN); } @@ -420,7 +420,7 @@ HPDF_Encrypt_CreateEncryptionKey (HPDF_Encrypt attr) HPDF_MD5_CTX md5_ctx; HPDF_BYTE tmp_flg[4]; - HPDF_PTRACE((" HPDF_Encrypt_CreateEncryptionKey\n")); + HPDF_PTRACE (" HPDF_Encrypt_CreateEncryptionKey\n"); /* Algorithm3.2 step2 */ HPDF_MD5Init(&md5_ctx); @@ -431,7 +431,7 @@ HPDF_Encrypt_CreateEncryptionKey (HPDF_Encrypt attr) /* Algorithm3.2 step4 */ - HPDF_PTRACE(("@@@ permission =%d\n", attr->permission)); + HPDF_PTRACE ("@@@ permission =%d\n", attr->permission); tmp_flg[0] = (HPDF_BYTE)(attr->permission); tmp_flg[1] = (HPDF_BYTE)(attr->permission >> 8); tmp_flg[2] = (HPDF_BYTE)(attr->permission >> 16); @@ -440,7 +440,7 @@ HPDF_Encrypt_CreateEncryptionKey (HPDF_Encrypt attr) HPDF_MD5Update(&md5_ctx, tmp_flg, 4); /* Algorithm3.2 step5 */ - HPDF_PTRACE(("@ Algorithm 3.2 step 5\n")); + HPDF_PTRACE ("@ Algorithm 3.2 step 5\n"); HPDF_MD5Update(&md5_ctx, attr->encrypt_id, HPDF_ID_LEN); HPDF_MD5Final(attr->encryption_key, &md5_ctx); @@ -450,7 +450,7 @@ HPDF_Encrypt_CreateEncryptionKey (HPDF_Encrypt attr) HPDF_UINT i; for (i = 0; i < 50; i++) { - HPDF_PTRACE(("@ Algorithm 3.3 step 6 loop %u\n", i)); + HPDF_PTRACE ("@ Algorithm 3.3 step 6 loop %u\n", i); HPDF_MD5Init(&md5_ctx); HPDF_MD5Update (&md5_ctx, attr->encryption_key, attr->key_len); HPDF_MD5Final(attr->encryption_key, &md5_ctx); @@ -464,7 +464,7 @@ HPDF_Encrypt_CreateUserKey (HPDF_Encrypt attr) { HPDF_ARC4_Ctx_Rec ctx; - HPDF_PTRACE((" HPDF_Encrypt_CreateUserKey\n")); + HPDF_PTRACE (" HPDF_Encrypt_CreateUserKey\n"); /* Algorithm 3.4/5 step1 */ @@ -486,20 +486,20 @@ HPDF_Encrypt_CreateUserKey (HPDF_Encrypt attr) HPDF_MD5Update(&md5_ctx, attr->encrypt_id, HPDF_ID_LEN); HPDF_MD5Final(digest, &md5_ctx); - HPDF_PTRACE(("@ Algorithm 3.5 step 3\n")); + HPDF_PTRACE ("@ Algorithm 3.5 step 3\n"); /* Algorithm 3.5 step4 */ ARC4Init(&ctx, attr->encryption_key, attr->key_len); ARC4CryptBuf(&ctx, digest, digest2, HPDF_MD5_KEY_LEN); - HPDF_PTRACE(("@ Algorithm 3.5 step 4\n")); + HPDF_PTRACE ("@ Algorithm 3.5 step 4\n"); /* Algorithm 3.5 step5 */ for (i = 1; i <= 19; i++) { HPDF_UINT j; HPDF_BYTE new_key[HPDF_MD5_KEY_LEN]; - HPDF_PTRACE(("@ Algorithm 3.5 step 5 loop %u\n", i)); + HPDF_PTRACE ("@ Algorithm 3.5 step 5 loop %u\n", i); for (j = 0; j < attr->key_len; j++) new_key[j] = (HPDF_BYTE)(attr->encryption_key[j] ^ i); @@ -526,7 +526,7 @@ ARC4Init (HPDF_ARC4_Ctx_Rec *ctx, HPDF_UINT i; HPDF_UINT j = 0; - HPDF_PTRACE((" ARC4Init\n")); + HPDF_PTRACE (" ARC4Init\n"); for (i = 0; i < HPDF_ARC4_BUF_SIZE; i++) ctx->state[i] = (HPDF_BYTE)i; @@ -559,7 +559,7 @@ ARC4CryptBuf (HPDF_ARC4_Ctx_Rec *ctx, HPDF_UINT t; HPDF_BYTE K; - HPDF_PTRACE((" ARC4CryptBuf\n")); + HPDF_PTRACE (" ARC4CryptBuf\n"); for (i = 0; i < len; i++) { HPDF_BYTE tmp; @@ -587,7 +587,7 @@ HPDF_Encrypt_InitKey (HPDF_Encrypt attr, HPDF_MD5_CTX ctx; HPDF_UINT key_len; - HPDF_PTRACE((" HPDF_Encrypt_Init\n")); + HPDF_PTRACE (" HPDF_Encrypt_Init\n"); attr->encryption_key[attr->key_len] = (HPDF_BYTE)object_id; attr->encryption_key[attr->key_len + 1] = (HPDF_BYTE)(object_id >> 8); @@ -595,7 +595,7 @@ HPDF_Encrypt_InitKey (HPDF_Encrypt attr, attr->encryption_key[attr->key_len + 3] = (HPDF_BYTE)gen_no; attr->encryption_key[attr->key_len + 4] = (HPDF_BYTE)(gen_no >> 8); - HPDF_PTRACE(("@@@ OID=%u, gen_no=%u\n", (HPDF_INT)object_id, gen_no)); + HPDF_PTRACE ("@@@ OID=%u, gen_no=%u\n", (HPDF_INT)object_id, gen_no); HPDF_MD5Init(&ctx); HPDF_MD5Update(&ctx, attr->encryption_key, attr->key_len + 5); @@ -614,7 +614,7 @@ HPDF_Encrypt_Reset (HPDF_Encrypt attr) HPDF_UINT key_len = (attr->key_len + 5 > HPDF_ENCRYPT_KEY_MAX) ? HPDF_ENCRYPT_KEY_MAX : attr->key_len + 5; - HPDF_PTRACE((" HPDF_Encrypt_Reset\n")); + HPDF_PTRACE (" HPDF_Encrypt_Reset\n"); ARC4Init(&attr->arc4ctx, attr->md5_encryption_key, key_len); } diff --git a/src/hpdf_encryptdict.c b/src/hpdf_encryptdict.c index 1708d77..8205dfe 100644 --- a/src/hpdf_encryptdict.c +++ b/src/hpdf_encryptdict.c @@ -32,7 +32,7 @@ HPDF_EncryptDict_New (HPDF_MMgr mmgr, HPDF_Encrypt attr; HPDF_EncryptDict dict; - HPDF_PTRACE((" HPDF_EncryptDict_New\n")); + HPDF_PTRACE (" HPDF_EncryptDict_New\n"); dict = HPDF_Dict_New (mmgr); if (!dict) @@ -133,7 +133,7 @@ HPDF_EncryptDict_Prepare (HPDF_EncryptDict dict, HPDF_Binary user_key; HPDF_Binary owner_key; - HPDF_PTRACE((" HPDF_EncryptDict_Prepare\n")); + HPDF_PTRACE (" HPDF_EncryptDict_Prepare\n"); HPDF_EncryptDict_CreateID (dict, info, xref); HPDF_Encrypt_CreateOwnerKey (attr); @@ -179,7 +179,7 @@ HPDF_EncryptDict_OnFree (HPDF_Dict obj) { HPDF_Encrypt attr = (HPDF_Encrypt)obj->attr; - HPDF_PTRACE((" HPDF_EncryptDict_OnFree\n")); + HPDF_PTRACE (" HPDF_EncryptDict_OnFree\n"); if (attr) HPDF_FreeMem (obj->mmgr, attr); @@ -193,7 +193,7 @@ HPDF_EncryptDict_SetPassword (HPDF_EncryptDict dict, { HPDF_Encrypt attr = (HPDF_Encrypt)dict->attr; - HPDF_PTRACE((" HPDF_EncryptDict_SetPassword\n")); + HPDF_PTRACE (" HPDF_EncryptDict_SetPassword\n"); if (HPDF_StrLen(owner_passwd, 2) == 0) return HPDF_SetError(dict->error, HPDF_ENCRYPT_INVALID_PASSWORD, 0); @@ -214,7 +214,7 @@ HPDF_EncryptDict_Validate (HPDF_EncryptDict dict) { HPDF_Obj_Header *header = (HPDF_Obj_Header *)dict; - HPDF_PTRACE((" HPDF_EncryptDict_Validate\n")); + HPDF_PTRACE (" HPDF_EncryptDict_Validate\n"); if (!dict || !dict->attr) return HPDF_FALSE; @@ -231,7 +231,7 @@ HPDF_EncryptDict_GetAttr (HPDF_EncryptDict dict) { HPDF_Obj_Header *header = (HPDF_Obj_Header *)dict; - HPDF_PTRACE((" HPDF_EncryptDict_GetAttr\n")); + HPDF_PTRACE (" HPDF_EncryptDict_GetAttr\n"); if (dict && dict->attr && (header->obj_class == (HPDF_OCLASS_DICT | HPDF_OSUBCLASS_ENCRYPT))) diff --git a/src/hpdf_error.c b/src/hpdf_error.c index 7a82f79..4ed5672 100644 --- a/src/hpdf_error.c +++ b/src/hpdf_error.c @@ -74,8 +74,8 @@ HPDF_SetError (HPDF_Error error, HPDF_STATUS error_no, HPDF_STATUS detail_no) { - HPDF_PTRACE((" HPDF_SetError: error_no=0x%04X " - "detail_no=0x%04X\n", (HPDF_UINT)error_no, (HPDF_UINT)detail_no)); + HPDF_PTRACE (" HPDF_SetError: error_no=0x%04X " + "detail_no=0x%04X\n", (HPDF_UINT)error_no, (HPDF_UINT)detail_no); error->error_no = error_no; error->detail_no = detail_no; @@ -87,8 +87,8 @@ HPDF_SetError (HPDF_Error error, HPDF_EXPORT(HPDF_STATUS) HPDF_CheckError (HPDF_Error error) { - HPDF_PTRACE((" HPDF_CheckError: error_no=0x%04X detail_no=0x%04X\n", - (HPDF_UINT)error->error_no, (HPDF_UINT)error->detail_no)); + HPDF_PTRACE (" HPDF_CheckError: error_no=0x%04X detail_no=0x%04X\n", + (HPDF_UINT)error->error_no, (HPDF_UINT)error->detail_no); if (error->error_no != HPDF_OK && error->error_fn) error->error_fn (error->error_no, error->detail_no, error->user_data); diff --git a/src/hpdf_exdata.c b/src/hpdf_exdata.c index d63aab2..23e0925 100644 --- a/src/hpdf_exdata.c +++ b/src/hpdf_exdata.c @@ -34,7 +34,7 @@ HPDF_3DAnnotExData_New(HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_ExData_New\n")); + HPDF_PTRACE (" HPDF_ExData_New\n"); exdata = HPDF_Dict_New (mmgr); if (!exdata) diff --git a/src/hpdf_ext_gstate.c b/src/hpdf_ext_gstate.c index 60347d0..c76afff 100644 --- a/src/hpdf_ext_gstate.c +++ b/src/hpdf_ext_gstate.c @@ -70,7 +70,7 @@ HPDF_ExtGState_New (HPDF_MMgr mmgr, { HPDF_Dict obj = HPDF_Dict_New (mmgr); - HPDF_PTRACE ((" HPDF_ExtGState_New\n")); + HPDF_PTRACE (" HPDF_ExtGState_New\n"); if (!obj) return NULL; diff --git a/src/hpdf_font.c b/src/hpdf_font.c index 114d8f7..e8ff550 100644 --- a/src/hpdf_font.c +++ b/src/hpdf_font.c @@ -28,7 +28,7 @@ HPDF_Font_TextWidth (HPDF_Font font, HPDF_TextWidth tw = {0, 0, 0, 0}; HPDF_FontAttr attr; - HPDF_PTRACE ((" HPDF_Font_TextWidth\n")); + HPDF_PTRACE (" HPDF_Font_TextWidth\n"); if (!HPDF_Font_Validate(font)) return tw; @@ -64,7 +64,7 @@ HPDF_Font_MeasureText (HPDF_Font font, { HPDF_FontAttr attr; - HPDF_PTRACE ((" HPDF_Font_MeasureText\n")); + HPDF_PTRACE (" HPDF_Font_MeasureText\n"); if (!HPDF_Font_Validate(font)) return 0; @@ -91,7 +91,7 @@ HPDF_Font_GetFontName (HPDF_Font font) { HPDF_FontAttr attr; - HPDF_PTRACE((" HPDF_Font_GetFontName\n")); + HPDF_PTRACE (" HPDF_Font_GetFontName\n"); if (!HPDF_Font_Validate(font)) return NULL; @@ -107,7 +107,7 @@ HPDF_Font_GetEncodingName (HPDF_Font font) { HPDF_FontAttr attr; - HPDF_PTRACE((" HPDF_Font_GetEncodingName\n")); + HPDF_PTRACE (" HPDF_Font_GetEncodingName\n"); if (!HPDF_Font_Validate(font)) return NULL; @@ -125,7 +125,7 @@ HPDF_Font_GetUnicodeWidth (HPDF_Font font, HPDF_FontAttr attr; HPDF_FontDef fontdef; - HPDF_PTRACE((" HPDF_Font_GetUnicodeWidth\n")); + HPDF_PTRACE (" HPDF_Font_GetUnicodeWidth\n"); if (!HPDF_Font_Validate(font)) return 0; @@ -153,7 +153,7 @@ HPDF_Font_GetUnicodeWidth (HPDF_Font font, } } - HPDF_PTRACE((" HPDF_Font_GetUnicodeWidth not found (0x%04X)\n", code)); + HPDF_PTRACE (" HPDF_Font_GetUnicodeWidth not found (0x%04X)\n", code); return 0; } @@ -164,7 +164,7 @@ HPDF_Font_GetBBox (HPDF_Font font) { HPDF_Box bbox = {0, 0, 0, 0}; - HPDF_PTRACE((" HPDF_Font_GetBBox\n")); + HPDF_PTRACE (" HPDF_Font_GetBBox\n"); if (HPDF_Font_Validate(font)) return ((HPDF_FontAttr)font->attr)->fontdef->font_bbox; @@ -174,7 +174,7 @@ HPDF_Font_GetBBox (HPDF_Font font) HPDF_EXPORT(HPDF_INT) HPDF_Font_GetAscent (HPDF_Font font) { - HPDF_PTRACE((" HPDF_Font_GetAscent\n")); + HPDF_PTRACE (" HPDF_Font_GetAscent\n"); if (HPDF_Font_Validate(font)) return ((HPDF_FontAttr)font->attr)->fontdef->ascent; @@ -185,7 +185,7 @@ HPDF_Font_GetAscent (HPDF_Font font) HPDF_EXPORT(HPDF_INT) HPDF_Font_GetDescent (HPDF_Font font) { - HPDF_PTRACE((" HPDF_Font_GetDescent\n")); + HPDF_PTRACE (" HPDF_Font_GetDescent\n"); if (HPDF_Font_Validate(font)) return ((HPDF_FontAttr)font->attr)->fontdef->descent; @@ -196,7 +196,7 @@ HPDF_Font_GetDescent (HPDF_Font font) HPDF_EXPORT(HPDF_UINT) HPDF_Font_GetXHeight (HPDF_Font font) { - HPDF_PTRACE((" HPDF_Font_GetXHeight\n")); + HPDF_PTRACE (" HPDF_Font_GetXHeight\n"); if (HPDF_Font_Validate(font)) return ((HPDF_FontAttr)font->attr)->fontdef->x_height; @@ -207,7 +207,7 @@ HPDF_Font_GetXHeight (HPDF_Font font) HPDF_EXPORT(HPDF_UINT) HPDF_Font_GetCapHeight (HPDF_Font font) { - HPDF_PTRACE((" HPDF_Font_GetCapHeight\n")); + HPDF_PTRACE (" HPDF_Font_GetCapHeight\n"); if (HPDF_Font_Validate(font)) return ((HPDF_FontAttr)font->attr)->fontdef->cap_height; @@ -219,7 +219,7 @@ HPDF_Font_GetCapHeight (HPDF_Font font) HPDF_BOOL HPDF_Font_Validate (HPDF_Font font) { - HPDF_PTRACE((" HPDF_Font_Validate\n")); + HPDF_PTRACE (" HPDF_Font_Validate\n"); if (!font || !font->attr || font->header.obj_class != (HPDF_OSUBCLASS_FONT | HPDF_OCLASS_DICT)) diff --git a/src/hpdf_font_cid.c b/src/hpdf_font_cid.c index d1c1a82..0e28ad1 100644 --- a/src/hpdf_font_cid.c +++ b/src/hpdf_font_cid.c @@ -86,7 +86,7 @@ HPDF_Type0Font_New (HPDF_MMgr mmgr, HPDF_STATUS ret = 0; HPDF_Array descendant_fonts; - HPDF_PTRACE ((" HPDF_Type0Font_New\n")); + HPDF_PTRACE (" HPDF_Type0Font_New\n"); font = HPDF_Dict_New (mmgr); if (!font) @@ -198,7 +198,7 @@ OnFree_Func (HPDF_Dict obj) { HPDF_FontAttr attr = (HPDF_FontAttr)obj->attr; - HPDF_PTRACE ((" HPDF_Type0Font_OnFree\n")); + HPDF_PTRACE (" HPDF_Type0Font_OnFree\n"); if (attr) HPDF_FreeMem (obj->mmgr, attr); @@ -224,7 +224,7 @@ CIDFontType0_New (HPDF_Font parent, HPDF_Xref xref) HPDF_Dict descriptor; HPDF_Dict cid_system_info; - HPDF_PTRACE ((" HPDF_CIDFontType0_New\n")); + HPDF_PTRACE (" HPDF_CIDFontType0_New\n"); font = HPDF_Dict_New (parent->mmgr); if (!font) @@ -359,7 +359,7 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref) HPDF_UINT16 max = 0; - HPDF_PTRACE ((" HPDF_CIDFontType2_New\n")); + HPDF_PTRACE (" HPDF_CIDFontType2_New\n"); font = HPDF_Dict_New (parent->mmgr); if (!font) @@ -511,7 +511,7 @@ CIDFontType2_BeforeWrite_Func (HPDF_Dict obj) HPDF_TTFontDefAttr def_attr = (HPDF_TTFontDefAttr)def->attr; HPDF_STATUS ret = 0; - HPDF_PTRACE ((" CIDFontType2_BeforeWrite_Func\n")); + HPDF_PTRACE (" CIDFontType2_BeforeWrite_Func\n"); if (font_attr->map_stream) font_attr->map_stream->filter = obj->filter; @@ -596,7 +596,7 @@ TextWidth (HPDF_Font font, HPDF_INT dw2; HPDF_BYTE b = 0; - HPDF_PTRACE ((" HPDF_Type0Font_TextWidth\n")); + HPDF_PTRACE (" HPDF_Type0Font_TextWidth\n"); if (attr->fontdef->type == HPDF_FONTDEF_TYPE_CID) { HPDF_CIDFontDefAttr cid_fontdef_attr = @@ -681,7 +681,7 @@ MeasureText (HPDF_Font font, HPDF_ParseText_Rec parse_state; HPDF_INT dw2; - HPDF_PTRACE ((" HPDF_Type0Font_MeasureText\n")); + HPDF_PTRACE (" HPDF_Type0Font_MeasureText\n"); if (attr->fontdef->type == HPDF_FONTDEF_TYPE_CID) { HPDF_CIDFontDefAttr cid_fontdef_attr = diff --git a/src/hpdf_font_tt.c b/src/hpdf_font_tt.c index 8b55129..8f67309 100644 --- a/src/hpdf_font_tt.c +++ b/src/hpdf_font_tt.c @@ -69,7 +69,7 @@ HPDF_TTFont_New (HPDF_MMgr mmgr, HPDF_BasicEncoderAttr encoder_attr; HPDF_STATUS ret = 0; - HPDF_PTRACE ((" HPDF_TTFont_New\n")); + HPDF_PTRACE (" HPDF_TTFont_New\n"); font = HPDF_Dict_New (mmgr); if (!font) @@ -166,7 +166,7 @@ CreateDescriptor (HPDF_Font font) HPDF_FontDef def = font_attr->fontdef; HPDF_TTFontDefAttr def_attr = (HPDF_TTFontDefAttr)def->attr; - HPDF_PTRACE ((" HPDF_TTFont_CreateDescriptor\n")); + HPDF_PTRACE (" HPDF_TTFont_CreateDescriptor\n"); if (!font_attr->fontdef->descriptor) { HPDF_Dict descriptor = HPDF_Dict_New (font->mmgr); @@ -258,7 +258,7 @@ TextWidth (HPDF_Font font, HPDF_UINT i; HPDF_BYTE b = 0; - HPDF_PTRACE ((" HPDF_TTFont_TextWidth\n")); + HPDF_PTRACE (" HPDF_TTFont_TextWidth\n"); if (attr->widths) { for (i = 0; i < len; i++) { @@ -299,7 +299,7 @@ MeasureText (HPDF_Font font, HPDF_UINT tmp_len = 0; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_TTFont_MeasureText\n")); + HPDF_PTRACE (" HPDF_TTFont_MeasureText\n"); for (i = 0; i < len; i++) { HPDF_BYTE b = text[i]; @@ -348,7 +348,7 @@ OnWrite (HPDF_Dict obj, char *pbuf = buf; char *eptr = buf + 127; - HPDF_PTRACE ((" HPDF_Font_OnWrite\n")); + HPDF_PTRACE (" HPDF_Font_OnWrite\n"); /* Widths entry */ if ((ret = HPDF_Stream_WriteEscapeName (stream, "Widths")) != HPDF_OK) @@ -382,7 +382,7 @@ OnWrite (HPDF_Dict obj, static HPDF_STATUS BeforeWrite (HPDF_Dict obj) { - HPDF_PTRACE ((" HPDF_TTFont_BeforeWrite\n")); + HPDF_PTRACE (" HPDF_TTFont_BeforeWrite\n"); return CreateDescriptor (obj); } @@ -392,7 +392,7 @@ OnFree (HPDF_Dict obj) { HPDF_FontAttr attr = (HPDF_FontAttr)obj->attr; - HPDF_PTRACE ((" HPDF_TTFont_OnFree\n")); + HPDF_PTRACE (" HPDF_TTFont_OnFree\n"); if (attr) { if (attr->widths) { diff --git a/src/hpdf_font_type1.c b/src/hpdf_font_type1.c index d1476c4..f956864 100644 --- a/src/hpdf_font_type1.c +++ b/src/hpdf_font_type1.c @@ -65,7 +65,7 @@ HPDF_Type1Font_New (HPDF_MMgr mmgr, HPDF_STATUS ret = 0; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_Type1Font_New\n")); + HPDF_PTRACE (" HPDF_Type1Font_New\n"); /* check whether the fontdef object and the encoder object is valid. */ if (encoder->type != HPDF_ENCODER_TYPE_SINGLE_BYTE) { @@ -159,7 +159,7 @@ Type1Font_CreateDescriptor (HPDF_MMgr mmgr, HPDF_FontDef def = font_attr->fontdef; HPDF_Type1FontDefAttr def_attr = (HPDF_Type1FontDefAttr)def->attr; - HPDF_PTRACE ((" HPDF_Type1Font_CreateDescriptor\n")); + HPDF_PTRACE (" HPDF_Type1Font_CreateDescriptor\n"); if (!font_attr->fontdef->descriptor) { HPDF_Dict descriptor = HPDF_Dict_New (mmgr); @@ -234,7 +234,7 @@ Type1Font_TextWidth (HPDF_Font font, HPDF_UINT i; HPDF_BYTE b = 0; - HPDF_PTRACE ((" HPDF_Type1Font_TextWidth\n")); + HPDF_PTRACE (" HPDF_Type1Font_TextWidth\n"); if (attr->widths) { for (i = 0; i < len; i++) { @@ -276,7 +276,7 @@ Type1Font_MeasureText (HPDF_Font font, HPDF_UINT i; HPDF_FontAttr attr = (HPDF_FontAttr)font->attr; - HPDF_PTRACE ((" HPDF_Type1Font_MeasureText\n")); + HPDF_PTRACE (" HPDF_Type1Font_MeasureText\n"); for (i = 0; i < len; i++) { HPDF_BYTE b = text[i]; @@ -327,7 +327,7 @@ Type1Font_OnWrite (HPDF_Dict obj, char buf[HPDF_TMP_BUF_SIZ]; char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; - HPDF_PTRACE ((" HPDF_Font_Type1Font_OnWrite\n")); + HPDF_PTRACE (" HPDF_Font_Type1Font_OnWrite\n"); /* if font is base14-font these entries is not required */ if (!fontdef_attr->is_base14font || encoder_attr->has_differences) { @@ -381,7 +381,7 @@ Type1Font_OnFree (HPDF_Dict obj) { HPDF_FontAttr attr = (HPDF_FontAttr)obj->attr; - HPDF_PTRACE ((" HPDF_Type1Font_OnFree\n")); + HPDF_PTRACE (" HPDF_Type1Font_OnFree\n"); if (attr) { if (attr->widths) { diff --git a/src/hpdf_fontdef.c b/src/hpdf_fontdef.c index 13d4a0c..7e6cba4 100644 --- a/src/hpdf_fontdef.c +++ b/src/hpdf_fontdef.c @@ -25,7 +25,7 @@ HPDF_FontDef_Cleanup (HPDF_FontDef fontdef) if (!fontdef) return; - HPDF_PTRACE ((" HPDF_FontDef_Cleanup\n")); + HPDF_PTRACE (" HPDF_FontDef_Cleanup\n"); if (fontdef->clean_fn) fontdef->clean_fn (fontdef); @@ -39,7 +39,7 @@ HPDF_FontDef_Free (HPDF_FontDef fontdef) if (!fontdef) return; - HPDF_PTRACE ((" HPDF_FontDef_Free\n")); + HPDF_PTRACE (" HPDF_FontDef_Free\n"); if (fontdef->free_fn) fontdef->free_fn (fontdef); @@ -49,7 +49,7 @@ HPDF_FontDef_Free (HPDF_FontDef fontdef) HPDF_BOOL HPDF_FontDef_Validate (HPDF_FontDef fontdef) { - HPDF_PTRACE ((" HPDF_FontDef_Validate\n")); + HPDF_PTRACE (" HPDF_FontDef_Validate\n"); if (!fontdef || fontdef->sig_bytes != HPDF_FONTDEF_SIG_BYTES) return HPDF_FALSE; diff --git a/src/hpdf_fontdef_cid.c b/src/hpdf_fontdef_cid.c index 6745188..e76f145 100644 --- a/src/hpdf_fontdef_cid.c +++ b/src/hpdf_fontdef_cid.c @@ -36,7 +36,7 @@ HPDF_CIDFontDef_FreeWidth (HPDF_FontDef fontdef) HPDF_CIDFontDefAttr attr = (HPDF_CIDFontDefAttr)fontdef->attr; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_FontDef_Validate\n")); + HPDF_PTRACE (" HPDF_FontDef_Validate\n"); for (i = 0; i < attr->widths->count; i++) { HPDF_CID_Width *w = @@ -60,7 +60,7 @@ HPDF_CIDFontDef_New (HPDF_MMgr mmgr, HPDF_FontDef fontdef; HPDF_CIDFontDefAttr fontdef_attr; - HPDF_PTRACE ((" HPDF_CIDFontDef_New\n")); + HPDF_PTRACE (" HPDF_CIDFontDef_New\n"); if (!mmgr) return NULL; @@ -112,7 +112,7 @@ HPDF_CIDFontDef_GetCIDWidth (HPDF_FontDef fontdef, HPDF_CIDFontDefAttr attr = (HPDF_CIDFontDefAttr)fontdef->attr; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_CIDFontDef_GetCIDWidth\n")); + HPDF_PTRACE (" HPDF_CIDFontDef_GetCIDWidth\n"); for (i = 0; i < attr->widths->count; i++) { HPDF_CID_Width *w = (HPDF_CID_Width *)HPDF_List_ItemAt (attr->widths, @@ -131,7 +131,7 @@ HPDF_CIDFontDef_FreeFunc (HPDF_FontDef fontdef) { HPDF_CIDFontDefAttr attr = (HPDF_CIDFontDefAttr)fontdef->attr; - HPDF_PTRACE ((" HPDF_CIDFontDef_FreeFunc\n")); + HPDF_PTRACE (" HPDF_CIDFontDef_FreeFunc\n"); HPDF_CIDFontDef_FreeWidth (fontdef); HPDF_FreeMem (fontdef->mmgr, attr); @@ -144,7 +144,7 @@ HPDF_CIDFontDef_AddWidth (HPDF_FontDef fontdef, { HPDF_CIDFontDefAttr attr = (HPDF_CIDFontDefAttr)fontdef->attr; - HPDF_PTRACE ((" HPDF_CIDFontDef_AddWidth\n")); + HPDF_PTRACE (" HPDF_CIDFontDef_AddWidth\n"); while (widths->cid != 0xFFFF) { HPDF_CID_Width *w = HPDF_GetMem (fontdef->mmgr, @@ -175,7 +175,7 @@ HPDF_CIDFontDef_ChangeStyle (HPDF_FontDef fontdef, HPDF_BOOL bold, HPDF_BOOL italic) { - HPDF_PTRACE ((" HPDF_CIDFontDef_ChangeStyle\n")); + HPDF_PTRACE (" HPDF_CIDFontDef_ChangeStyle\n"); if (!fontdef || !fontdef->attr) return HPDF_INVALID_FONTDEF_DATA; diff --git a/src/hpdf_fontdef_cns.c b/src/hpdf_fontdef_cns.c index af9ff3c..d19b6a5 100644 --- a/src/hpdf_fontdef_cns.c +++ b/src/hpdf_fontdef_cns.c @@ -292,7 +292,7 @@ SimSun_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_SimSun_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_SimSun_Init\n"); fontdef->ascent = 859; fontdef->descent = -140; @@ -354,7 +354,7 @@ SimHei_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_SimHei_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_SimHei_Init\n"); fontdef->ascent = 859; fontdef->descent = -140; diff --git a/src/hpdf_fontdef_cnt.c b/src/hpdf_fontdef_cnt.c index 717c225..f485b25 100644 --- a/src/hpdf_fontdef_cnt.c +++ b/src/hpdf_fontdef_cnt.c @@ -157,7 +157,7 @@ MingLiU_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_MingLiU_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_MingLiU_Init\n"); fontdef->ascent = 800; fontdef->descent = -199; diff --git a/src/hpdf_fontdef_jp.c b/src/hpdf_fontdef_jp.c index 7e48af8..504f667 100644 --- a/src/hpdf_fontdef_jp.c +++ b/src/hpdf_fontdef_jp.c @@ -1553,7 +1553,7 @@ MS_Gothic_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_MS_Gothic_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_MS_Gothic_Init\n"); fontdef->ascent = 859; fontdef->descent = -140; @@ -1614,7 +1614,7 @@ MS_PGothic_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_MS_PGothic_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_MS_PGothic_Init\n"); fontdef->ascent = 859; fontdef->descent = -140; @@ -1675,7 +1675,7 @@ MS_Mincho_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_MS_Mincho_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_MS_Mincho_Init\n"); fontdef->ascent = 859; fontdef->descent = -140; @@ -1737,7 +1737,7 @@ MS_PMincho_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_MS_PMincho_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_MS_PMincho_Init\n"); fontdef->ascent = 859; fontdef->descent = -140; diff --git a/src/hpdf_fontdef_kr.c b/src/hpdf_fontdef_kr.c index 3651f9d..344af13 100644 --- a/src/hpdf_fontdef_kr.c +++ b/src/hpdf_fontdef_kr.c @@ -1221,7 +1221,7 @@ DotumChe_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_DotumChe_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_DotumChe_Init\n"); fontdef->ascent = 858; fontdef->descent = -141; @@ -1282,7 +1282,7 @@ Dotum_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_Dotum_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_Dotum_Init\n"); fontdef->ascent = 858; fontdef->descent = -141; @@ -1343,7 +1343,7 @@ BatangChe_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_BatangChe_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_BatangChe_Init\n"); fontdef->ascent = 858; fontdef->descent = -141; @@ -1405,7 +1405,7 @@ Batang_Init (HPDF_FontDef fontdef) { HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_FontDef_Batang_Init\n")); + HPDF_PTRACE (" HPDF_FontDef_Batang_Init\n"); fontdef->ascent = 858; fontdef->descent = -141; diff --git a/src/hpdf_fontdef_tt.c b/src/hpdf_fontdef_tt.c index f985d35..d495732 100644 --- a/src/hpdf_fontdef_tt.c +++ b/src/hpdf_fontdef_tt.c @@ -180,7 +180,7 @@ FreeFunc (HPDF_FontDef fontdef) { HPDF_TTFontDefAttr attr = (HPDF_TTFontDefAttr)fontdef->attr; - HPDF_PTRACE ((" HPDF_TTFontDef_FreeFunc\n")); + HPDF_PTRACE (" HPDF_TTFontDef_FreeFunc\n"); if (attr) { InitAttr (fontdef); @@ -251,7 +251,7 @@ HPDF_TTFontDef_New (HPDF_MMgr mmgr) HPDF_FontDef fontdef; HPDF_TTFontDefAttr fontdef_attr; - HPDF_PTRACE ((" HPDF_TTFontDef_New\n")); + HPDF_PTRACE (" HPDF_TTFontDef_New\n"); if (!mmgr) return NULL; @@ -290,7 +290,7 @@ HPDF_TTFontDef_Load (HPDF_MMgr mmgr, HPDF_STATUS ret; HPDF_FontDef fontdef; - HPDF_PTRACE ((" HPDF_TTFontDef_Load\n")); + HPDF_PTRACE (" HPDF_TTFontDef_Load\n"); fontdef = HPDF_TTFontDef_New (mmgr); @@ -318,7 +318,7 @@ HPDF_TTFontDef_Load2 (HPDF_MMgr mmgr, HPDF_STATUS ret; HPDF_FontDef fontdef; - HPDF_PTRACE ((" HPDF_TTFontDef_Load\n")); + HPDF_PTRACE (" HPDF_TTFontDef_Load\n"); fontdef = HPDF_TTFontDef_New (mmgr); @@ -350,14 +350,14 @@ DumpTable (HPDF_FontDef fontdef) HPDF_TTFTable *tbl = FindTable (fontdef, REQUIRED_TAGS[i]); if (!tbl) { - HPDF_PTRACE ((" ERR: cannot seek %s\n", fname)); + HPDF_PTRACE (" ERR: cannot seek %s\n", fname); return; } HPDF_MemSet (fname, 0, 9); HPDF_MemCpy (fname, REQUIRED_TAGS[i], 4); HPDF_MemCpy (fname + 4, ".dat", 4); - HPDF_PTRACE ((" %s open\n", fname)); + HPDF_PTRACE (" %s open\n", fname); if (HPDF_MemCmp(fname, "OS/2", 4) == 0) fname[2] = '_'; @@ -365,14 +365,14 @@ DumpTable (HPDF_FontDef fontdef) stream = HPDF_FileWriter_New (fontdef->mmgr, fname); if (!stream) { - HPDF_PTRACE ((" ERR: cannot open %s\n", fname)); + HPDF_PTRACE (" ERR: cannot open %s\n", fname); } else { HPDF_STATUS ret; HPDF_UINT tbl_len = tbl->length; ret = HPDF_Stream_Seek (attr->stream, tbl->offset, HPDF_SEEK_SET); if (ret != HPDF_OK) { - HPDF_PTRACE ((" ERR: cannot seek \n")); + HPDF_PTRACE (" ERR: cannot seek \n"); HPDF_Stream_Free (stream); return; } @@ -390,7 +390,7 @@ DumpTable (HPDF_FontDef fontdef) ret = HPDF_Stream_Write (stream, buf, len); if (ret != HPDF_OK) { - HPDF_PTRACE ((" ERR: cannot write\n")); + HPDF_PTRACE (" ERR: cannot write\n"); break; } @@ -415,7 +415,7 @@ LoadFontData (HPDF_FontDef fontdef, HPDF_STATUS ret; HPDF_TTFTable *tbl; - HPDF_PTRACE ((" HPDF_TTFontDef_LoadFontData\n")); + HPDF_PTRACE (" HPDF_TTFontDef_LoadFontData\n"); attr->stream = stream; attr->embedding = embedding; @@ -466,9 +466,9 @@ LoadFontData (HPDF_FontDef fontdef, fontdef->missing_width = (HPDF_INT16)((HPDF_UINT32)attr->h_metric[0].advance_width * 1000 / attr->header.units_per_em); - HPDF_PTRACE ((" fontdef->cap_height=%d\n", fontdef->cap_height)); - HPDF_PTRACE ((" fontdef->x_height=%d\n", fontdef->x_height)); - HPDF_PTRACE ((" fontdef->missing_width=%d\n", fontdef->missing_width)); + HPDF_PTRACE (" fontdef->cap_height=%d\n", fontdef->cap_height); + HPDF_PTRACE (" fontdef->x_height=%d\n", fontdef->x_height); + HPDF_PTRACE (" fontdef->missing_width=%d\n", fontdef->missing_width); if (!embedding) { HPDF_Stream_Free (attr->stream); @@ -491,7 +491,7 @@ LoadFontData2 (HPDF_FontDef fontdef, HPDF_UINT32 offset; HPDF_UINT size; - HPDF_PTRACE ((" HPDF_TTFontDef_LoadFontData2\n")); + HPDF_PTRACE (" HPDF_TTFontDef_LoadFontData2\n"); attr->stream = stream; attr->embedding = embedding; @@ -513,8 +513,8 @@ LoadFontData2 (HPDF_FontDef fontdef, if ((ret = GetUINT32 (stream, &num_fonts)) != HPDF_OK) return ret; - HPDF_PTRACE((" HPDF_TTFontDef_LoadFontData2 num_fonts=%u\n", - (HPDF_UINT)num_fonts)); + HPDF_PTRACE (" HPDF_TTFontDef_LoadFontData2 num_fonts=%u\n", + (HPDF_UINT)num_fonts); if (index >= num_fonts) return HPDF_SetError (fontdef->error, HPDF_INVALID_TTC_INDEX, 0); @@ -544,7 +544,7 @@ HPDF_TTFontDef_GetCharBBox (HPDF_FontDef fontdef, HPDF_INT m; if (gid == 0) { - HPDF_PTRACE ((" GetCharHeight cannot get gid char=0x%04x\n", unicode)); + HPDF_PTRACE (" GetCharHeight cannot get gid char=0x%04x\n", unicode); return bbox; } @@ -574,9 +574,9 @@ HPDF_TTFontDef_GetCharBBox (HPDF_FontDef fontdef, if (ret != HPDF_OK) return HPDF_ToBox(0, 0, 0, 0); - HPDF_PTRACE((" PdfTTFontDef_GetCharBBox char=0x%04X, " + HPDF_PTRACE (" PdfTTFontDef_GetCharBBox char=0x%04X, " "box=[%f,%f,%f,%f]\n", unicode, bbox.left, bbox.bottom, bbox.right, - bbox.top)); + bbox.top); return bbox; } @@ -697,7 +697,7 @@ LoadTTFTable (HPDF_FontDef fontdef) HPDF_INT i; HPDF_TTFTable *tbl; - HPDF_PTRACE ((" HPDF_TTFontDef_LoadTTFTable\n")); + HPDF_PTRACE (" HPDF_TTFontDef_LoadTTFTable\n"); ret += GetUINT32 (attr->stream, &attr->offset_tbl.sfnt_version); ret += GetUINT16 (attr->stream, &attr->offset_tbl.num_tables); @@ -726,10 +726,10 @@ LoadTTFTable (HPDF_FontDef fontdef) ret += GetUINT32 (attr->stream, &tbl->offset); ret += GetUINT32 (attr->stream, &tbl->length); - HPDF_PTRACE((" [%d] tag=[%c%c%c%c] check_sum=%u offset=%u length=%u\n", + HPDF_PTRACE (" [%d] tag=[%c%c%c%c] check_sum=%u offset=%u length=%u\n", i, tbl->tag[0], tbl->tag[1], tbl->tag[2], tbl->tag[3], (HPDF_UINT)tbl->check_sum, (HPDF_UINT)tbl->offset, - (HPDF_UINT)tbl->length)); + (HPDF_UINT)tbl->length); if (ret != HPDF_OK) return HPDF_Error_GetCode (fontdef->error);; @@ -749,7 +749,7 @@ ParseHead (HPDF_FontDef fontdef) HPDF_STATUS ret; HPDF_UINT siz; - HPDF_PTRACE ((" HPDF_TTFontDef_ParseHead\n")); + HPDF_PTRACE (" HPDF_TTFontDef_ParseHead\n"); if (!tbl) return HPDF_SetError (fontdef->error, HPDF_TTF_MISSING_TABLE, 5); @@ -805,7 +805,7 @@ ParseMaxp (HPDF_FontDef fontdef) HPDF_TTFTable *tbl = FindTable (fontdef, "maxp"); HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_TTFontDef_ParseMaxp\n")); + HPDF_PTRACE (" HPDF_TTFontDef_ParseMaxp\n"); if (!tbl) return HPDF_SetError (fontdef->error, HPDF_TTF_MISSING_TABLE, 9); @@ -816,8 +816,8 @@ ParseMaxp (HPDF_FontDef fontdef) ret = GetUINT16 (attr->stream, &attr->num_glyphs); - HPDF_PTRACE((" HPDF_TTFontDef_ParseMaxp num_glyphs=%u\n", - attr->num_glyphs)); + HPDF_PTRACE (" HPDF_TTFontDef_ParseMaxp num_glyphs=%u\n", + attr->num_glyphs); return ret; } @@ -830,7 +830,7 @@ ParseHhea (HPDF_FontDef fontdef) HPDF_TTFTable *tbl = FindTable (fontdef, "hhea"); HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_TTFontDef_ParseHhea\n")); + HPDF_PTRACE (" HPDF_TTFontDef_ParseHhea\n"); if (!tbl) return HPDF_SetError (fontdef->error, HPDF_TTF_MISSING_TABLE, 6); @@ -857,8 +857,8 @@ ParseHhea (HPDF_FontDef fontdef) if (ret != HPDF_OK) return HPDF_Error_GetCode (fontdef->error); - HPDF_PTRACE((" HPDF_TTFontDef_ParseHhea num_h_metric=%u\n", - attr->num_h_metric)); + HPDF_PTRACE (" HPDF_TTFontDef_ParseHhea num_h_metric=%u\n", + attr->num_h_metric); return ret; } @@ -876,7 +876,7 @@ ParseCMap (HPDF_FontDef fontdef) HPDF_UINT32 ms_unicode_encoding_offset = 0; HPDF_UINT32 byte_encoding_offset = 0; - HPDF_PTRACE ((" HPDF_TTFontDef_ParseCMap\n")); + HPDF_PTRACE (" HPDF_TTFontDef_ParseCMap\n"); if (!tbl) return HPDF_SetError (fontdef->error, HPDF_TTF_MISSING_TABLE, 1); @@ -922,9 +922,9 @@ ParseCMap (HPDF_FontDef fontdef) if (ret != HPDF_OK) return ret; - HPDF_PTRACE((" HPDF_TTFontDef_ParseCMap tables[%d] platformID=%u " + HPDF_PTRACE (" HPDF_TTFontDef_ParseCMap tables[%d] platformID=%u " "encodingID=%u format=%u offset=%u\n", i, platformID, - encodingID, format, (HPDF_UINT)offset)); + encodingID, format, (HPDF_UINT)offset); /* MS-Unicode-CMAP is used for priority */ if (platformID == 3 && encodingID == 1 && format == 4) { @@ -942,14 +942,14 @@ ParseCMap (HPDF_FontDef fontdef) } if (ms_unicode_encoding_offset != 0) { - HPDF_PTRACE((" found microsoft unicode cmap.\n")); + HPDF_PTRACE (" found microsoft unicode cmap.\n"); ret = ParseCMAP_format4(fontdef, ms_unicode_encoding_offset + tbl->offset); } else if (byte_encoding_offset != 0) { - HPDF_PTRACE((" found byte encoding cmap.\n")); + HPDF_PTRACE (" found byte encoding cmap.\n"); ret = ParseCMAP_format0(fontdef, byte_encoding_offset + tbl->offset); } else { - HPDF_PTRACE((" cannot found target cmap.\n")); + HPDF_PTRACE (" cannot found target cmap.\n"); return HPDF_SetError (fontdef->error, HPDF_TTF_INVALID_FOMAT, 0); } @@ -968,7 +968,7 @@ ParseCMAP_format0 (HPDF_FontDef fontdef, HPDF_UINT16 *parray; HPDF_UINT i; - HPDF_PTRACE((" ParseCMAP_format0\n")); + HPDF_PTRACE (" ParseCMAP_format0\n"); ret = HPDF_Stream_Seek (attr->stream, offset, HPDF_SEEK_SET); if (ret != HPDF_OK) @@ -998,8 +998,8 @@ ParseCMAP_format0 (HPDF_FontDef fontdef, parray = attr->cmap.glyph_id_array; for (i = 0; i < 256; i++) { *parray = attr->cmap.glyph_id_array[i]; - HPDF_PTRACE((" ParseCMAP_format0 glyph_id_array[%d]=%u\n", - i, *parray)); + HPDF_PTRACE (" ParseCMAP_format0 glyph_id_array[%d]=%u\n", + i, *parray); parray++; } @@ -1021,7 +1021,7 @@ ParseCMAP_format4 (HPDF_FontDef fontdef, HPDF_UINT16 *pglyph_id_array; HPDF_INT32 num_read; - HPDF_PTRACE((" ParseCMAP_format4\n")); + HPDF_PTRACE (" ParseCMAP_format4\n"); if ((ret = HPDF_Stream_Seek (attr->stream, offset, HPDF_SEEK_SET)) != HPDF_OK) @@ -1115,10 +1115,10 @@ ParseCMAP_format4 (HPDF_FontDef fontdef, #ifdef LIBHPDF_DEBUG /* print all elements of cmap table */ for (i = 0; i < (HPDF_UINT)attr->cmap.seg_count_x2 / 2; i++) { - HPDF_PTRACE((" ParseCMAP_format4[%d] start_count=0x%04X, " + HPDF_PTRACE (" ParseCMAP_format4[%d] start_count=0x%04X, " "end_count=0x%04X, id_delta=%d, id_range_offset=%u\n", i, attr->cmap.start_count[i], attr->cmap.end_count[i], - attr->cmap.id_delta[i], attr->cmap.id_range_offset[i])); + attr->cmap.id_delta[i], attr->cmap.id_range_offset[i]); } #endif @@ -1135,7 +1135,7 @@ HPDF_TTFontDef_GetGlyphid (HPDF_FontDef fontdef, HPDF_UINT seg_count = attr->cmap.seg_count_x2 / 2; HPDF_UINT i; - HPDF_PTRACE((" HPDF_TTFontDef_GetGlyphid\n")); + HPDF_PTRACE (" HPDF_TTFontDef_GetGlyphid\n"); /* format 0 */ if (attr->cmap.format == 0) { @@ -1156,15 +1156,15 @@ HPDF_TTFontDef_GetGlyphid (HPDF_FontDef fontdef, } if (attr->cmap.start_count[i] > unicode) { - HPDF_PTRACE((" HPDF_TTFontDef_GetGlyphid undefined char(0x%04X)\n", - unicode)); + HPDF_PTRACE (" HPDF_TTFontDef_GetGlyphid undefined char(0x%04X)\n", + unicode); return 0; } if (attr->cmap.id_range_offset[i] == 0) { - HPDF_PTRACE((" HPDF_TTFontDef_GetGlyphid idx=%u code=%u " + HPDF_PTRACE (" HPDF_TTFontDef_GetGlyphid idx=%u code=%u " " ret=%u\n", i, unicode, - unicode + attr->cmap.id_delta[i])); + unicode + attr->cmap.id_delta[i]); return (HPDF_UINT16)(unicode + attr->cmap.id_delta[i]); } else { @@ -1172,14 +1172,14 @@ HPDF_TTFontDef_GetGlyphid (HPDF_FontDef fontdef, (unicode - attr->cmap.start_count[i]) - (seg_count - i); if (idx > attr->cmap.glyph_id_array_count) { - HPDF_PTRACE((" HPDF_TTFontDef_GetGlyphid[%u] %u > %u\n", - i, idx, (HPDF_UINT)attr->cmap.glyph_id_array_count)); + HPDF_PTRACE (" HPDF_TTFontDef_GetGlyphid[%u] %u > %u\n", + i, idx, (HPDF_UINT)attr->cmap.glyph_id_array_count); return 0; } else { HPDF_UINT16 gid = (HPDF_UINT16)(attr->cmap.glyph_id_array[idx] + attr->cmap.id_delta[i]); - HPDF_PTRACE((" HPDF_TTFontDef_GetGlyphid idx=%u unicode=0x%04X " - "id=%u\n", idx, unicode, gid)); + HPDF_PTRACE (" HPDF_TTFontDef_GetGlyphid idx=%u unicode=0x%04X " + "id=%u\n", idx, unicode, gid); return gid; } } @@ -1195,11 +1195,11 @@ HPDF_TTFontDef_GetCharWidth (HPDF_FontDef fontdef, HPDF_TTFontDefAttr attr = (HPDF_TTFontDefAttr)fontdef->attr; HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (fontdef, unicode); - HPDF_PTRACE((" HPDF_TTFontDef_GetCharWidth\n")); + HPDF_PTRACE (" HPDF_TTFontDef_GetCharWidth\n"); if (gid >= attr->num_glyphs) { - HPDF_PTRACE((" HPDF_TTFontDef_GetCharWidth WARNING gid > " - "num_glyphs %u > %u\n", gid, attr->num_glyphs)); + HPDF_PTRACE (" HPDF_TTFontDef_GetCharWidth WARNING gid > " + "num_glyphs %u > %u\n", gid, attr->num_glyphs); return fontdef->missing_width; } @@ -1228,7 +1228,7 @@ CheckCompositGryph (HPDF_FontDef fontdef, /* HPDF_UINT len = attr->glyph_tbl.offsets[gid + 1] - offset; */ HPDF_STATUS ret; - HPDF_PTRACE ((" CheckCompositGryph\n")); + HPDF_PTRACE (" CheckCompositGryph\n"); if (attr->header.index_to_loc_format == 0) offset *= 2; @@ -1254,7 +1254,7 @@ CheckCompositGryph (HPDF_FontDef fontdef, if (num_of_contours != -1) return HPDF_OK; - HPDF_PTRACE ((" CheckCompositGryph composit font gid=%u\n", gid)); + HPDF_PTRACE (" CheckCompositGryph composit font gid=%u\n", gid); if ((ret = HPDF_Stream_Seek (attr->stream, 8, HPDF_SEEK_CUR)) != HPDF_OK) @@ -1294,9 +1294,9 @@ CheckCompositGryph (HPDF_FontDef fontdef, if (glyph_index > 0 && glyph_index < attr->num_glyphs) attr->glyph_tbl.flgs[glyph_index] = 1; - HPDF_PTRACE ((" gid=%d, num_of_contours=%d, flags=%d, " + HPDF_PTRACE (" gid=%d, num_of_contours=%d, flags=%d, " "glyph_index=%d\n", gid, num_of_contours, flags, - glyph_index)); + glyph_index); } while (flags & MORE_COMPONENTS); } @@ -1313,11 +1313,11 @@ HPDF_TTFontDef_GetGidWidth (HPDF_FontDef fontdef, HPDF_TTF_LongHorMetric hmetrics; HPDF_TTFontDefAttr attr = (HPDF_TTFontDefAttr)fontdef->attr; - HPDF_PTRACE((" HPDF_TTFontDef_GetGidWidth\n")); + HPDF_PTRACE (" HPDF_TTFontDef_GetGidWidth\n"); if (gid >= attr->num_glyphs) { - HPDF_PTRACE((" HPDF_TTFontDef_GetGidWidth WARNING gid > " - "num_glyphs %u > %u\n", gid, attr->num_glyphs)); + HPDF_PTRACE (" HPDF_TTFontDef_GetGidWidth WARNING gid > " + "num_glyphs %u > %u\n", gid, attr->num_glyphs); return fontdef->missing_width; } @@ -1326,8 +1326,8 @@ HPDF_TTFontDef_GetGidWidth (HPDF_FontDef fontdef, advance_width = (HPDF_UINT16)((HPDF_UINT)hmetrics.advance_width * 1000 / attr->header.units_per_em); - HPDF_PTRACE((" HPDF_TTFontDef_GetGidWidth gid=%u, width=%u\n", - gid, advance_width)); + HPDF_PTRACE (" HPDF_TTFontDef_GetGidWidth gid=%u, width=%u\n", + gid, advance_width); return (HPDF_INT16)advance_width; } @@ -1344,7 +1344,7 @@ ParseHmtx (HPDF_FontDef fontdef) HPDF_UINT16 save_aw = 0; HPDF_TTF_LongHorMetric *pmetric; - HPDF_PTRACE ((" HPDF_TTFontDef_ParseHtmx\n")); + HPDF_PTRACE (" HPDF_TTFontDef_ParseHtmx\n"); if (!tbl) return HPDF_SetError (fontdef->error, HPDF_TTF_MISSING_TABLE, 7); @@ -1371,8 +1371,8 @@ ParseHmtx (HPDF_FontDef fontdef) if ((ret = GetINT16 (attr->stream, &pmetric->lsb)) != HPDF_OK) return ret; - HPDF_PTRACE((" ParseHmtx metric[%u] aw=%u lsb=%d\n", i, - pmetric->advance_width, pmetric->lsb)); + HPDF_PTRACE (" ParseHmtx metric[%u] aw=%u lsb=%d\n", i, + pmetric->advance_width, pmetric->lsb); save_aw = pmetric->advance_width; pmetric++; @@ -1401,7 +1401,7 @@ ParseLoca (HPDF_FontDef fontdef) HPDF_UINT i; HPDF_UINT32 *poffset; - HPDF_PTRACE ((" HPDF_TTFontDef_ParseLoca\n")); + HPDF_PTRACE (" HPDF_TTFontDef_ParseLoca\n"); if (!tbl) return HPDF_SetError (fontdef->error, HPDF_TTF_MISSING_TABLE, 8); @@ -1459,7 +1459,7 @@ ParseLoca (HPDF_FontDef fontdef) #ifdef LIBHPDF_DEBUG poffset = attr->glyph_tbl.offsets; for (i = 0; i <= attr->num_glyphs; i++) { - HPDF_PTRACE((" ParseLOCA offset[%u]=%u\n", i, (HPDF_UINT)*poffset)); + HPDF_PTRACE (" ParseLOCA offset[%u]=%u\n", i, (HPDF_UINT)*poffset); poffset++; } #endif @@ -1518,7 +1518,7 @@ ParseName (HPDF_FontDef fontdef) HPDF_UINT len_id2u = 0; char tmp[HPDF_LIMIT_MAX_NAME_LEN + 1]; - HPDF_PTRACE ((" HPDF_TTFontDef_ParseMaxp\n")); + HPDF_PTRACE (" HPDF_TTFontDef_ParseMaxp\n"); if (!tbl) return HPDF_SetError (fontdef->error, HPDF_TTF_MISSING_TABLE, 10); @@ -1533,9 +1533,9 @@ ParseName (HPDF_FontDef fontdef) if (ret != HPDF_OK) return HPDF_Error_GetCode (fontdef->error); - HPDF_PTRACE((" ParseName() format=%u, count=%u, string_offset=%u\n", + HPDF_PTRACE (" ParseName() format=%u, count=%u, string_offset=%u\n", attr->name_tbl.format, attr->name_tbl.count, - attr->name_tbl.string_offset)); + attr->name_tbl.string_offset); attr->name_tbl.name_records = HPDF_GetMem (fontdef->mmgr, sizeof (HPDF_TTF_NameRecord) * attr->name_tbl.count); @@ -1556,9 +1556,9 @@ ParseName (HPDF_FontDef fontdef) if (ret != HPDF_OK) return HPDF_Error_GetCode (fontdef->error); - HPDF_PTRACE((" ParseName() platformID=%u, encodingID=%d, nameID=%d\n", + HPDF_PTRACE (" ParseName() platformID=%u, encodingID=%d, nameID=%d\n", name_rec->platform_id, name_rec->encoding_id, - name_rec->name_id)); + name_rec->name_id); if (name_rec->platform_id == 1 && name_rec->encoding_id == 0 && name_rec->name_id == 6) { @@ -1667,7 +1667,7 @@ ParseName (HPDF_FontDef fontdef) HPDF_MemCpy ((HPDF_BYTE *)fontdef->base_font, (HPDF_BYTE *)attr->base_font, HPDF_LIMIT_MAX_NAME_LEN + 1); - HPDF_PTRACE((" ParseName() base_font=%s\n", attr->base_font)); + HPDF_PTRACE (" ParseName() base_font=%s\n", attr->base_font); return HPDF_OK; } @@ -1681,7 +1681,7 @@ ParseOS2 (HPDF_FontDef fontdef) HPDF_UINT16 version; HPDF_UINT len; - HPDF_PTRACE ((" ParseOS2\n")); + HPDF_PTRACE (" ParseOS2\n"); if (!tbl) return HPDF_SetError (fontdef->error, HPDF_TTF_MISSING_TABLE, 0); @@ -1719,12 +1719,12 @@ ParseOS2 (HPDF_FontDef fontdef) if ((ret = HPDF_Stream_Read (attr->stream, attr->panose, &len)) != HPDF_OK) return ret; - HPDF_PTRACE((" ParseOS2 sFamilyClass=%d-%d " + HPDF_PTRACE (" ParseOS2 sFamilyClass=%d-%d " "Panose=%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\n", attr->sfamilyclass[0], attr->sfamilyclass[1], attr->panose[0], attr->panose[1], attr->panose[2], attr->panose[3], attr->panose[4], attr->panose[5], attr->panose[6], attr->panose[7], - attr->panose[8], attr->panose[9])); + attr->panose[8], attr->panose[9]); /* Class ID = 1 Oldstyle Serifs Class ID = 2 Transitional Serifs @@ -1760,9 +1760,9 @@ ParseOS2 (HPDF_FontDef fontdef) return ret; } - HPDF_PTRACE((" ParseOS2 CodePageRange1=%08X CodePageRange2=%08X\n", + HPDF_PTRACE (" ParseOS2 CodePageRange1=%08X CodePageRange2=%08X\n", (HPDF_UINT)attr->code_page_range1, - (HPDF_UINT)attr->code_page_range2)); + (HPDF_UINT)attr->code_page_range2); return HPDF_OK; } @@ -1779,7 +1779,7 @@ RecreateGLYF (HPDF_FontDef fontdef, HPDF_STATUS ret; HPDF_INT i; - HPDF_PTRACE ((" RecreateGLYF\n")); + HPDF_PTRACE (" RecreateGLYF\n"); for (i = 0; i < attr->num_glyphs; i++) { HPDF_BYTE buf[HPDF_STREAM_BUF_SIZ]; @@ -1794,9 +1794,9 @@ RecreateGLYF (HPDF_FontDef fontdef, len *= 2; } - HPDF_PTRACE((" RecreateGLYF[%u] move from [%u] to [%u]\n", i, + HPDF_PTRACE (" RecreateGLYF[%u] move from [%u] to [%u]\n", i, (HPDF_UINT)attr->glyph_tbl.base_offset + offset, - (HPDF_UINT)new_offsets[i])); + (HPDF_UINT)new_offsets[i]); if (attr->header.index_to_loc_format == 0) offset *= 2; @@ -1836,7 +1836,7 @@ RecreateGLYF (HPDF_FontDef fontdef, #ifdef DEBUG for (i = 0; i <= attr->num_glyphs; i++) { - HPDF_PTRACE((" RecreateGLYF[%u] offset=%u\n", i, new_offsets[i])); + HPDF_PTRACE (" RecreateGLYF[%u] offset=%u\n", i, new_offsets[i]); } #endif @@ -1855,7 +1855,7 @@ RecreateName (HPDF_FontDef fontdef, HPDF_Stream tmp_stream = HPDF_MemStream_New (fontdef->mmgr, HPDF_STREAM_BUF_SIZ); - HPDF_PTRACE ((" RecreateName\n")); + HPDF_PTRACE (" RecreateName\n"); if (!tmp_stream) return HPDF_Error_GetCode (fontdef->error); @@ -1922,11 +1922,11 @@ RecreateName (HPDF_FontDef fontdef, tmp_len -= len; } - HPDF_PTRACE((" RecreateNAME name_rec[%u] platform_id=%u " + HPDF_PTRACE (" RecreateNAME name_rec[%u] platform_id=%u " "encoding_id=%u language_id=%u name_rec->name_id=%u " "length=%u offset=%u\n", i, name_rec->platform_id, name_rec->encoding_id, name_rec->language_id, - name_rec->name_id, name_len, rec_offset)); + name_rec->name_id, name_len, rec_offset); name_rec++; } @@ -1948,7 +1948,7 @@ WriteHeader (HPDF_FontDef fontdef, HPDF_TTFontDefAttr attr = (HPDF_TTFontDefAttr)fontdef->attr; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" WriteHeader\n")); + HPDF_PTRACE (" WriteHeader\n"); ret += HPDF_Stream_Write (stream, attr->header.version_number, 4); ret += WriteUINT32 (stream, attr->header.font_revision); @@ -1999,7 +1999,7 @@ HPDF_TTFontDef_SaveFontData (HPDF_FontDef fontdef, emptyTable.length = 0; emptyTable.offset = 0; - HPDF_PTRACE ((" SaveFontData\n")); + HPDF_PTRACE (" SaveFontData\n"); ret = WriteUINT32 (stream, attr->offset_tbl.sfnt_version); ret += WriteUINT16 (stream, HPDF_REQUIRED_TAGS_COUNT); @@ -2101,8 +2101,8 @@ HPDF_TTFontDef_SaveFontData (HPDF_FontDef fontdef, HPDF_UINT32 buf; HPDF_UINT length = tbl.length; - HPDF_PTRACE((" SaveFontData() tag[%s] length=%u\n", - REQUIRED_TAGS[i], length)); + HPDF_PTRACE (" SaveFontData() tag[%s] length=%u\n", + REQUIRED_TAGS[i], length); if ((ret = HPDF_Stream_Seek (tmp_stream, tbl.offset, HPDF_SEEK_SET)) != HPDF_OK) @@ -2124,9 +2124,9 @@ HPDF_TTFontDef_SaveFontData (HPDF_FontDef fontdef, if (ret != HPDF_OK) break; - HPDF_PTRACE((" SaveFontData tag[%s] check-sum=%u offset=%u\n", + HPDF_PTRACE (" SaveFontData tag[%s] check-sum=%u offset=%u\n", REQUIRED_TAGS[i], (HPDF_UINT)tbl.check_sum, - (HPDF_UINT)tbl.offset)); + (HPDF_UINT)tbl.offset); ret += HPDF_Stream_Write (stream, (HPDF_BYTE *)REQUIRED_TAGS[i], 4); ret += WriteUINT32 (stream, tbl.check_sum); @@ -2164,8 +2164,8 @@ HPDF_TTFontDef_SaveFontData (HPDF_FontDef fontdef, if (ret != HPDF_OK) goto Exit; - HPDF_PTRACE((" SaveFontData new checkSumAdjustment=%u\n", - (HPDF_UINT)tmp_check_sum)); + HPDF_PTRACE (" SaveFontData new checkSumAdjustment=%u\n", + (HPDF_UINT)tmp_check_sum); UINT32Swap (&tmp_check_sum); @@ -2197,7 +2197,7 @@ HPDF_TTFontDef_SetTagName (HPDF_FontDef fontdef, char buf[HPDF_LIMIT_MAX_NAME_LEN + 1]; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_TTFontDef_SetTagName\n")); + HPDF_PTRACE (" HPDF_TTFontDef_SetTagName\n"); if (HPDF_StrLen (tag, HPDF_LIMIT_MAX_NAME_LEN) != HPDF_TTF_FONT_TAG_LEN) return; @@ -2235,8 +2235,8 @@ FindTable (HPDF_FontDef fontdef, for (i = 0; i < attr->offset_tbl.num_tables; i++, tbl++) { if (HPDF_MemCmp ((HPDF_BYTE *)tbl->tag, (HPDF_BYTE *)tag, 4) == 0) { - HPDF_PTRACE((" FindTable find table[%c%c%c%c]\n", - tbl->tag[0], tbl->tag[1], tbl->tag[2], tbl->tag[3])); + HPDF_PTRACE (" FindTable find table[%c%c%c%c]\n", + tbl->tag[0], tbl->tag[1], tbl->tag[2], tbl->tag[3]); return tbl; } } diff --git a/src/hpdf_fontdef_type1.c b/src/hpdf_fontdef_type1.c index 499f521..a2b10d0 100644 --- a/src/hpdf_fontdef_type1.c +++ b/src/hpdf_fontdef_type1.c @@ -49,7 +49,7 @@ FreeWidth (HPDF_FontDef fontdef) { HPDF_Type1FontDefAttr attr = (HPDF_Type1FontDefAttr)fontdef->attr; - HPDF_PTRACE ((" FreeWidth\n")); + HPDF_PTRACE (" FreeWidth\n"); HPDF_FreeMem (fontdef->mmgr, attr->widths); attr->widths = NULL; @@ -63,7 +63,7 @@ HPDF_Type1FontDef_New (HPDF_MMgr mmgr) HPDF_FontDef fontdef; HPDF_Type1FontDefAttr fontdef_attr; - HPDF_PTRACE ((" HPDF_Type1FontDef_New\n")); + HPDF_PTRACE (" HPDF_Type1FontDef_New\n"); if (!mmgr) return NULL; @@ -99,7 +99,7 @@ GetKeyword (const char *src, { HPDF_UINT src_len = HPDF_StrLen (src, -1); - HPDF_PTRACE ((" GetKeyword\n")); + HPDF_PTRACE (" GetKeyword\n"); if (!keyword || src_len == 0 || len == 0) return NULL; @@ -135,7 +135,7 @@ LoadAfm (HPDF_FontDef fontdef, char keyword[HPDF_LIMIT_MAX_NAME_LEN + 1]; HPDF_UINT i; - HPDF_PTRACE ((" LoadAfm\n")); + HPDF_PTRACE (" LoadAfm\n"); len = HPDF_TMP_BUF_SIZ; @@ -308,7 +308,7 @@ LoadFontData (HPDF_FontDef fontdef, HPDF_STATUS ret; HPDF_BOOL end_flg = HPDF_FALSE; - HPDF_PTRACE ((" LoadFontData\n")); + HPDF_PTRACE (" LoadFontData\n"); attr->font_data = HPDF_MemStream_New (fontdef->mmgr, HPDF_STREAM_BUF_SIZ); @@ -385,7 +385,7 @@ HPDF_Type1FontDef_Load (HPDF_MMgr mmgr, HPDF_FontDef fontdef; HPDF_STATUS ret; - HPDF_PTRACE ((" HPDF_Type1FontDef_Load\n")); + HPDF_PTRACE (" HPDF_Type1FontDef_Load\n"); if (!afm) return NULL; @@ -419,7 +419,7 @@ HPDF_Type1FontDef_Duplicate (HPDF_MMgr mmgr, { HPDF_FontDef fontdef = HPDF_Type1FontDef_New (mmgr); - HPDF_PTRACE ((" HPDF_Type1FontDef_Duplicate\n")); + HPDF_PTRACE (" HPDF_Type1FontDef_Duplicate\n"); fontdef->type = src->type; fontdef->valid = src->valid; @@ -438,7 +438,7 @@ HPDF_Type1FontDef_SetWidths (HPDF_FontDef fontdef, HPDF_CharData* dst; HPDF_UINT i = 0; - HPDF_PTRACE ((" HPDF_Type1FontDef_SetWidths\n")); + HPDF_PTRACE (" HPDF_Type1FontDef_SetWidths\n"); FreeWidth (fontdef); @@ -480,7 +480,7 @@ HPDF_Type1FontDef_GetWidthByName (HPDF_FontDef fontdef, { HPDF_UNICODE unicode = HPDF_GryphNameToUnicode (gryph_name); - HPDF_PTRACE ((" HPDF_Type1FontDef_GetWidthByName\n")); + HPDF_PTRACE (" HPDF_Type1FontDef_GetWidthByName\n"); return HPDF_Type1FontDef_GetWidth (fontdef, unicode); } @@ -494,7 +494,7 @@ HPDF_Type1FontDef_GetWidth (HPDF_FontDef fontdef, HPDF_CharData *cdata = attr->widths; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_Type1FontDef_GetWidth\n")); + HPDF_PTRACE (" HPDF_Type1FontDef_GetWidth\n"); for (i = 0; i < attr->widths_count; i++) { if (cdata->unicode == unicode) @@ -510,7 +510,7 @@ FreeFunc (HPDF_FontDef fontdef) { HPDF_Type1FontDefAttr attr = (HPDF_Type1FontDefAttr)fontdef->attr; - HPDF_PTRACE ((" FreeFunc\n")); + HPDF_PTRACE (" FreeFunc\n"); if (attr->char_set) HPDF_FreeMem (fontdef->mmgr, attr->char_set); diff --git a/src/hpdf_image.c b/src/hpdf_image.c index eeec7c2..2dd4469 100644 --- a/src/hpdf_image.c +++ b/src/hpdf_image.c @@ -44,7 +44,7 @@ LoadJpegHeader (HPDF_Image image, HPDF_STATUS ret; HPDF_Array array; - HPDF_PTRACE ((" HPDF_Image_LoadJpegHeader\n")); + HPDF_PTRACE (" HPDF_Image_LoadJpegHeader\n"); len = 2; if (HPDF_Stream_Read (stream, (HPDF_BYTE *)&tag, &len) != HPDF_OK) @@ -70,7 +70,7 @@ LoadJpegHeader (HPDF_Image image, HPDF_UInt16Swap (&size); - HPDF_PTRACE (("tag=%04X size=%u\n", tag, size)); + HPDF_PTRACE ("tag=%04X size=%u\n", tag, size); if (tag == 0xFFC0 || tag == 0xFFC1 || tag == 0xFFC2 || tag == 0xFFC9) { @@ -175,7 +175,7 @@ HPDF_Image_LoadJpegImage (HPDF_MMgr mmgr, HPDF_Dict image; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_Image_LoadJpegImage\n")); + HPDF_PTRACE (" HPDF_Image_LoadJpegImage\n"); image = HPDF_DictStream_New (mmgr, xref); if (!image) @@ -230,7 +230,7 @@ HPDF_Image_LoadJpegImageFromMem (HPDF_MMgr mmgr, HPDF_Stream jpeg_data; HPDF_Image image; - HPDF_PTRACE ((" HPDF_Image_LoadJpegImageFromMem\n")); + HPDF_PTRACE (" HPDF_Image_LoadJpegImageFromMem\n"); jpeg_data = HPDF_MemStream_New(mmgr,size); if (!HPDF_Stream_Validate (jpeg_data)) { @@ -264,7 +264,7 @@ HPDF_Image_LoadRawImage (HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; HPDF_UINT size; - HPDF_PTRACE ((" HPDF_Image_LoadRawImage\n")); + HPDF_PTRACE (" HPDF_Image_LoadRawImage\n"); if (color_space != HPDF_CS_DEVICE_GRAY && color_space != HPDF_CS_DEVICE_RGB && @@ -331,7 +331,7 @@ HPDF_Image_LoadRawImageFromMem (HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; HPDF_UINT size=0; - HPDF_PTRACE ((" HPDF_Image_LoadRawImageFromMem\n")); + HPDF_PTRACE (" HPDF_Image_LoadRawImageFromMem\n"); if (color_space != HPDF_CS_DEVICE_GRAY && color_space != HPDF_CS_DEVICE_RGB && @@ -399,7 +399,7 @@ HPDF_Image_Validate (HPDF_Image image) { HPDF_Name subtype; - HPDF_PTRACE ((" HPDF_Image_Validate\n")); + HPDF_PTRACE (" HPDF_Image_Validate\n"); if (!image) return HPDF_FALSE; @@ -427,7 +427,7 @@ HPDF_Image_GetSize (HPDF_Image image) HPDF_Number height; HPDF_Point ret = {0, 0}; - HPDF_PTRACE ((" HPDF_Image_GetSize\n")); + HPDF_PTRACE (" HPDF_Image_GetSize\n"); if (!HPDF_Image_Validate (image)) return ret; @@ -451,7 +451,7 @@ HPDF_Image_GetSize2 (HPDF_Image image, HPDF_Point *size) size->x = 0; size->y = 0; - HPDF_PTRACE ((" HPDF_Image_GetSize\n")); + HPDF_PTRACE (" HPDF_Image_GetSize\n"); if (!HPDF_Image_Validate (image)) return HPDF_INVALID_IMAGE; @@ -472,7 +472,7 @@ HPDF_Image_GetBitsPerComponent (HPDF_Image image) { HPDF_Number n; - HPDF_PTRACE ((" HPDF_Image_GetBitsPerComponent\n")); + HPDF_PTRACE (" HPDF_Image_GetBitsPerComponent\n"); if (!HPDF_Image_Validate (image)) return 0; @@ -490,7 +490,7 @@ HPDF_Image_GetColorSpace (HPDF_Image image) { HPDF_Name n; - HPDF_PTRACE ((" HPDF_Image_GetColorSpace\n")); + HPDF_PTRACE (" HPDF_Image_GetColorSpace\n"); n = HPDF_Dict_GetItem (image, "ColorSpace", HPDF_OCLASS_NAME); diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c index 2937fc9..5ab4dd1 100644 --- a/src/hpdf_image_ccitt.c +++ b/src/hpdf_image_ccitt.c @@ -715,7 +715,7 @@ HPDF_Image_Load1BitImageFromMem (HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; /* HPDF_UINT size; */ - HPDF_PTRACE ((" HPDF_Image_Load1BitImage\n")); + HPDF_PTRACE (" HPDF_Image_Load1BitImage\n"); image = HPDF_DictStream_New (mmgr, xref); if (!image) @@ -765,7 +765,7 @@ HPDF_Image_LoadRaw1BitImageFromMem (HPDF_Doc pdf, { HPDF_Image image; - HPDF_PTRACE ((" HPDF_Image_Load1BitImageFromMem\n")); + HPDF_PTRACE (" HPDF_Image_Load1BitImageFromMem\n"); if (!HPDF_HasDoc (pdf)) return NULL; diff --git a/src/hpdf_image_png.c b/src/hpdf_image_png.c index 3f20a77..234df18 100644 --- a/src/hpdf_image_png.c +++ b/src/hpdf_image_png.c @@ -387,7 +387,7 @@ HPDF_Image_LoadPngImage (HPDF_MMgr mmgr, png_byte header[HPDF_PNG_BYTES_TO_CHECK]; HPDF_UINT len = HPDF_PNG_BYTES_TO_CHECK; - HPDF_PTRACE ((" HPDF_Image_LoadPngImage\n")); + HPDF_PTRACE (" HPDF_Image_LoadPngImage\n"); HPDF_MemSet (header, 0x00, HPDF_PNG_BYTES_TO_CHECK); ret = HPDF_Stream_Read (png_data, header, &len); @@ -427,7 +427,7 @@ LoadPngData (HPDF_Dict image, png_structp png_ptr = NULL; png_infop info_ptr = NULL; - HPDF_PTRACE ((" HPDF_Image_LoadPngImage\n")); + HPDF_PTRACE (" HPDF_Image_LoadPngImage\n"); /* create read_struct. */ png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, @@ -663,7 +663,7 @@ PngBeforeWrite (HPDF_Dict obj) HPDF_Stream png_data; HPDF_String s; - HPDF_PTRACE ((" PngBeforeWrite\n")); + HPDF_PTRACE (" PngBeforeWrite\n"); HPDF_MemStream_FreeData(obj->stream); @@ -697,7 +697,7 @@ PngBeforeWrite (HPDF_Dict obj) static HPDF_STATUS PngAfterWrite (HPDF_Dict obj) { - HPDF_PTRACE ((" PngAfterWrite\n")); + HPDF_PTRACE (" PngAfterWrite\n"); HPDF_MemStream_FreeData(obj->stream); diff --git a/src/hpdf_info.c b/src/hpdf_info.c index 5fb601a..c8e5693 100644 --- a/src/hpdf_info.c +++ b/src/hpdf_info.c @@ -57,7 +57,7 @@ HPDF_Info_SetInfoAttr (HPDF_Dict info, { const char* name = InfoTypeToName (type); - HPDF_PTRACE((" HPDF_Info_SetInfoAttr\n")); + HPDF_PTRACE (" HPDF_Info_SetInfoAttr\n"); if (type <= HPDF_INFO_MOD_DATE) return HPDF_SetError (info->error, HPDF_INVALID_PARAMETER, 0); @@ -77,7 +77,7 @@ HPDF_Info_GetInfoAttr (HPDF_Dict info, const char* name = InfoTypeToName (type); HPDF_String s; - HPDF_PTRACE((" HPDF_Info_GetInfoAttr\n")); + HPDF_PTRACE (" HPDF_Info_GetInfoAttr\n"); if (!info) return NULL; @@ -100,7 +100,7 @@ HPDF_Info_SetInfoDateAttr (HPDF_Dict info, char* ptmp; const char* name = InfoTypeToName (type); - HPDF_PTRACE((" HPDF_Info_SetInfoDateAttr\n")); + HPDF_PTRACE (" HPDF_Info_SetInfoDateAttr\n"); if (type > HPDF_INFO_MOD_DATE) return HPDF_SetError (info->error, HPDF_INVALID_PARAMETER, 0); diff --git a/src/hpdf_list.c b/src/hpdf_list.c index b90bf1b..733f9ef 100644 --- a/src/hpdf_list.c +++ b/src/hpdf_list.c @@ -42,7 +42,7 @@ HPDF_List_New (HPDF_MMgr mmgr, { HPDF_List list; - HPDF_PTRACE((" HPDF_List_New\n")); + HPDF_PTRACE (" HPDF_List_New\n"); if (mmgr == NULL) return NULL; @@ -77,7 +77,7 @@ HPDF_STATUS HPDF_List_Add (HPDF_List list, void *item) { - HPDF_PTRACE((" HPDF_List_Add\n")); + HPDF_PTRACE (" HPDF_List_Add\n"); if (list->count >= list->block_siz) { HPDF_STATUS ret = Resize (list, @@ -119,7 +119,7 @@ HPDF_List_Insert (HPDF_List list, void *last_item = list->obj[list->count - 1]; HPDF_INT i; - HPDF_PTRACE((" HPDF_List_Insert\n")); + HPDF_PTRACE (" HPDF_List_Insert\n"); if (target_idx < 0) return HPDF_ITEM_NOT_FOUND; @@ -155,7 +155,7 @@ HPDF_List_Remove (HPDF_List list, HPDF_UINT i; void **obj = list->obj; - HPDF_PTRACE((" HPDF_List_Remove\n")); + HPDF_PTRACE (" HPDF_List_Remove\n"); for (i = 0; i < list->count; i++) { if (*obj == item) { @@ -188,7 +188,7 @@ HPDF_List_RemoveByIndex (HPDF_List list, { void *tmp; - HPDF_PTRACE((" HPDF_List_RemoveByIndex\n")); + HPDF_PTRACE (" HPDF_List_RemoveByIndex\n"); if (list->count <= index) return NULL; @@ -220,7 +220,7 @@ void* HPDF_List_ItemAt (HPDF_List list, HPDF_UINT index) { - HPDF_PTRACE((" HPDF_List_ItemAt\n")); + HPDF_PTRACE (" HPDF_List_ItemAt\n"); return (list->count <= index) ? NULL : list->obj[index]; } @@ -235,7 +235,7 @@ HPDF_List_ItemAt (HPDF_List list, void HPDF_List_Free (HPDF_List list) { - HPDF_PTRACE((" HPDF_List_Free\n")); + HPDF_PTRACE (" HPDF_List_Free\n"); if (!list) return ; @@ -254,7 +254,7 @@ HPDF_List_Free (HPDF_List list) void HPDF_List_Clear (HPDF_List list) { - HPDF_PTRACE((" HPDF_List_Clear\n")); + HPDF_PTRACE (" HPDF_List_Clear\n"); if (list->obj) HPDF_FreeMem (list->mmgr, list->obj); @@ -281,13 +281,15 @@ Resize (HPDF_List list, { void **new_obj; - HPDF_PTRACE((" HPDF_List_Resize\n")); + HPDF_PTRACE (" HPDF_List_Resize\n"); if (list->count >= count) { - if (list->count == count) + if (list->count == count) { + HPDF_PTRACE (" HPDF_List_Resize[ok]\n"); return HPDF_OK; - else + } else { return HPDF_INVALID_PARAMETER; + } } new_obj = (void **)HPDF_GetMem (list->mmgr, count * sizeof(void *)); @@ -304,6 +306,7 @@ Resize (HPDF_List list, HPDF_FreeMem (list->mmgr, list->obj); list->obj = new_obj; + HPDF_PTRACE (" HPDF_List_Resize[ok]\n"); return HPDF_OK; } @@ -324,7 +327,7 @@ HPDF_List_Find (HPDF_List list, { HPDF_UINT i; - HPDF_PTRACE((" HPDF_List_Find\n")); + HPDF_PTRACE (" HPDF_List_Find\n"); for (i = 0; i < list->count; i++) { if (list->obj[i] == item) diff --git a/src/hpdf_mmgr.c b/src/hpdf_mmgr.c index 3069a05..3159e1e 100644 --- a/src/hpdf_mmgr.c +++ b/src/hpdf_mmgr.c @@ -47,14 +47,14 @@ HPDF_MMgr_New (HPDF_Error error, { HPDF_MMgr mmgr; - HPDF_PTRACE((" HPDF_MMgr_New\n")); + HPDF_PTRACE (" HPDF_MMgr_New\n"); if (alloc_fn) mmgr = (HPDF_MMgr)alloc_fn (sizeof(HPDF_MMgr_Rec)); else mmgr = (HPDF_MMgr)InternalGetMem (sizeof(HPDF_MMgr_Rec)); - HPDF_PTRACE(("+%p mmgr-new\n", mmgr)); + HPDF_PTRACE ("+%p mmgr-new\n", mmgr); if (mmgr != NULL) { /* initialize mmgr object */ @@ -91,7 +91,7 @@ HPDF_MMgr_New (HPDF_Error error, node = (HPDF_MPool_Node)mmgr->alloc_fn (sizeof(HPDF_MPool_Node_Rec) + buf_size); - HPDF_PTRACE(("+%p mmgr-node-new\n", node)); + HPDF_PTRACE ("+%p mmgr-node-new\n", node); if (node == NULL) { HPDF_SetError (error, HPDF_FAILD_TO_ALLOC_MEM, HPDF_NOERROR); @@ -127,7 +127,7 @@ HPDF_MMgr_Free (HPDF_MMgr mmgr) { HPDF_MPool_Node node; - HPDF_PTRACE((" HPDF_MMgr_Free\n")); + HPDF_PTRACE (" HPDF_MMgr_Free\n"); if (mmgr == NULL) return; @@ -139,7 +139,7 @@ HPDF_MMgr_Free (HPDF_MMgr mmgr) HPDF_MPool_Node tmp = node; node = tmp->next_node; - HPDF_PTRACE(("-%p mmgr-node-free\n", tmp)); + HPDF_PTRACE ("-%p mmgr-node-free\n", tmp); mmgr->free_fn (tmp); #ifdef HPDF_MEM_DEBUG @@ -156,7 +156,7 @@ HPDF_MMgr_Free (HPDF_MMgr mmgr) HPDF_PRINTF ("# ERROR #\n"); #endif - HPDF_PTRACE(("-%p mmgr-free\n", mmgr)); + HPDF_PTRACE ("-%p mmgr-free\n", mmgr); mmgr->free_fn (mmgr); } @@ -184,7 +184,7 @@ HPDF_GetMem (HPDF_MMgr mmgr, node = (HPDF_MPool_Node)mmgr->alloc_fn (sizeof(HPDF_MPool_Node_Rec) + tmp_buf_siz); - HPDF_PTRACE(("+%p mmgr-new-node\n", node)); + HPDF_PTRACE ("+%p mmgr-new-node\n", node); if (!node) { HPDF_SetError (mmgr->error, HPDF_FAILD_TO_ALLOC_MEM, @@ -202,7 +202,7 @@ HPDF_GetMem (HPDF_MMgr mmgr, ptr = node->buf; } else { ptr = mmgr->alloc_fn (size); - HPDF_PTRACE(("+%p mmgr-alloc_fn size=%u\n", ptr, size)); + HPDF_PTRACE ("+%p mmgr-alloc_fn size=%u\n", ptr, size); if (ptr == NULL) HPDF_SetError (mmgr->error, HPDF_FAILD_TO_ALLOC_MEM, HPDF_NOERROR); @@ -224,7 +224,7 @@ HPDF_FreeMem (HPDF_MMgr mmgr, return; if (!mmgr->mpool) { - HPDF_PTRACE(("-%p mmgr-free-mem\n", aptr)); + HPDF_PTRACE ("-%p mmgr-free-mem\n", aptr); mmgr->free_fn(aptr); #ifdef HPDF_MEM_DEBUG diff --git a/src/hpdf_namedict.c b/src/hpdf_namedict.c index e259a3a..06d0258 100644 --- a/src/hpdf_namedict.c +++ b/src/hpdf_namedict.c @@ -34,7 +34,7 @@ HPDF_NameDict_New (HPDF_MMgr mmgr, { HPDF_NameDict ndict; - HPDF_PTRACE((" HPDF_NameDict_New\n")); + HPDF_PTRACE (" HPDF_NameDict_New\n"); ndict = HPDF_Dict_New (mmgr); if (!ndict) @@ -91,7 +91,7 @@ HPDF_NameTree_New (HPDF_MMgr mmgr, HPDF_NameTree ntree; HPDF_Array items; - HPDF_PTRACE((" HPDF_NameTree_New\n")); + HPDF_PTRACE (" HPDF_NameTree_New\n"); ntree = HPDF_Dict_New (mmgr); if (!ntree) diff --git a/src/hpdf_objects.c b/src/hpdf_objects.c index 59b1958..20f163d 100644 --- a/src/hpdf_objects.c +++ b/src/hpdf_objects.c @@ -25,7 +25,7 @@ HPDF_Obj_Free (HPDF_MMgr mmgr, { HPDF_Obj_Header *header; - HPDF_PTRACE((" HPDF_Obj_Free\n")); + HPDF_PTRACE (" HPDF_Obj_Free\n"); if (!obj) return; @@ -43,17 +43,22 @@ HPDF_Obj_ForceFree (HPDF_MMgr mmgr, { HPDF_Obj_Header *header; - HPDF_PTRACE((" HPDF_Obj_ForceFree\n")); + HPDF_PTRACE (" HPDF_Obj_ForceFree\n"); if (!obj) return; header = (HPDF_Obj_Header *)obj; - HPDF_PTRACE((" HPDF_Obj_ForceFree obj=0x%08X obj_id=0x%08X " + HPDF_PTRACE (" HPDF_Obj_ForceFree obj=0x%08X obj_id=0x%08X " "obj_class=0x%08X\n", +#ifdef __ANDROID64__ + (HPDF_UINT)(HPDF_UINTPTR)obj, (HPDF_UINT)(header->obj_id), + (HPDF_UINT)(header->obj_class)); +#else (HPDF_UINT)obj, (HPDF_UINT)(header->obj_id), - (HPDF_UINT)(header->obj_class))); + (HPDF_UINT)(header->obj_class)); +#endif switch (header->obj_class & HPDF_OCLASS_ANY) { case HPDF_OCLASS_STRING: @@ -80,10 +85,14 @@ HPDF_Obj_Write (void *obj, { HPDF_Obj_Header *header = (HPDF_Obj_Header *)obj; - HPDF_PTRACE((" HPDF_Obj_Write\n")); + HPDF_PTRACE (" HPDF_Obj_Write\n"); if (header->obj_id & HPDF_OTYPE_HIDDEN) { - HPDF_PTRACE(("#HPDF_Obj_Write obj=0x%08X skipped\n", (HPDF_UINT)obj)); +#ifdef __ANDROID64__ + HPDF_PTRACE ("#HPDF_Obj_Write obj=0x%08X skipped\n", (HPDF_UINT)(HPDF_UINTPTR)obj); +#else + HPDF_PTRACE ("#HPDF_Obj_Write obj=0x%08X skipped\n", (HPDF_UINT)obj); +#endif return HPDF_OK; } @@ -114,12 +123,16 @@ HPDF_Obj_WriteValue (void *obj, HPDF_Obj_Header *header; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_Obj_WriteValue\n")); + HPDF_PTRACE (" HPDF_Obj_WriteValue\n"); header = (HPDF_Obj_Header *)obj; - HPDF_PTRACE((" HPDF_Obj_WriteValue obj=0x%08X obj_class=0x%04X\n", - (HPDF_UINT)obj, (HPDF_UINT)header->obj_class)); + HPDF_PTRACE (" HPDF_Obj_WriteValue obj=0x%08X obj_class=0x%04X\n", +#ifdef __ANDROID64__ + (HPDF_UINT)(HPDF_UINTPTR)obj, (HPDF_UINT)header->obj_class); +#else + (HPDF_UINT)obj, (HPDF_UINT)header->obj_class); +#endif switch (header->obj_class & HPDF_OCLASS_ANY) { case HPDF_OCLASS_NAME: @@ -162,7 +175,7 @@ HPDF_Proxy_New (HPDF_MMgr mmgr, { HPDF_Proxy p = HPDF_GetMem (mmgr, sizeof(HPDF_Proxy_Rec)); - HPDF_PTRACE((" HPDF_Proxy_New\n")); + HPDF_PTRACE (" HPDF_Proxy_New\n"); if (p) { HPDF_MemSet (&p->header, 0, sizeof(HPDF_Obj_Header)); diff --git a/src/hpdf_outline.c b/src/hpdf_outline.c index 56ce5e3..960af19 100644 --- a/src/hpdf_outline.c +++ b/src/hpdf_outline.c @@ -49,7 +49,7 @@ HPDF_OutlineRoot_New (HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; HPDF_Number open_flg; - HPDF_PTRACE((" HPDF_OutlineRoot_New\n")); + HPDF_PTRACE (" HPDF_OutlineRoot_New\n"); outline = HPDF_Dict_New (mmgr); if (!outline) @@ -90,7 +90,7 @@ HPDF_Outline_New (HPDF_MMgr mmgr, HPDF_STATUS ret = HPDF_OK; HPDF_Number open_flg; - HPDF_PTRACE((" HPDF_Outline_New\n")); + HPDF_PTRACE (" HPDF_Outline_New\n"); if (!mmgr || !parent || !xref) return NULL; @@ -140,7 +140,7 @@ AddChild (HPDF_Outline parent, HPDF_OCLASS_DICT); HPDF_STATUS ret = 0; - HPDF_PTRACE((" AddChild\n")); + HPDF_PTRACE (" AddChild\n"); if (!first) ret += HPDF_Dict_Add (parent, "First", item); @@ -166,7 +166,7 @@ HPDF_Outline_GetOpened (HPDF_Outline outline) HPDF_Number n = (HPDF_Number)HPDF_Dict_GetItem (outline, "_OPENED", HPDF_OCLASS_NUMBER); - HPDF_PTRACE((" HPDF_Outline_GetOpened\n")); + HPDF_PTRACE (" HPDF_Outline_GetOpened\n"); if (!n) return HPDF_FALSE; @@ -178,7 +178,7 @@ HPDF_Outline_GetOpened (HPDF_Outline outline) HPDF_Outline HPDF_Outline_GetFirst (HPDF_Outline outline) { - HPDF_PTRACE((" HPDF_Outline_GetFirst\n")); + HPDF_PTRACE (" HPDF_Outline_GetFirst\n"); return (HPDF_Outline)HPDF_Dict_GetItem (outline, "First", HPDF_OCLASS_DICT); @@ -188,7 +188,7 @@ HPDF_Outline_GetFirst (HPDF_Outline outline) HPDF_Outline HPDF_Outline_GetLast (HPDF_Outline outline) { - HPDF_PTRACE((" HPDF_Outline_GetLast\n")); + HPDF_PTRACE (" HPDF_Outline_GetLast\n"); return (HPDF_Outline)HPDF_Dict_GetItem (outline, "Last", HPDF_OCLASS_DICT); } @@ -197,7 +197,7 @@ HPDF_Outline_GetLast (HPDF_Outline outline) HPDF_Outline HPDF_Outline_GetPrev (HPDF_Outline outline) { - HPDF_PTRACE((" HPDF_Outline_GetPrev\n")); + HPDF_PTRACE (" HPDF_Outline_GetPrev\n"); return (HPDF_Outline)HPDF_Dict_GetItem (outline, "Prev", HPDF_OCLASS_DICT); } @@ -206,7 +206,7 @@ HPDF_Outline_GetPrev (HPDF_Outline outline) HPDF_Outline HPDF_Outline_GetNext (HPDF_Outline outline) { - HPDF_PTRACE((" HPDF_Outline_GetNext\n")); + HPDF_PTRACE (" HPDF_Outline_GetNext\n"); return (HPDF_Outline)HPDF_Dict_GetItem (outline, "Next", HPDF_OCLASS_DICT); } @@ -215,7 +215,7 @@ HPDF_Outline_GetNext (HPDF_Outline outline) HPDF_Outline HPDF_Outline_GetParent (HPDF_Outline outline) { - HPDF_PTRACE((" HPDF_Outline_GetParent\n")); + HPDF_PTRACE (" HPDF_Outline_GetParent\n"); return (HPDF_Outline)HPDF_Dict_GetItem (outline, "Parent", HPDF_OCLASS_DICT); @@ -229,7 +229,7 @@ BeforeWrite (HPDF_Dict obj) HPDF_OCLASS_NUMBER); HPDF_UINT count = CountChild ((HPDF_Outline)obj); - HPDF_PTRACE((" BeforeWrite\n")); + HPDF_PTRACE (" BeforeWrite\n"); if (count == 0 && n) return HPDF_Dict_RemoveElement (obj, "Count"); @@ -253,7 +253,7 @@ CountChild (HPDF_Outline outline) HPDF_Outline child = HPDF_Outline_GetFirst (outline); HPDF_UINT count = 0; - HPDF_PTRACE((" CountChild\n")); + HPDF_PTRACE (" CountChild\n"); while (child) { count++; @@ -274,7 +274,7 @@ HPDF_Outline_Validate (HPDF_Outline outline) if (!outline) return HPDF_FALSE; - HPDF_PTRACE((" HPDF_Outline_Validate\n")); + HPDF_PTRACE (" HPDF_Outline_Validate\n"); if (outline->header.obj_class != (HPDF_OSUBCLASS_OUTLINE | HPDF_OCLASS_DICT)) @@ -287,7 +287,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_Outline_SetDestination (HPDF_Outline outline, HPDF_Destination dst) { - HPDF_PTRACE((" HPDF_Outline_SetDestination\n")); + HPDF_PTRACE (" HPDF_Outline_SetDestination\n"); if (!HPDF_Outline_Validate (outline)) return HPDF_INVALID_OUTLINE; @@ -317,7 +317,7 @@ HPDF_Outline_SetOpened (HPDF_Outline outline, n = (HPDF_Number)HPDF_Dict_GetItem (outline, "_OPENED", HPDF_OCLASS_NUMBER); - HPDF_PTRACE((" HPDF_Outline_SetOpened\n")); + HPDF_PTRACE (" HPDF_Outline_SetOpened\n"); if (!n) { n = HPDF_Number_New (outline->mmgr, (HPDF_INT)opened); diff --git a/src/hpdf_page_label.c b/src/hpdf_page_label.c index 125a4d8..2472cc3 100644 --- a/src/hpdf_page_label.c +++ b/src/hpdf_page_label.c @@ -27,7 +27,7 @@ HPDF_PageLabel_New (HPDF_Doc pdf, { HPDF_Dict obj = HPDF_Dict_New (pdf->mmgr); - HPDF_PTRACE ((" HPDF_PageLabel_New\n")); + HPDF_PTRACE (" HPDF_PageLabel_New\n"); if (!obj) return NULL; diff --git a/src/hpdf_page_operator.c b/src/hpdf_page_operator.c index 23f5920..ef2e592 100644 --- a/src/hpdf_page_operator.c +++ b/src/hpdf_page_operator.c @@ -57,7 +57,7 @@ HPDF_Page_SetLineWidth (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetLineWidth\n")); + HPDF_PTRACE (" HPDF_Page_SetLineWidth\n"); if (ret != HPDF_OK) return ret; @@ -87,7 +87,7 @@ HPDF_Page_SetLineCap (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetLineCap\n")); + HPDF_PTRACE (" HPDF_Page_SetLineCap\n"); if (ret != HPDF_OK) return ret; @@ -120,7 +120,7 @@ HPDF_Page_SetLineJoin (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetLineJoin\n")); + HPDF_PTRACE (" HPDF_Page_SetLineJoin\n"); if (ret != HPDF_OK) return ret; @@ -151,7 +151,7 @@ HPDF_Page_SetMiterLimit (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetMitterLimit\n")); + HPDF_PTRACE (" HPDF_Page_SetMitterLimit\n"); if (ret != HPDF_OK) return ret; @@ -188,7 +188,7 @@ HPDF_Page_SetDash (HPDF_Page page, HPDF_PageAttr attr; HPDF_UINT i; - HPDF_PTRACE ((" HPDF_Page_SetDash\n")); + HPDF_PTRACE (" HPDF_Page_SetDash\n"); if (ret != HPDF_OK) return ret; @@ -253,7 +253,7 @@ HPDF_Page_SetFlat (HPDF_Page page, HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PAGE_DESCRIPTION | HPDF_GMODE_TEXT_OBJECT); - HPDF_PTRACE ((" HPDF_Page_SetFlat\n")); + HPDF_PTRACE (" HPDF_Page_SetFlat\n"); if (ret != HPDF_OK) return ret; @@ -283,7 +283,7 @@ HPDF_Page_SetExtGState (HPDF_Page page, HPDF_PageAttr attr; const char *local_name; - HPDF_PTRACE ((" HPDF_Page_SetExtGState\n")); + HPDF_PTRACE (" HPDF_Page_SetExtGState\n"); if (ret != HPDF_OK) return ret; @@ -323,7 +323,7 @@ HPDF_Page_GSave (HPDF_Page page) HPDF_PageAttr attr; HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PAGE_DESCRIPTION); - HPDF_PTRACE ((" HPDF_Page_GSave\n")); + HPDF_PTRACE (" HPDF_Page_GSave\n"); if (ret != HPDF_OK) return ret; @@ -350,7 +350,7 @@ HPDF_Page_GRestore (HPDF_Page page) HPDF_PageAttr attr; HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PAGE_DESCRIPTION); - HPDF_PTRACE ((" HPDF_Page_GRestore\n")); + HPDF_PTRACE (" HPDF_Page_GRestore\n"); if (ret != HPDF_OK) return ret; @@ -388,7 +388,7 @@ HPDF_Page_Concat (HPDF_Page page, HPDF_PageAttr attr; HPDF_TransMatrix tm; - HPDF_PTRACE ((" HPDF_Page_Concat\n")); + HPDF_PTRACE (" HPDF_Page_Concat\n"); if (ret != HPDF_OK) return ret; @@ -440,7 +440,7 @@ HPDF_Page_MoveTo (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_MoveTo\n")); + HPDF_PTRACE (" HPDF_Page_MoveTo\n"); if (ret != HPDF_OK) return ret; @@ -477,7 +477,7 @@ HPDF_Page_LineTo (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_LineTo\n")); + HPDF_PTRACE (" HPDF_Page_LineTo\n"); if (ret != HPDF_OK) return ret; @@ -516,7 +516,7 @@ HPDF_Page_CurveTo (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_CurveTo\n")); + HPDF_PTRACE (" HPDF_Page_CurveTo\n"); if (ret != HPDF_OK) return ret; @@ -561,7 +561,7 @@ HPDF_Page_CurveTo2 (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_CurveTo2\n")); + HPDF_PTRACE (" HPDF_Page_CurveTo2\n"); if (ret != HPDF_OK) return ret; @@ -602,7 +602,7 @@ HPDF_Page_CurveTo3 (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_CurveTo3\n")); + HPDF_PTRACE (" HPDF_Page_CurveTo3\n"); if (ret != HPDF_OK) return ret; @@ -636,7 +636,7 @@ HPDF_Page_ClosePath (HPDF_Page page) HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PATH_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_ClosePath\n")); + HPDF_PTRACE (" HPDF_Page_ClosePath\n"); if (ret != HPDF_OK) return ret; @@ -666,7 +666,7 @@ HPDF_Page_Rectangle (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_Rectangle\n")); + HPDF_PTRACE (" HPDF_Page_Rectangle\n"); if (ret != HPDF_OK) return ret; @@ -706,7 +706,7 @@ HPDF_Page_Stroke (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_Stroke\n")); + HPDF_PTRACE (" HPDF_Page_Stroke\n"); if (ret != HPDF_OK) return ret; @@ -730,7 +730,7 @@ HPDF_Page_ClosePathStroke (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_ClosePathStroke\n")); + HPDF_PTRACE (" HPDF_Page_ClosePathStroke\n"); if (ret != HPDF_OK) return ret; @@ -754,7 +754,7 @@ HPDF_Page_Fill (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_Fill\n")); + HPDF_PTRACE (" HPDF_Page_Fill\n"); if (ret != HPDF_OK) return ret; @@ -778,7 +778,7 @@ HPDF_Page_Eofill (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_Eofill\n")); + HPDF_PTRACE (" HPDF_Page_Eofill\n"); if (ret != HPDF_OK) return ret; @@ -802,7 +802,7 @@ HPDF_Page_FillStroke (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_FillStroke\n")); + HPDF_PTRACE (" HPDF_Page_FillStroke\n"); if (ret != HPDF_OK) return ret; @@ -826,7 +826,7 @@ HPDF_Page_EofillStroke (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_EofillStroke\n")); + HPDF_PTRACE (" HPDF_Page_EofillStroke\n"); if (ret != HPDF_OK) return ret; @@ -849,7 +849,7 @@ HPDF_Page_ClosePathFillStroke (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_ClosePathFillStroke\n")); + HPDF_PTRACE (" HPDF_Page_ClosePathFillStroke\n"); if (ret != HPDF_OK) return ret; @@ -873,7 +873,7 @@ HPDF_Page_ClosePathEofillStroke (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_ClosePathEofillStroke\n")); + HPDF_PTRACE (" HPDF_Page_ClosePathEofillStroke\n"); if (ret != HPDF_OK) return ret; @@ -897,7 +897,7 @@ HPDF_Page_EndPath (HPDF_Page page) HPDF_GMODE_CLIPPING_PATH); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_PageEndPath\n")); + HPDF_PTRACE (" HPDF_PageEndPath\n"); if (ret != HPDF_OK) return ret; @@ -923,7 +923,7 @@ HPDF_Page_Clip (HPDF_Page page) HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PATH_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_Clip\n")); + HPDF_PTRACE (" HPDF_Page_Clip\n"); if (ret != HPDF_OK) return ret; @@ -945,7 +945,7 @@ HPDF_Page_Eoclip (HPDF_Page page) HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PATH_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_Eoclip\n")); + HPDF_PTRACE (" HPDF_Page_Eoclip\n"); if (ret != HPDF_OK) return ret; @@ -971,7 +971,7 @@ HPDF_Page_BeginText (HPDF_Page page) HPDF_PageAttr attr; const HPDF_TransMatrix INIT_MATRIX = {1, 0, 0, 1, 0, 0}; - HPDF_PTRACE ((" HPDF_Page_BeginText\n")); + HPDF_PTRACE (" HPDF_Page_BeginText\n"); if (ret != HPDF_OK) return ret; @@ -995,7 +995,7 @@ HPDF_Page_EndText (HPDF_Page page) HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_EndText\n")); + HPDF_PTRACE (" HPDF_Page_EndText\n"); if (ret != HPDF_OK) return ret; @@ -1022,7 +1022,7 @@ HPDF_Page_SetCharSpace (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetCharSpace\n")); + HPDF_PTRACE (" HPDF_Page_SetCharSpace\n"); if (ret != HPDF_OK) return ret; @@ -1052,7 +1052,7 @@ HPDF_Page_SetWordSpace (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetWordSpace\n")); + HPDF_PTRACE (" HPDF_Page_SetWordSpace\n"); if (ret != HPDF_OK) return ret; @@ -1082,7 +1082,7 @@ HPDF_Page_SetHorizontalScalling (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetHorizontalScalling\n")); + HPDF_PTRACE (" HPDF_Page_SetHorizontalScalling\n"); if (ret != HPDF_OK) return ret; @@ -1113,7 +1113,7 @@ HPDF_Page_SetTextLeading (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetTextLeading\n")); + HPDF_PTRACE (" HPDF_Page_SetTextLeading\n"); if (ret != HPDF_OK) return ret; @@ -1146,7 +1146,7 @@ HPDF_Page_SetFontAndSize (HPDF_Page page, const char *local_name; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetFontAndSize\n")); + HPDF_PTRACE (" HPDF_Page_SetFontAndSize\n"); if (ret != HPDF_OK) return ret; @@ -1193,7 +1193,7 @@ HPDF_Page_SetTextRenderingMode (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetTextRenderingMode\n")); + HPDF_PTRACE (" HPDF_Page_SetTextRenderingMode\n"); if (ret != HPDF_OK) return ret; @@ -1232,7 +1232,7 @@ HPDF_Page_SetTextRise (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetTextRaise\n")); + HPDF_PTRACE (" HPDF_Page_SetTextRaise\n"); if (ret != HPDF_OK) return ret; @@ -1265,7 +1265,7 @@ HPDF_Page_MoveTextPos (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_MoveTextPos\n")); + HPDF_PTRACE (" HPDF_Page_MoveTextPos\n"); if (ret != HPDF_OK) return ret; @@ -1302,7 +1302,7 @@ HPDF_Page_MoveTextPos2 (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_MoveTextPos2\n")); + HPDF_PTRACE (" HPDF_Page_MoveTextPos2\n"); if (ret != HPDF_OK) return ret; @@ -1344,7 +1344,7 @@ HPDF_Page_SetTextMatrix (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetTextMatrix\n")); + HPDF_PTRACE (" HPDF_Page_SetTextMatrix\n"); if (ret != HPDF_OK) return ret; @@ -1392,7 +1392,7 @@ HPDF_Page_MoveToNextLine (HPDF_Page page) HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_MoveToNextLine\n")); + HPDF_PTRACE (" HPDF_Page_MoveToNextLine\n"); if (ret != HPDF_OK) return ret; @@ -1423,7 +1423,7 @@ HPDF_Page_ShowText (HPDF_Page page, HPDF_PageAttr attr; HPDF_REAL tw; - HPDF_PTRACE ((" HPDF_Page_ShowText\n")); + HPDF_PTRACE (" HPDF_Page_ShowText\n"); if (ret != HPDF_OK || text == NULL || text[0] == 0) return ret; @@ -1466,7 +1466,7 @@ HPDF_Page_ShowTextNextLine (HPDF_Page page, HPDF_PageAttr attr; HPDF_REAL tw; - HPDF_PTRACE ((" HPDF_Page_ShowTextNextLine\n")); + HPDF_PTRACE (" HPDF_Page_ShowTextNextLine\n"); if (ret != HPDF_OK) return ret; @@ -1520,7 +1520,7 @@ HPDF_Page_ShowTextNextLineEx (HPDF_Page page, char *pbuf = buf; char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; - HPDF_PTRACE ((" HPDF_Page_ShowTextNextLineEX\n")); + HPDF_PTRACE (" HPDF_Page_ShowTextNextLineEX\n"); if (ret != HPDF_OK) return ret; @@ -1598,7 +1598,7 @@ HPDF_Page_SetGrayFill (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetGrayFill\n")); + HPDF_PTRACE (" HPDF_Page_SetGrayFill\n"); if (ret != HPDF_OK) return ret; @@ -1629,7 +1629,7 @@ HPDF_Page_SetGrayStroke (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetGrayStroke\n")); + HPDF_PTRACE (" HPDF_Page_SetGrayStroke\n"); if (ret != HPDF_OK) return ret; @@ -1665,7 +1665,7 @@ HPDF_Page_SetRGBFill (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetRGBFill\n")); + HPDF_PTRACE (" HPDF_Page_SetRGBFill\n"); if (ret != HPDF_OK) return ret; @@ -1709,7 +1709,7 @@ HPDF_Page_SetRGBStroke (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetRGBStroke\n")); + HPDF_PTRACE (" HPDF_Page_SetRGBStroke\n"); if (ret != HPDF_OK) return ret; @@ -1754,7 +1754,7 @@ HPDF_Page_SetCMYKFill (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetCMYKFill\n")); + HPDF_PTRACE (" HPDF_Page_SetCMYKFill\n"); if (ret != HPDF_OK) return ret; @@ -1802,7 +1802,7 @@ HPDF_Page_SetCMYKStroke (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_SetCMYKStroke\n")); + HPDF_PTRACE (" HPDF_Page_SetCMYKStroke\n"); if (ret != HPDF_OK) return ret; @@ -1856,7 +1856,7 @@ HPDF_Page_ExecuteXObject (HPDF_Page page, HPDF_PageAttr attr; const char *local_name; - HPDF_PTRACE ((" HPDF_Page_ExecuteXObject\n")); + HPDF_PTRACE (" HPDF_Page_ExecuteXObject\n"); if (ret != HPDF_OK) return ret; @@ -1998,7 +1998,7 @@ HPDF_Page_Circle (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_Circle\n")); + HPDF_PTRACE (" HPDF_Page_Circle\n"); if (ret != HPDF_OK) return ret; @@ -2131,7 +2131,7 @@ HPDF_Page_Ellipse (HPDF_Page page, char *eptr = buf + HPDF_TMP_BUF_SIZ - 1; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_Ellipse\n")); + HPDF_PTRACE (" HPDF_Page_Ellipse\n"); if (ret != HPDF_OK) return ret; @@ -2181,7 +2181,7 @@ HPDF_Page_Arc (HPDF_Page page, HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PAGE_DESCRIPTION | HPDF_GMODE_PATH_OBJECT); - HPDF_PTRACE ((" HPDF_Page_Arc\n")); + HPDF_PTRACE (" HPDF_Page_Arc\n"); if (fabs(ang2 - ang1) >= 360) HPDF_RaiseError (page->error, HPDF_PAGE_OUT_OF_RANGE, 0); @@ -2240,7 +2240,7 @@ InternalArc (HPDF_Page page, HPDF_DOUBLE delta_angle; HPDF_DOUBLE new_angle; - HPDF_PTRACE ((" HPDF_Page_InternalArc\n")); + HPDF_PTRACE (" HPDF_Page_InternalArc\n"); attr = (HPDF_PageAttr)page->attr; @@ -2333,7 +2333,7 @@ InternalWriteText (HPDF_PageAttr attr, HPDF_FontAttr font_attr = (HPDF_FontAttr)attr->gstate->font->attr; HPDF_STATUS ret; - HPDF_PTRACE ((" InternalWriteText\n")); + HPDF_PTRACE (" InternalWriteText\n"); if (font_attr->type == HPDF_FONT_TYPE0_TT || font_attr->type == HPDF_FONT_TYPE0_CID) { @@ -2411,7 +2411,7 @@ HPDF_Page_TextOut (HPDF_Page page, HPDF_REAL y; HPDF_PageAttr attr; - HPDF_PTRACE ((" HPDF_Page_TextOut\n")); + HPDF_PTRACE (" HPDF_Page_TextOut\n"); if (ret != HPDF_OK) return ret; @@ -2446,7 +2446,7 @@ HPDF_Page_TextRect (HPDF_Page page, HPDF_Box bbox; HPDF_BOOL char_space_changed = HPDF_FALSE; - HPDF_PTRACE ((" HPDF_Page_TextRect\n")); + HPDF_PTRACE (" HPDF_Page_TextRect\n"); if (ret != HPDF_OK) return ret; @@ -2616,7 +2616,7 @@ InternalShowTextNextLine (HPDF_Page page, HPDF_REAL tw; HPDF_FontAttr font_attr; - HPDF_PTRACE ((" ShowTextNextLine\n")); + HPDF_PTRACE (" ShowTextNextLine\n"); attr = (HPDF_PageAttr)page->attr; font_attr = (HPDF_FontAttr)attr->gstate->font->attr; @@ -2688,7 +2688,7 @@ HPDF_Page_SetSlideShow (HPDF_Page page, HPDF_STATUS ret = HPDF_OK; HPDF_Dict dict; - HPDF_PTRACE((" HPDF_Page_SetSlideShow\n")); + HPDF_PTRACE (" HPDF_Page_SetSlideShow\n"); if (!HPDF_Page_Validate (page)) return HPDF_INVALID_PAGE; @@ -2823,7 +2823,7 @@ HPDF_Page_New_Content_Stream (HPDF_Page page, HPDF_UINT filter; HPDF_Array contents_array; - HPDF_PTRACE((" HPDF_Page_New_Content_Stream\n")); + HPDF_PTRACE (" HPDF_Page_New_Content_Stream\n"); attr = (HPDF_PageAttr)page->attr; filter = attr->contents->filter; @@ -2875,7 +2875,7 @@ HPDF_Page_Insert_Shared_Content_Stream (HPDF_Page page, HPDF_GMODE_TEXT_OBJECT); HPDF_Array contents_array; - HPDF_PTRACE((" HPDF_Page_Insert_Shared_Content_Stream\n")); + HPDF_PTRACE (" HPDF_Page_Insert_Shared_Content_Stream\n"); /* check if there is already an array of contents */ contents_array = (HPDF_Array) HPDF_Dict_GetItem(page,"Contents", HPDF_OCLASS_ARRAY); diff --git a/src/hpdf_pages.c b/src/hpdf_pages.c index 1dc2da0..361f10d 100644 --- a/src/hpdf_pages.c +++ b/src/hpdf_pages.c @@ -98,7 +98,7 @@ HPDF_Pages_New (HPDF_MMgr mmgr, HPDF_Pages pages; - HPDF_PTRACE((" HPDF_Pages_New\n")); + HPDF_PTRACE (" HPDF_Pages_New\n"); pages = HPDF_Dict_New (mmgr); if (!pages) @@ -132,7 +132,7 @@ HPDF_Pages_AddKids (HPDF_Pages parent, HPDF_Array kids; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_Pages_AddKids\n")); + HPDF_PTRACE (" HPDF_Pages_AddKids\n"); if (HPDF_Dict_GetItem (kid, "Parent", HPDF_OCLASS_DICT)) return HPDF_SetError (parent->error, HPDF_PAGE_CANNOT_SET_PARENT, 0); @@ -163,7 +163,7 @@ HPDF_Page_InsertBefore (HPDF_Page page, HPDF_STATUS ret; HPDF_PageAttr attr; - HPDF_PTRACE((" HPDF_Page_InsertBefore\n")); + HPDF_PTRACE (" HPDF_Page_InsertBefore\n"); if (!target) return HPDF_INVALID_PARAMETER; @@ -200,7 +200,7 @@ Pages_BeforeWrite (HPDF_Dict obj) HPDF_OCLASS_NUMBER); HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_Pages_BeforeWrite\n")); + HPDF_PTRACE (" HPDF_Pages_BeforeWrite\n"); if (!kids) return HPDF_SetError (obj->error, HPDF_PAGES_MISSING_KIDS_ENTRY, 0); @@ -227,18 +227,18 @@ Page_BeforeWrite (HPDF_Dict obj) HPDF_Page page = (HPDF_Page)obj; HPDF_PageAttr attr = (HPDF_PageAttr)obj->attr; - HPDF_PTRACE((" HPDF_Page_BeforeWrite\n")); + HPDF_PTRACE (" HPDF_Page_BeforeWrite\n"); if (attr->gmode == HPDF_GMODE_PATH_OBJECT) { - HPDF_PTRACE((" HPDF_Page_BeforeWrite warning path object is not" - " end\n")); + HPDF_PTRACE (" HPDF_Page_BeforeWrite warning path object is not" + " end\n"); if ((ret = HPDF_Page_EndPath (page)) != HPDF_OK) return ret; } if (attr->gmode == HPDF_GMODE_TEXT_OBJECT) { - HPDF_PTRACE((" HPDF_Page_BeforeWrite warning text block is not end\n")); + HPDF_PTRACE (" HPDF_Page_BeforeWrite warning text block is not end\n"); if ((ret = HPDF_Page_EndText (page)) != HPDF_OK) return ret; @@ -262,7 +262,7 @@ GetPageCount (HPDF_Dict pages) HPDF_Array kids = (HPDF_Array)HPDF_Dict_GetItem (pages, "Kids", HPDF_OCLASS_ARRAY); - HPDF_PTRACE((" GetPageCount\n")); + HPDF_PTRACE (" GetPageCount\n"); if (!kids) return 0; @@ -286,7 +286,7 @@ HPDF_Pages_Validate (HPDF_Pages pages) { HPDF_Obj_Header *header = (HPDF_Obj_Header *)pages; - HPDF_PTRACE((" HPDF_Pages_Validate\n")); + HPDF_PTRACE (" HPDF_Pages_Validate\n"); if (!pages || header->obj_class != (HPDF_OCLASS_DICT | HPDF_OSUBCLASS_PAGES)) @@ -308,7 +308,7 @@ HPDF_Page_New (HPDF_MMgr mmgr, HPDF_PageAttr attr; HPDF_Page page; - HPDF_PTRACE((" HPDF_Page_New\n")); + HPDF_PTRACE (" HPDF_Page_New\n"); page = HPDF_Dict_New (mmgr); if (!page) @@ -360,7 +360,7 @@ HPDF_Page_New (HPDF_MMgr mmgr, HPDF_EXPORT(HPDF_MMgr) HPDF_GetPageMMgr (HPDF_Page page) { - HPDF_PTRACE ((" HPDF_GetPageMMgr\n")); + HPDF_PTRACE (" HPDF_GetPageMMgr\n"); return page->mmgr; } @@ -371,7 +371,7 @@ Page_OnFree (HPDF_Dict obj) { HPDF_PageAttr attr = (HPDF_PageAttr)obj->attr; - HPDF_PTRACE((" HPDF_Page_OnFree\n")); + HPDF_PTRACE (" HPDF_Page_OnFree\n"); if (attr) { if (attr->gstate) @@ -408,7 +408,7 @@ HPDF_Page_GetInheritableItem (HPDF_Page page, HPDF_INT i = 0; void * obj; - HPDF_PTRACE((" HPDF_Page_GetInheritableItem\n")); + HPDF_PTRACE (" HPDF_Page_GetInheritableItem\n"); /* check whether the specified key is valid */ while (HPDF_INHERITABLE_ENTRIES[i]) { @@ -453,7 +453,7 @@ AddResource (HPDF_Page page) HPDF_Dict resource; HPDF_Array procset; - HPDF_PTRACE((" HPDF_Page_AddResource\n")); + HPDF_PTRACE (" HPDF_Page_AddResource\n"); resource = HPDF_Dict_New (page->mmgr); if (!resource) @@ -492,7 +492,7 @@ HPDF_Page_GetLocalFontName (HPDF_Page page, HPDF_PageAttr attr = (HPDF_PageAttr )page->attr; const char *key; - HPDF_PTRACE((" HPDF_Page_GetLocalFontName\n")); + HPDF_PTRACE (" HPDF_Page_GetLocalFontName\n"); /* whether check font-resource exists. when it does not exists, * create font-resource @@ -545,7 +545,7 @@ HPDF_Page_GetMediaBox (HPDF_Page page) { HPDF_Box media_box = {0, 0, 0, 0}; - HPDF_PTRACE((" HPDF_Page_GetMediaBox\n")); + HPDF_PTRACE (" HPDF_Page_GetMediaBox\n"); if (HPDF_Page_Validate (page)) { HPDF_Array array = HPDF_Page_GetInheritableItem (page, "MediaBox", @@ -593,7 +593,7 @@ HPDF_Page_CreateXObjectFromImage(HPDF_Doc pdf, HPDF_Array array1; HPDF_Array array2; - HPDF_PTRACE((" HPDF_Page_CreateXObjectFromImage\n")); + HPDF_PTRACE (" HPDF_Page_CreateXObjectFromImage\n"); fromxobject = HPDF_DictStream_New (pdf->mmgr, pdf->xref); if (!fromxobject) @@ -722,7 +722,7 @@ HPDF_Page_CreateXObjectAsWhiteRect (HPDF_Doc pdf, HPDF_Array array1; HPDF_Array array2; - HPDF_PTRACE((" HPDF_Page_CreateXObjectAsWhiteRect\n")); + HPDF_PTRACE (" HPDF_Page_CreateXObjectAsWhiteRect\n"); fromxobject = HPDF_DictStream_New (pdf->mmgr, pdf->xref); if (!fromxobject) @@ -829,7 +829,7 @@ HPDF_Page_GetXObjectName (HPDF_Page page, HPDF_PageAttr attr = (HPDF_PageAttr )page->attr; const char *key; - HPDF_PTRACE((" HPDF_Page_GetXObjectName\n")); + HPDF_PTRACE (" HPDF_Page_GetXObjectName\n"); if (!attr->xobjects) { HPDF_Dict resources; @@ -880,7 +880,7 @@ HPDF_Page_GetExtGStateName (HPDF_Page page, HPDF_PageAttr attr = (HPDF_PageAttr )page->attr; const char *key; - HPDF_PTRACE((" HPDF_Page_GetExtGStateName\n")); + HPDF_PTRACE (" HPDF_Page_GetExtGStateName\n"); if (!attr->ext_gstates) { HPDF_Dict resources; @@ -931,7 +931,7 @@ AddAnnotation (HPDF_Page page, HPDF_Array array; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Pages\n")); + HPDF_PTRACE (" HPDF_Pages\n"); /* find "Annots" entry */ array = HPDF_Dict_GetItem (page, "Annots", HPDF_OCLASS_ARRAY); @@ -965,7 +965,7 @@ HPDF_Page_TextWidth (HPDF_Page page, HPDF_REAL ret = 0; HPDF_UINT len = HPDF_StrLen(text, HPDF_LIMIT_MAX_STRING_LEN + 1); - HPDF_PTRACE((" HPDF_Page_TextWidth\n")); + HPDF_PTRACE (" HPDF_Page_TextWidth\n"); if (!HPDF_Page_Validate (page) || len == 0) return 0; @@ -1006,7 +1006,7 @@ HPDF_Page_MeasureText (HPDF_Page page, attr = (HPDF_PageAttr )page->attr; - HPDF_PTRACE((" HPDF_Page_MeasureText\n")); + HPDF_PTRACE (" HPDF_Page_MeasureText\n"); /* no font exists */ if (!attr->gstate->font) { @@ -1041,7 +1041,7 @@ HPDF_Page_GetHeight (HPDF_Page page) HPDF_EXPORT(HPDF_Font) HPDF_Page_GetCurrentFont (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetFontName\n")); + HPDF_PTRACE (" HPDF_Page_GetFontName\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1055,7 +1055,7 @@ HPDF_Page_GetCurrentFont (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetCurrentFontSize (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetCurrentFontSize\n")); + HPDF_PTRACE (" HPDF_Page_GetCurrentFontSize\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1071,7 +1071,7 @@ HPDF_Page_GetTransMatrix (HPDF_Page page) { HPDF_TransMatrix DEF_MATRIX = {1, 0, 0, 1, 0, 0}; - HPDF_PTRACE((" HPDF_Page_GetTransMatrix\n")); + HPDF_PTRACE (" HPDF_Page_GetTransMatrix\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1084,7 +1084,7 @@ HPDF_Page_GetTransMatrix (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetLineWidth (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetLineWidth\n")); + HPDF_PTRACE (" HPDF_Page_GetLineWidth\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1098,7 +1098,7 @@ HPDF_Page_GetLineWidth (HPDF_Page page) HPDF_EXPORT(HPDF_LineCap) HPDF_Page_GetLineCap (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetLineCap\n")); + HPDF_PTRACE (" HPDF_Page_GetLineCap\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1112,7 +1112,7 @@ HPDF_Page_GetLineCap (HPDF_Page page) HPDF_EXPORT(HPDF_LineJoin) HPDF_Page_GetLineJoin (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetLineJoin\n")); + HPDF_PTRACE (" HPDF_Page_GetLineJoin\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1126,7 +1126,7 @@ HPDF_Page_GetLineJoin (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetMiterLimit (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetMiterLimit\n")); + HPDF_PTRACE (" HPDF_Page_GetMiterLimit\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1142,7 +1142,7 @@ HPDF_Page_GetDash (HPDF_Page page) { HPDF_DashMode mode = {{0, 0, 0, 0, 0, 0, 0, 0}, 0, 0}; - HPDF_PTRACE((" HPDF_Page_GetDash\n")); + HPDF_PTRACE (" HPDF_Page_GetDash\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1157,7 +1157,7 @@ HPDF_Page_GetDash (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetFlat (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetFlat\n")); + HPDF_PTRACE (" HPDF_Page_GetFlat\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1171,7 +1171,7 @@ HPDF_Page_GetFlat (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetWordSpace (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetWordSpace\n")); + HPDF_PTRACE (" HPDF_Page_GetWordSpace\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1185,7 +1185,7 @@ HPDF_Page_GetWordSpace (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetCharSpace (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetCharSpace\n")); + HPDF_PTRACE (" HPDF_Page_GetCharSpace\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1199,7 +1199,7 @@ HPDF_Page_GetCharSpace (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetHorizontalScalling (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetHorizontalScalling\n")); + HPDF_PTRACE (" HPDF_Page_GetHorizontalScalling\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1213,7 +1213,7 @@ HPDF_Page_GetHorizontalScalling (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetTextLeading (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetTextLeading\n")); + HPDF_PTRACE (" HPDF_Page_GetTextLeading\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1227,7 +1227,7 @@ HPDF_Page_GetTextLeading (HPDF_Page page) HPDF_EXPORT(HPDF_TextRenderingMode) HPDF_Page_GetTextRenderingMode (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GettextRenderingMode\n")); + HPDF_PTRACE (" HPDF_Page_GettextRenderingMode\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1247,7 +1247,7 @@ HPDF_Page_GetTextRaise (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetTextRise (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetTextRise\n")); + HPDF_PTRACE (" HPDF_Page_GetTextRise\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1263,7 +1263,7 @@ HPDF_Page_GetRGBFill (HPDF_Page page) { HPDF_RGBColor DEF_RGB_COLOR = {0, 0, 0}; - HPDF_PTRACE((" HPDF_Page_GetRGBFill\n")); + HPDF_PTRACE (" HPDF_Page_GetRGBFill\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1281,7 +1281,7 @@ HPDF_Page_GetRGBStroke (HPDF_Page page) { HPDF_RGBColor DEF_RGB_COLOR = {0, 0, 0}; - HPDF_PTRACE((" HPDF_Page_GetRGBStroke\n")); + HPDF_PTRACE (" HPDF_Page_GetRGBStroke\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1298,7 +1298,7 @@ HPDF_Page_GetCMYKFill (HPDF_Page page) { HPDF_CMYKColor DEF_CMYK_COLOR = {0, 0, 0, 0}; - HPDF_PTRACE((" HPDF_Page_GetCMYKFill\n")); + HPDF_PTRACE (" HPDF_Page_GetCMYKFill\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1316,7 +1316,7 @@ HPDF_Page_GetCMYKStroke (HPDF_Page page) { HPDF_CMYKColor DEF_CMYK_COLOR = {0, 0, 0, 0}; - HPDF_PTRACE((" HPDF_Page_GetCMYKStroke\n")); + HPDF_PTRACE (" HPDF_Page_GetCMYKStroke\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1332,7 +1332,7 @@ HPDF_Page_GetCMYKStroke (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetGrayFill (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetGrayFill\n")); + HPDF_PTRACE (" HPDF_Page_GetGrayFill\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1348,7 +1348,7 @@ HPDF_Page_GetGrayFill (HPDF_Page page) HPDF_EXPORT(HPDF_REAL) HPDF_Page_GetGrayStroke (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetGrayStroke\n")); + HPDF_PTRACE (" HPDF_Page_GetGrayStroke\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1364,7 +1364,7 @@ HPDF_Page_GetGrayStroke (HPDF_Page page) HPDF_EXPORT(HPDF_ColorSpace) HPDF_Page_GetStrokingColorSpace (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetStrokingColorSpace\n")); + HPDF_PTRACE (" HPDF_Page_GetStrokingColorSpace\n"); if (HPDF_Page_Validate (page)) return ((HPDF_PageAttr)page->attr)->gstate->cs_stroke; @@ -1376,7 +1376,7 @@ HPDF_Page_GetStrokingColorSpace (HPDF_Page page) HPDF_EXPORT(HPDF_ColorSpace) HPDF_Page_GetFillingColorSpace (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetFillingColorSpace\n")); + HPDF_PTRACE (" HPDF_Page_GetFillingColorSpace\n"); if (HPDF_Page_Validate (page)) return ((HPDF_PageAttr)page->attr)->gstate->cs_fill; @@ -1390,7 +1390,7 @@ HPDF_Page_GetTextMatrix (HPDF_Page page) { HPDF_TransMatrix DEF_MATRIX = {1, 0, 0, 1, 0, 0}; - HPDF_PTRACE((" HPDF_Page_GetTextMatrix\n")); + HPDF_PTRACE (" HPDF_Page_GetTextMatrix\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1403,7 +1403,7 @@ HPDF_Page_GetTextMatrix (HPDF_Page page) HPDF_EXPORT(HPDF_UINT) HPDF_Page_GetGStateDepth (HPDF_Page page) { - HPDF_PTRACE((" HPDF_Page_GetGStateDepth\n")); + HPDF_PTRACE (" HPDF_Page_GetGStateDepth\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1428,7 +1428,7 @@ HPDF_Page_GetCurrentPos (HPDF_Page page) { HPDF_Point pos = {0, 0}; - HPDF_PTRACE((" HPDF_Page_GetCurrentPos\n")); + HPDF_PTRACE (" HPDF_Page_GetCurrentPos\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1446,7 +1446,7 @@ HPDF_Page_GetCurrentPos2 (HPDF_Page page, HPDF_Point *pos) { HPDF_PageAttr attr; - HPDF_PTRACE((" HPDF_Page_GetCurrentPos2\n")); + HPDF_PTRACE (" HPDF_Page_GetCurrentPos2\n"); pos->x = 0; pos->y = 0; @@ -1467,7 +1467,7 @@ HPDF_Page_GetCurrentTextPos (HPDF_Page page) { HPDF_Point pos = {0, 0}; - HPDF_PTRACE((" HPDF_Page_GetCurrentTextPos\n")); + HPDF_PTRACE (" HPDF_Page_GetCurrentTextPos\n"); if (HPDF_Page_Validate (page)) { HPDF_PageAttr attr = (HPDF_PageAttr)page->attr; @@ -1486,7 +1486,7 @@ HPDF_Page_GetCurrentTextPos2 (HPDF_Page page, { HPDF_PageAttr attr; - HPDF_PTRACE((" HPDF_Page_GetCurrentTextPos2\n")); + HPDF_PTRACE (" HPDF_Page_GetCurrentTextPos2\n"); pos->x = 0; pos->y = 0; @@ -1511,7 +1511,7 @@ HPDF_Page_SetBoxValue (HPDF_Page page, HPDF_Real r; HPDF_Array array; - HPDF_PTRACE((" HPDF_Page_SetBoxValue\n")); + HPDF_PTRACE (" HPDF_Page_SetBoxValue\n"); if (!HPDF_Page_Validate (page)) return HPDF_INVALID_PAGE; @@ -1536,7 +1536,7 @@ HPDF_Page_SetRotate (HPDF_Page page, HPDF_Number n; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Page_SetRotate\n")); + HPDF_PTRACE (" HPDF_Page_SetRotate\n"); if (!HPDF_Page_Validate (page)) return HPDF_INVALID_PAGE; @@ -1561,7 +1561,7 @@ HPDF_Page_SetZoom (HPDF_Page page, { HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Page_SetZoom\n")); + HPDF_PTRACE (" HPDF_Page_SetZoom\n"); if (!HPDF_Page_Validate (page)) { return HPDF_INVALID_PAGE; @@ -1579,7 +1579,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_Page_SetWidth (HPDF_Page page, HPDF_REAL value) { - HPDF_PTRACE((" HPDF_Page_SetWidth\n")); + HPDF_PTRACE (" HPDF_Page_SetWidth\n"); if (value < 3 || value > 14400) return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_SIZE, 0); @@ -1595,7 +1595,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_Page_SetHeight (HPDF_Page page, HPDF_REAL value) { - HPDF_PTRACE((" HPDF_Page_SetWidth\n")); + HPDF_PTRACE (" HPDF_Page_SetWidth\n"); if (value < 3 || value > 14400) return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_SIZE, 0); @@ -1614,7 +1614,7 @@ HPDF_Page_SetSize (HPDF_Page page, { HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Page_SetSize\n")); + HPDF_PTRACE (" HPDF_Page_SetSize\n"); if (!HPDF_Page_Validate (page)) return HPDF_INVALID_PAGE; @@ -1649,7 +1649,7 @@ HPDF_Page_Validate (HPDF_Page page) { HPDF_Obj_Header *header = (HPDF_Obj_Header *)page; - HPDF_PTRACE((" HPDF_Page_Validate\n")); + HPDF_PTRACE (" HPDF_Page_Validate\n"); if (!page || !page->attr) return HPDF_FALSE; @@ -1667,7 +1667,7 @@ HPDF_Page_CreateDestination (HPDF_Page page) HPDF_PageAttr attr; HPDF_Destination dst; - HPDF_PTRACE((" HPDF_Page_CreateDestination\n")); + HPDF_PTRACE (" HPDF_Page_CreateDestination\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -1693,7 +1693,7 @@ HPDF_Page_Create3DAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_Create3DAnnot\n")); + HPDF_PTRACE (" HPDF_Page_Create3DAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -1721,7 +1721,7 @@ HPDF_Page_CreateTextAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateTextAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateTextAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -1754,7 +1754,7 @@ HPDF_Page_CreateFreeTextAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateFreeTextAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateFreeTextAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -1787,7 +1787,7 @@ HPDF_Page_CreateLineAnnot (HPDF_Page page, HPDF_Annotation annot; HPDF_Rect rect = {0,0,0,0}; - HPDF_PTRACE((" HPDF_Page_CreateLineAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateLineAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -1818,7 +1818,7 @@ HPDF_Page_CreateWidgetAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateWidgetAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateWidgetAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -1850,7 +1850,7 @@ HPDF_Page_CreateWidgetAnnot_WhiteOnlyWhilePrint (HPDF_Doc pdf, HPDF_STATUS ret = HPDF_OK; HPDF_Array array_bg; - HPDF_PTRACE((" HPDF_Page_CreateWidgetAnnot_WhiteOnlyWhilePrint\n")); + HPDF_PTRACE (" HPDF_Page_CreateWidgetAnnot_WhiteOnlyWhilePrint\n"); annot = HPDF_Page_CreateWidgetAnnot(page, rect); @@ -1913,7 +1913,7 @@ HPDF_Page_CreateLinkAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateLinkAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateLinkAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -1948,7 +1948,7 @@ HPDF_Page_CreateURILinkAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateURILinkAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateURILinkAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -1981,7 +1981,7 @@ HPDF_Page_CreateCircleAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateCircleAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateCircleAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2014,7 +2014,7 @@ HPDF_Page_CreateSquareAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateCircleAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateCircleAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2047,7 +2047,7 @@ HPDF_Page_Create3DView (HPDF_Page page, HPDF_PageAttr attr; HPDF_Dict view; - HPDF_PTRACE((" HPDF_Page_Create3DView\n")); + HPDF_PTRACE (" HPDF_Page_Create3DView\n"); HPDF_UNUSED(annot3d); if (!HPDF_Page_Validate (page)) @@ -2072,7 +2072,7 @@ HPDF_Page_CreateTextMarkupAnnot (HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateTextMarkupAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateTextMarkupAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2103,7 +2103,7 @@ HPDF_Page_CreateHighlightAnnot (HPDF_Page page, const char *text, HPDF_Encoder encoder) { - HPDF_PTRACE((" HPDF_Page_CreateHighlightAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateHighlightAnnot\n"); return HPDF_Page_CreateTextMarkupAnnot( page, rect, text, encoder, HPDF_ANNOT_HIGHTLIGHT); } @@ -2114,7 +2114,7 @@ HPDF_Page_CreateSquigglyAnnot (HPDF_Page page, const char *text, HPDF_Encoder encoder) { - HPDF_PTRACE((" HPDF_Page_CreateSquigglyAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateSquigglyAnnot\n"); return HPDF_Page_CreateTextMarkupAnnot( page, rect, text, encoder, HPDF_ANNOT_SQUIGGLY); } @@ -2125,7 +2125,7 @@ HPDF_Page_CreateUnderlineAnnot (HPDF_Page page, const char *text, HPDF_Encoder encoder) { - HPDF_PTRACE((" HPDF_Page_CreateUnderlineAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateUnderlineAnnot\n"); return HPDF_Page_CreateTextMarkupAnnot( page, rect, text, encoder, HPDF_ANNOT_UNDERLINE); } @@ -2136,7 +2136,7 @@ HPDF_Page_CreateStrikeOutAnnot (HPDF_Page page, const char *text, HPDF_Encoder encoder) { - HPDF_PTRACE((" HPDF_Page_CreateStrikeOutAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateStrikeOutAnnot\n"); return HPDF_Page_CreateTextMarkupAnnot( page, rect, text, encoder, HPDF_ANNOT_STRIKE_OUT); } @@ -2149,7 +2149,7 @@ HPDF_Page_CreatePopupAnnot ( HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreatePopupAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreatePopupAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2178,7 +2178,7 @@ HPDF_Page_CreateStampAnnot ( HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateStampAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateStampAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2206,7 +2206,7 @@ HPDF_Page_CreateProjectionAnnot(HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation annot; - HPDF_PTRACE((" HPDF_Page_CreateProjectionAnnot\n")); + HPDF_PTRACE (" HPDF_Page_CreateProjectionAnnot\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2234,7 +2234,7 @@ HPDF_Page_Create3DC3DMeasure(HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation measure; - HPDF_PTRACE((" HPDF_Page_Create3DC3DMeasure\n")); + HPDF_PTRACE (" HPDF_Page_Create3DC3DMeasure\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2263,7 +2263,7 @@ HPDF_Page_CreatePD33DMeasure(HPDF_Page page, HPDF_PageAttr attr; HPDF_Annotation measure; - HPDF_PTRACE((" HPDF_Page_CreatePD33DMeasure\n")); + HPDF_PTRACE (" HPDF_Page_CreatePD33DMeasure\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2294,7 +2294,7 @@ HPDF_Page_Create3DAnnotExData(HPDF_Page page) HPDF_PageAttr attr; HPDF_Annotation exData; - HPDF_PTRACE((" HPDF_Page_Create3DAnnotExData\n")); + HPDF_PTRACE (" HPDF_Page_Create3DAnnotExData\n"); if (!HPDF_Page_Validate (page)) return NULL; @@ -2316,7 +2316,7 @@ HPDF_Page_SetFilter (HPDF_Page page, { HPDF_PageAttr attr; - HPDF_PTRACE((" HPDF_Page_SetFilter\n")); + HPDF_PTRACE (" HPDF_Page_SetFilter\n"); attr = (HPDF_PageAttr)page->attr; attr->contents->filter = filter; diff --git a/src/hpdf_streams.c b/src/hpdf_streams.c index d73c1fc..390a2e3 100644 --- a/src/hpdf_streams.c +++ b/src/hpdf_streams.c @@ -154,7 +154,7 @@ HPDF_Stream_ReadLn (HPDF_Stream stream, HPDF_UINT r_size = *size; HPDF_UINT read_size = HPDF_STREAM_BUF_SIZ; - HPDF_PTRACE((" HPDF_Stream_ReadLn\n")); + HPDF_PTRACE (" HPDF_Stream_ReadLn\n"); if (!stream) return HPDF_INVALID_PARAMETER; @@ -237,7 +237,7 @@ HPDF_Stream_Write (HPDF_Stream stream, { HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_Stream_Write\n")); + HPDF_PTRACE (" HPDF_Stream_Write\n"); if (!(stream->write_fn)) return HPDF_SetError(stream->error, HPDF_INVALID_OPERATION, 0); @@ -330,7 +330,7 @@ HPDF_Stream_Seek (HPDF_Stream stream, HPDF_INT pos, HPDF_WhenceMode mode) { - HPDF_PTRACE((" HPDF_Stream_Seek\n")); + HPDF_PTRACE (" HPDF_Stream_Seek\n"); if (!(stream->seek_fn)) return HPDF_SetError (stream->error, HPDF_INVALID_OPERATION, 0); @@ -345,7 +345,7 @@ HPDF_Stream_Seek (HPDF_Stream stream, HPDF_INT32 HPDF_Stream_Tell (HPDF_Stream stream) { - HPDF_PTRACE((" HPDF_Stream_Tell\n")); + HPDF_PTRACE (" HPDF_Stream_Tell\n"); if (!(stream->tell_fn)) return HPDF_SetError (stream->error, HPDF_INVALID_OPERATION, 0); @@ -360,7 +360,7 @@ HPDF_Stream_Tell (HPDF_Stream stream) HPDF_UINT32 HPDF_Stream_Size (HPDF_Stream stream) { - HPDF_PTRACE((" HPDF_Stream_Tell\n")); + HPDF_PTRACE (" HPDF_Stream_Tell\n"); if (stream->write_fn) return stream->size; @@ -387,7 +387,7 @@ HPDF_Stream_WriteEscapeName (HPDF_Stream stream, const HPDF_BYTE* pos1; char* pos2; - HPDF_PTRACE((" HPDF_Stream_WriteEscapeName\n")); + HPDF_PTRACE (" HPDF_Stream_WriteEscapeName\n"); len = HPDF_StrLen (value, HPDF_LIMIT_MAX_NAME_LEN); pos1 = (HPDF_BYTE*)value; @@ -430,7 +430,7 @@ HPDF_Stream_WriteEscapeText2 (HPDF_Stream stream, const char* p = text; HPDF_STATUS ret; - HPDF_PTRACE((" HPDF_Stream_WriteEscapeText2\n")); + HPDF_PTRACE (" HPDF_Stream_WriteEscapeText2\n"); /* The following block is commented out because it violates "PDF Spec 7.3.4.2 Literal Strings". * It states that the two matching parentheses must still be present to represent an empty @@ -481,7 +481,7 @@ HPDF_Stream_WriteEscapeText (HPDF_Stream stream, { HPDF_UINT len; - HPDF_PTRACE((" HPDF_Stream_WriteEscapeText\n")); + HPDF_PTRACE (" HPDF_Stream_WriteEscapeText\n"); len = (text == NULL) ? 0 : HPDF_StrLen (text, HPDF_LIMIT_MAX_STRING_LEN); @@ -503,7 +503,7 @@ HPDF_Stream_WriteBinary (HPDF_Stream stream, const HPDF_BYTE* p; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_Stream_WriteBinary\n")); + HPDF_PTRACE (" HPDF_Stream_WriteBinary\n"); if (e) { if (len <= HPDF_TEXT_DEFAULT_LEN) @@ -574,7 +574,7 @@ HPDF_Stream_WriteToStreamWithDeflate (HPDF_Stream src, Bytef otbuf[DEFLATE_BUF_SIZ]; HPDF_BYTE ebuf[DEFLATE_BUF_SIZ]; - HPDF_PTRACE((" HPDF_Stream_WriteToStreamWithDeflate\n")); + HPDF_PTRACE (" HPDF_Stream_WriteToStreamWithDeflate\n"); /* initialize input stream */ ret = HPDF_Stream_Seek (src, 0, HPDF_SEEK_SET); @@ -695,7 +695,7 @@ HPDF_Stream_WriteToStream (HPDF_Stream src, HPDF_BYTE ebuf[HPDF_STREAM_BUF_SIZ]; HPDF_BOOL flg; - HPDF_PTRACE((" HPDF_Stream_WriteToStream\n")); + HPDF_PTRACE (" HPDF_Stream_WriteToStream\n"); HPDF_UNUSED (filter); if (!dst || !(dst->write_fn)) { @@ -760,7 +760,7 @@ HPDF_FileReader_New (HPDF_MMgr mmgr, HPDF_Stream stream; HPDF_FILEP fp = HPDF_FOPEN (fname, "rb"); - HPDF_PTRACE((" HPDF_FileReader_New\n")); + HPDF_PTRACE (" HPDF_FileReader_New\n"); if (!fp) { #ifdef UNDER_CE @@ -805,7 +805,7 @@ HPDF_FileReader_ReadFunc (HPDF_Stream stream, HPDF_FILEP fp = (HPDF_FILEP)stream->attr; HPDF_UINT rsiz; - HPDF_PTRACE((" HPDF_FileReader_ReadFunc\n")); + HPDF_PTRACE (" HPDF_FileReader_ReadFunc\n"); HPDF_MemSet(ptr, 0, *siz); rsiz = HPDF_FREAD(ptr, 1, *siz, fp); @@ -850,7 +850,7 @@ HPDF_FileReader_SeekFunc (HPDF_Stream stream, HPDF_FILEP fp = (HPDF_FILEP)stream->attr; HPDF_INT whence; - HPDF_PTRACE((" HPDF_FileReader_SeekFunc\n")); + HPDF_PTRACE (" HPDF_FileReader_SeekFunc\n"); switch (mode) { case HPDF_SEEK_CUR: @@ -877,7 +877,7 @@ HPDF_FileStream_TellFunc (HPDF_Stream stream) HPDF_INT32 ret; HPDF_FILEP fp = (HPDF_FILEP)stream->attr; - HPDF_PTRACE((" HPDF_FileReader_TellFunc\n")); + HPDF_PTRACE (" HPDF_FileReader_TellFunc\n"); if ((ret = HPDF_FTELL (fp)) < 0) { return HPDF_SetError (stream->error, HPDF_FILE_IO_ERROR, @@ -895,7 +895,7 @@ HPDF_FileStream_SizeFunc (HPDF_Stream stream) HPDF_INT ptr; HPDF_FILEP fp = (HPDF_FILEP)stream->attr; - HPDF_PTRACE((" HPDF_FileReader_SizeFunc\n")); + HPDF_PTRACE (" HPDF_FileReader_SizeFunc\n"); /* save current file-pointer */ if ((ptr = HPDF_FTELL (fp)) < 0) { @@ -936,7 +936,7 @@ HPDF_FileWriter_New (HPDF_MMgr mmgr, HPDF_Stream stream; HPDF_FILEP fp = HPDF_FOPEN (fname, "wb"); - HPDF_PTRACE((" HPDF_FileWriter_New\n")); + HPDF_PTRACE (" HPDF_FileWriter_New\n"); if (!fp) { #ifdef UNDER_CE @@ -972,7 +972,7 @@ HPDF_FileWriter_WriteFunc (HPDF_Stream stream, HPDF_FILEP fp; HPDF_UINT ret; - HPDF_PTRACE((" HPDF_FileWriter_WriteFunc\n")); + HPDF_PTRACE (" HPDF_FileWriter_WriteFunc\n"); fp = (HPDF_FILEP)stream->attr; ret = HPDF_FWRITE (ptr, 1, siz, fp); @@ -990,7 +990,7 @@ HPDF_FileStream_FreeFunc (HPDF_Stream stream) { HPDF_FILEP fp; - HPDF_PTRACE((" HPDF_FileStream_FreeFunc\n")); + HPDF_PTRACE (" HPDF_FileStream_FreeFunc\n"); fp = (HPDF_FILEP)stream->attr; @@ -1008,7 +1008,7 @@ HPDF_MemStream_InWrite (HPDF_Stream stream, HPDF_MemStreamAttr attr = (HPDF_MemStreamAttr)stream->attr; HPDF_UINT rsize = attr->buf_siz - attr->w_pos; - HPDF_PTRACE((" HPDF_MemStream_InWrite\n")); + HPDF_PTRACE (" HPDF_MemStream_InWrite\n"); if (*count <= 0) return HPDF_OK; @@ -1048,7 +1048,7 @@ HPDF_MemStream_WriteFunc (HPDF_Stream stream, { HPDF_UINT wsiz = siz; - HPDF_PTRACE((" HPDF_MemStream_WriteFunc\n")); + HPDF_PTRACE (" HPDF_MemStream_WriteFunc\n"); if (HPDF_Error_GetCode (stream->error) != 0) return HPDF_THIS_FUNC_WAS_SKIPPED; @@ -1069,7 +1069,7 @@ HPDF_MemStream_TellFunc (HPDF_Stream stream) HPDF_INT32 ret; HPDF_MemStreamAttr attr = (HPDF_MemStreamAttr)stream->attr; - HPDF_PTRACE((" HPDF_MemStream_TellFunc\n")); + HPDF_PTRACE (" HPDF_MemStream_TellFunc\n"); ret = attr->r_ptr_idx * attr->buf_siz; ret += attr->r_pos; @@ -1081,7 +1081,7 @@ HPDF_MemStream_TellFunc (HPDF_Stream stream) HPDF_UINT32 HPDF_MemStream_SizeFunc (HPDF_Stream stream) { - HPDF_PTRACE((" HPDF_MemStream_SizeFunc\n")); + HPDF_PTRACE (" HPDF_MemStream_SizeFunc\n"); return stream->size; } @@ -1093,7 +1093,7 @@ HPDF_MemStream_SeekFunc (HPDF_Stream stream, { HPDF_MemStreamAttr attr = (HPDF_MemStreamAttr)stream->attr; - HPDF_PTRACE((" HPDF_MemStream_SeekFunc\n")); + HPDF_PTRACE (" HPDF_MemStream_SeekFunc\n"); if (mode == HPDF_SEEK_CUR) { pos += (attr->r_ptr_idx * attr->buf_siz); @@ -1130,7 +1130,7 @@ HPDF_MemStream_GetBufPtr (HPDF_Stream stream, HPDF_BYTE *ret; HPDF_MemStreamAttr attr; - HPDF_PTRACE((" HPDF_MemStream_GetBufPtr\n")); + HPDF_PTRACE (" HPDF_MemStream_GetBufPtr\n"); if (stream->type != HPDF_STREAM_MEMORY) { HPDF_SetError (stream->error, HPDF_INVALID_OBJECT, 0); @@ -1157,7 +1157,7 @@ HPDF_MemStream_FreeData (HPDF_Stream stream) HPDF_MemStreamAttr attr; HPDF_UINT i; - HPDF_PTRACE((" HPDF_MemStream_FreeData\n")); + HPDF_PTRACE (" HPDF_MemStream_FreeData\n"); if (!stream || stream->type != HPDF_STREAM_MEMORY) return; @@ -1181,7 +1181,7 @@ HPDF_MemStream_FreeFunc (HPDF_Stream stream) { HPDF_MemStreamAttr attr; - HPDF_PTRACE((" HPDF_MemStream_FreeFunc\n")); + HPDF_PTRACE (" HPDF_MemStream_FreeFunc\n"); attr = (HPDF_MemStreamAttr)stream->attr; HPDF_MemStream_FreeData (stream); @@ -1196,7 +1196,7 @@ HPDF_MemStream_New (HPDF_MMgr mmgr, { HPDF_Stream stream; - HPDF_PTRACE((" HPDF_MemStream_New\n")); + HPDF_PTRACE (" HPDF_MemStream_New\n"); /* Create new HPDF_Stream object. */ stream = (HPDF_Stream)HPDF_GetMem (mmgr, sizeof(HPDF_Stream_Rec)); @@ -1245,7 +1245,7 @@ HPDF_MemStream_GetBufSize (HPDF_Stream stream) { HPDF_MemStreamAttr attr; - HPDF_PTRACE((" HPDF_MemStream_GetBufSize\n")); + HPDF_PTRACE (" HPDF_MemStream_GetBufSize\n"); if (!stream || stream->type != HPDF_STREAM_MEMORY) return 0; @@ -1259,7 +1259,7 @@ HPDF_MemStream_GetBufCount (HPDF_Stream stream) { HPDF_MemStreamAttr attr; - HPDF_PTRACE((" HPDF_MemStream_GetBufCount\n")); + HPDF_PTRACE (" HPDF_MemStream_GetBufCount\n"); if (!stream || stream->type != HPDF_STREAM_MEMORY) return 0; @@ -1277,7 +1277,7 @@ HPDF_MemStream_ReadFunc (HPDF_Stream stream, HPDF_UINT buf_size; HPDF_UINT rlen = *size; - HPDF_PTRACE((" HPDF_MemStream_ReadFunc\n")); + HPDF_PTRACE (" HPDF_MemStream_ReadFunc\n"); *size = 0; @@ -1335,7 +1335,7 @@ HPDF_MemStream_Rewrite (HPDF_Stream stream, HPDF_UINT buf_size; HPDF_UINT rlen = size; - HPDF_PTRACE((" HPDF_MemStream_Rewrite\n")); + HPDF_PTRACE (" HPDF_MemStream_Rewrite\n"); while (rlen > 0) { HPDF_UINT tmp_len; @@ -1398,7 +1398,7 @@ HPDF_CallbackReader_New (HPDF_MMgr mmgr, { HPDF_Stream stream; - HPDF_PTRACE((" HPDF_CallbackReader_New\n")); + HPDF_PTRACE (" HPDF_CallbackReader_New\n"); stream = (HPDF_Stream)HPDF_GetMem (mmgr, sizeof(HPDF_Stream_Rec)); @@ -1440,7 +1440,7 @@ HPDF_CallbackWriter_New (HPDF_MMgr mmgr, { HPDF_Stream stream; - HPDF_PTRACE((" HPDF_CallbackWriter_New\n")); + HPDF_PTRACE (" HPDF_CallbackWriter_New\n"); stream = (HPDF_Stream)HPDF_GetMem (mmgr, sizeof(HPDF_Stream_Rec)); diff --git a/src/hpdf_string.c b/src/hpdf_string.c index f915093..f170fbf 100644 --- a/src/hpdf_string.c +++ b/src/hpdf_string.c @@ -32,7 +32,7 @@ HPDF_String_New (HPDF_MMgr mmgr, { HPDF_String obj; - HPDF_PTRACE((" HPDF_String_New\n")); + HPDF_PTRACE (" HPDF_String_New\n"); obj = (HPDF_String)HPDF_GetMem (mmgr, sizeof(HPDF_String_Rec)); if (obj) { @@ -62,7 +62,7 @@ HPDF_String_SetValue (HPDF_String obj, HPDF_UINT len; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE((" HPDF_String_SetValue\n")); + HPDF_PTRACE (" HPDF_String_SetValue\n"); if (obj->value) { HPDF_FreeMem (obj->mmgr, obj->value); @@ -90,7 +90,7 @@ HPDF_String_Free (HPDF_String obj) if (!obj) return; - HPDF_PTRACE((" HPDF_String_Free\n")); + HPDF_PTRACE (" HPDF_String_Free\n"); HPDF_FreeMem (obj->mmgr, obj->value); HPDF_FreeMem (obj->mmgr, obj); @@ -109,7 +109,7 @@ HPDF_String_Write (HPDF_String obj, * and it outputs by HPDF_write_binary method. */ - HPDF_PTRACE((" HPDF_String_Write\n")); + HPDF_PTRACE (" HPDF_String_Write\n"); if (e) HPDF_Encrypt_Reset (e); diff --git a/src/hpdf_u3d.c b/src/hpdf_u3d.c index eea8c73..ebde78a 100644 --- a/src/hpdf_u3d.c +++ b/src/hpdf_u3d.c @@ -38,7 +38,7 @@ static HPDF_STATUS Get3DStreamType (HPDF_Stream stream, const char **type) HPDF_BYTE tag[4]; HPDF_UINT len; - HPDF_PTRACE ((" HPDF_U3D_Get3DStreamType\n")); + HPDF_PTRACE (" HPDF_U3D_Get3DStreamType\n"); len = 4; if (HPDF_Stream_Read (stream, tag, &len) != HPDF_OK) { @@ -70,7 +70,7 @@ HPDF_LoadU3DFromFile (HPDF_Doc pdf, HPDF_Stream imagedata; HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadU3DFromFile\n")); + HPDF_PTRACE (" HPDF_LoadU3DFromFile\n"); if (!HPDF_HasDoc (pdf)) { return NULL; @@ -105,7 +105,7 @@ HPDF_LoadU3DFromMem (HPDF_Doc pdf, HPDF_Stream imagedata; HPDF_Image image; - HPDF_PTRACE ((" HPDF_LoadU3DFromMem\n")); + HPDF_PTRACE (" HPDF_LoadU3DFromMem\n"); if (!HPDF_HasDoc (pdf)) { return NULL; @@ -147,7 +147,7 @@ HPDF_U3D_LoadU3D (HPDF_MMgr mmgr, HPDF_Dict u3d; const char *type = NULL; - HPDF_PTRACE ((" HPDF_U3D_LoadU3D\n")); + HPDF_PTRACE (" HPDF_U3D_LoadU3D\n"); u3d = HPDF_DictStream_New (mmgr, xref); if (!u3d) { @@ -206,7 +206,7 @@ HPDF_EXPORT(HPDF_Dict) HPDF_Create3DView(HPDF_MMgr mmgr, const char *name) HPDF_STATUS ret = HPDF_OK; HPDF_Dict view; - HPDF_PTRACE ((" HPDF_Create3DView\n")); + HPDF_PTRACE (" HPDF_Create3DView\n"); if (name == NULL || name[0] == '\0') { return NULL; @@ -243,7 +243,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_U3D_Add3DView(HPDF_U3D u3d, HPDF_Dict view) HPDF_Array views = NULL; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_Add3DView\n")); + HPDF_PTRACE (" HPDF_Add3DView\n"); if (u3d == NULL || view == NULL) { return HPDF_INVALID_U3D_DATA; @@ -277,7 +277,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_U3D_AddOnInstanciate(HPDF_U3D u3d, HPDF_JavaScript { HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_U3D_AddOnInstanciate\n")); + HPDF_PTRACE (" HPDF_U3D_AddOnInstanciate\n"); if (u3d == NULL || javascript == NULL) { return HPDF_INVALID_U3D_DATA; @@ -293,7 +293,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_U3D_SetDefault3DView(HPDF_U3D u3d, const char *nam { HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_U3D_SetDefault3DView\n")); + HPDF_PTRACE (" HPDF_U3D_SetDefault3DView\n"); if (u3d == NULL || name == NULL || name[0] == '\0') { return HPDF_INVALID_U3D_DATA; @@ -308,7 +308,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_AddNode(HPDF_Dict view, HPDF_Dict node) HPDF_Array nodes = NULL; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_3DView_AddNode\n")); + HPDF_PTRACE (" HPDF_3DView_AddNode\n"); if (view == NULL) { return HPDF_INVALID_U3D_DATA; @@ -342,7 +342,7 @@ HPDF_EXPORT(HPDF_Dict) HPDF_3DView_CreateNode(HPDF_Dict view, const char *name) HPDF_Dict node; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_3DView_CreateNode\n")); + HPDF_PTRACE (" HPDF_3DView_CreateNode\n"); node = HPDF_Dict_New (view->mmgr); if (!node) { @@ -368,7 +368,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DViewNode_SetOpacity(HPDF_Dict node, HPDF_REAL op { HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_3DViewNode_SetOpacity\n")); + HPDF_PTRACE (" HPDF_3DViewNode_SetOpacity\n"); if (node == NULL) { return HPDF_INVALID_U3D_DATA; @@ -382,7 +382,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DViewNode_SetVisibility(HPDF_Dict node, HPDF_BOOL { HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_3DViewNode_SetVisibility\n")); + HPDF_PTRACE (" HPDF_3DViewNode_SetVisibility\n"); if (node == NULL) { return HPDF_INVALID_U3D_DATA; @@ -397,7 +397,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DViewNode_SetMatrix(HPDF_Dict node, HPDF_3DMatrix HPDF_STATUS ret = HPDF_OK; HPDF_Array array_m; - HPDF_PTRACE ((" HPDF_3DViewNode_SetMatrix\n")); + HPDF_PTRACE (" HPDF_3DViewNode_SetMatrix\n"); if (node == NULL) { return HPDF_INVALID_U3D_DATA; @@ -439,7 +439,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetLighting(HPDF_Dict view, const char *sch static const char * const schemes[] = { "Artwork", "None", "White", "Day", "Night", "Hard", "Primary", "Blue", "Red", "Cube", "CAD", "Headlamp" }; - HPDF_PTRACE ((" HPDF_3DView_SetLighting\n")); + HPDF_PTRACE (" HPDF_3DView_SetLighting\n"); if (view == NULL || scheme == NULL || scheme[0] == '\0') { return HPDF_INVALID_U3D_DATA; @@ -486,7 +486,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetBackgroundColor(HPDF_Dict view, HPDF_REA HPDF_STATUS ret = HPDF_OK; HPDF_Dict background; - HPDF_PTRACE ((" HPDF_3DView_SetBackgroundColor\n")); + HPDF_PTRACE (" HPDF_3DView_SetBackgroundColor\n"); if (view == NULL || r < 0 || r > 1 || g < 0 || g > 1 || b < 0 || b > 1) { return HPDF_INVALID_U3D_DATA; @@ -553,7 +553,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetPerspectiveProjection(HPDF_Dict view, HP HPDF_STATUS ret = HPDF_OK; HPDF_Dict projection; - HPDF_PTRACE ((" HPDF_3DView_SetPerspectiveProjection\n")); + HPDF_PTRACE (" HPDF_3DView_SetPerspectiveProjection\n"); if (view == NULL || fov < 0 || fov > 180) { return HPDF_INVALID_U3D_DATA; @@ -595,7 +595,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetOrthogonalProjection(HPDF_Dict view, HPD HPDF_STATUS ret = HPDF_OK; HPDF_Dict projection; - HPDF_PTRACE ((" HPDF_3DView_SetOrthogonalProjection\n")); + HPDF_PTRACE (" HPDF_3DView_SetOrthogonalProjection\n"); if (view == NULL || mag <= 0) { return HPDF_INVALID_U3D_DATA; @@ -654,7 +654,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetCamera(HPDF_Dict view, HPDF_REAL coox, H HPDF_Array matrix; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_3DView_SetCamera\n")); + HPDF_PTRACE (" HPDF_3DView_SetCamera\n"); if (view == NULL) { return HPDF_INVALID_U3D_DATA; @@ -802,7 +802,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetCameraByMatrix(HPDF_Dict view, HPDF_3DMa HPDF_Array matrix; HPDF_STATUS ret = HPDF_OK; - HPDF_PTRACE ((" HPDF_3DView_SetCameraByMatrix\n")); + HPDF_PTRACE (" HPDF_3DView_SetCameraByMatrix\n"); if (view == NULL) { return HPDF_INVALID_U3D_DATA; @@ -879,7 +879,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetCrossSectionOn (HPDF_Dict view, HPDF_Array array_sa; HPDF_Dict crosssection; - HPDF_PTRACE ((" HPDF_3DView_SetCrossSectionOn\n")); + HPDF_PTRACE (" HPDF_3DView_SetCrossSectionOn\n"); if (view == NULL) { return HPDF_INVALID_U3D_DATA; @@ -973,7 +973,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetCrossSectionOff(HPDF_Dict view) HPDF_STATUS ret = HPDF_OK; HPDF_Array array_sa; - HPDF_PTRACE ((" HPDF_3DView_SetCrossSectionOff\n")); + HPDF_PTRACE (" HPDF_3DView_SetCrossSectionOff\n"); if (view == NULL) { return HPDF_INVALID_U3D_DATA; @@ -997,7 +997,7 @@ HPDF_Dict HPDF_3DView_New( HPDF_MMgr mmgr, HPDF_Xref xref, HPDF_U3D u3d, const HPDF_STATUS ret = HPDF_OK; HPDF_Dict view; - HPDF_PTRACE ((" HPDF_3DView_New\n")); + HPDF_PTRACE (" HPDF_3DView_New\n"); if (name == NULL || name[0] == '\0') { return NULL; @@ -1075,7 +1075,7 @@ HPDF_EXPORT(HPDF_JavaScript) HPDF_CreateJavaScript( HPDF_Doc pdf, const char *co HPDF_JavaScript javaScript; HPDF_UINT len ; - HPDF_PTRACE ((" HPDF_CreateJavaScript\n")); + HPDF_PTRACE (" HPDF_CreateJavaScript\n"); javaScript = (HPDF_JavaScript) HPDF_DictStream_New(pdf->mmgr, pdf->xref); if (!javaScript) { @@ -1098,7 +1098,7 @@ HPDF_EXPORT(HPDF_JavaScript) HPDF_LoadJSFromFile (HPDF_Doc pdf, const char *fil HPDF_Stream js_data; HPDF_JavaScript js = NULL; - HPDF_PTRACE ((" HPDF_LoadJSFromFile\n")); + HPDF_PTRACE (" HPDF_LoadJSFromFile\n"); if (!HPDF_HasDoc (pdf)) { return NULL; diff --git a/src/hpdf_xref.c b/src/hpdf_xref.c index 8a88ca5..5a4c013 100644 --- a/src/hpdf_xref.c +++ b/src/hpdf_xref.c @@ -31,7 +31,7 @@ HPDF_Xref_New (HPDF_MMgr mmgr, HPDF_Xref xref; HPDF_XrefEntry new_entry; - HPDF_PTRACE((" HPDF_Xref_New\n")); + HPDF_PTRACE (" HPDF_Xref_New\n"); xref = (HPDF_Xref)HPDF_GetMem (mmgr, sizeof(HPDF_Xref_Rec)); if (!xref) @@ -75,7 +75,7 @@ HPDF_Xref_New (HPDF_MMgr mmgr, return xref; Fail: - HPDF_PTRACE((" HPDF_Xref_New failed\n")); + HPDF_PTRACE (" HPDF_Xref_New failed\n"); HPDF_Xref_Free (xref); return NULL; } @@ -88,7 +88,7 @@ HPDF_Xref_Free (HPDF_Xref xref) HPDF_XrefEntry entry; HPDF_Xref tmp_xref; - HPDF_PTRACE((" HPDF_Xref_Free\n")); + HPDF_PTRACE (" HPDF_Xref_Free\n"); /* delete xref entries. where prev element is not NULL, * delete all xref entries recursively. @@ -124,7 +124,7 @@ HPDF_Xref_Add (HPDF_Xref xref, HPDF_XrefEntry entry; HPDF_Obj_Header *header; - HPDF_PTRACE((" HPDF_Xref_Add\n")); + HPDF_PTRACE (" HPDF_Xref_Add\n"); if (!obj) { if (HPDF_Error_GetCode (xref->error) == HPDF_OK) @@ -178,7 +178,7 @@ HPDF_XrefEntry HPDF_Xref_GetEntry (HPDF_Xref xref, HPDF_UINT index) { - HPDF_PTRACE((" HPDF_Xref_GetEntry\n")); + HPDF_PTRACE (" HPDF_Xref_GetEntry\n"); return (HPDF_XrefEntry)HPDF_List_ItemAt(xref->entries, index); } @@ -190,7 +190,7 @@ HPDF_Xref_GetEntryByObjectId (HPDF_Xref xref, { HPDF_Xref tmp_xref = xref; - HPDF_PTRACE((" HPDF_Xref_GetEntryByObjectId\n")); + HPDF_PTRACE (" HPDF_Xref_GetEntryByObjectId\n"); while (tmp_xref) { HPDF_UINT i; @@ -232,7 +232,7 @@ HPDF_Xref_WriteToStream (HPDF_Xref xref, /* write each objects of xref to the specified stream */ - HPDF_PTRACE((" HPDF_Xref_WriteToStream\n")); + HPDF_PTRACE (" HPDF_Xref_WriteToStream\n"); while (tmp_xref) { if (tmp_xref->start_offset == 0) @@ -320,7 +320,7 @@ WriteTrailer (HPDF_Xref xref, HPDF_UINT max_obj_id = xref->entries->count + xref->start_offset; HPDF_STATUS ret; - HPDF_PTRACE ((" WriteTrailer\n")); + HPDF_PTRACE (" WriteTrailer\n"); if ((ret = HPDF_Dict_AddNumber (xref->trailer, "Size", max_obj_id)) != HPDF_OK) -- 2.21.1 (Apple Git-122.3)