From 2cc4903d82bfa1eb107f59d3c53c9b757e71e16b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 10 Sep 2009 08:02:45 +0000 Subject: [PATCH] 2009-09-10 09:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/libhpdf/Makefile + Enabled for all dos platforms (dos/watcom currently and probably all dos builds done on MS-DOS hosts). + external/libhpdf/ori_dst + external/libhpdf/ori_src + external/libhpdf/cnv_hb2o.bat + external/libhpdf/cnv_o2hb.bat - external/libhpdf/hpdf_annotation.c - external/libhpdf/hpdf_annotation.h - external/libhpdf/hpdf_array.c - external/libhpdf/hpdf_binary.c - external/libhpdf/hpdf_boolean.c - external/libhpdf/hpdf_catalog.c - external/libhpdf/hpdf_catalog.h - external/libhpdf/hpdf_conf.h - external/libhpdf/hpdf_config.h - external/libhpdf/hpdf_consts.h - external/libhpdf/hpdf_destination.c - external/libhpdf/hpdf_destination.h - external/libhpdf/hpdf_dict.c - external/libhpdf/hpdf_doc.c - external/libhpdf/hpdf_doc.h - external/libhpdf/hpdf_doc_png.c - external/libhpdf/hpdf_encoder.c - external/libhpdf/hpdf_encoder.h - external/libhpdf/hpdf_encoder_cns.c - external/libhpdf/hpdf_encoder_cnt.c - external/libhpdf/hpdf_encoder_jp.c - external/libhpdf/hpdf_encoder_kr.c - external/libhpdf/hpdf_encrypt.c - external/libhpdf/hpdf_encrypt.h - external/libhpdf/hpdf_encryptdict.c - external/libhpdf/hpdf_encryptdict.h - external/libhpdf/hpdf_error.c - external/libhpdf/hpdf_error.h - external/libhpdf/hpdf_ext_gstate.c - external/libhpdf/hpdf_ext_gstate.h - external/libhpdf/hpdf_font.c - external/libhpdf/hpdf_font.h - external/libhpdf/hpdf_font_cid.c - external/libhpdf/hpdf_font_tt.c - external/libhpdf/hpdf_font_type1.c - external/libhpdf/hpdf_fontdef.c - external/libhpdf/hpdf_fontdef.h - external/libhpdf/hpdf_fontdef_base14.c - external/libhpdf/hpdf_fontdef_cid.c - external/libhpdf/hpdf_fontdef_cns.c - external/libhpdf/hpdf_fontdef_cnt.c - external/libhpdf/hpdf_fontdef_jp.c - external/libhpdf/hpdf_fontdef_kr.c - external/libhpdf/hpdf_fontdef_tt.c - external/libhpdf/hpdf_fontdef_type1.c - external/libhpdf/hpdf_gstate.c - external/libhpdf/hpdf_gstate.h - external/libhpdf/hpdf_image.c - external/libhpdf/hpdf_image.h - external/libhpdf/hpdf_image_png.c - external/libhpdf/hpdf_info.c - external/libhpdf/hpdf_info.h - external/libhpdf/hpdf_list.c - external/libhpdf/hpdf_list.h - external/libhpdf/hpdf_mmgr.c - external/libhpdf/hpdf_mmgr.h - external/libhpdf/hpdf_name.c - external/libhpdf/hpdf_null.c - external/libhpdf/hpdf_number.c - external/libhpdf/hpdf_objects.c - external/libhpdf/hpdf_objects.h - external/libhpdf/hpdf_outline.c - external/libhpdf/hpdf_outline.h - external/libhpdf/hpdf_page_label.c - external/libhpdf/hpdf_page_label.h - external/libhpdf/hpdf_page_operator.c - external/libhpdf/hpdf_pages.c - external/libhpdf/hpdf_pages.h - external/libhpdf/hpdf_real.c - external/libhpdf/hpdf_streams.c - external/libhpdf/hpdf_streams.h - external/libhpdf/hpdf_string.c - external/libhpdf/hpdf_types.h - external/libhpdf/hpdf_u3d.c - external/libhpdf/hpdf_u3d.h - external/libhpdf/hpdf_utils.c - external/libhpdf/hpdf_utils.h - external/libhpdf/hpdf_version.h - external/libhpdf/hpdf_xref.c + external/libhpdf/hpdfanno.c + external/libhpdf/hpdfanno.h + external/libhpdf/hpdfarra.c + external/libhpdf/hpdfbina.c + external/libhpdf/hpdfbool.c + external/libhpdf/hpdfcata.c + external/libhpdf/hpdfcata.h + external/libhpdf/hpdfcfg.h + external/libhpdf/hpdfconf.h + external/libhpdf/hpdfcons.h + external/libhpdf/hpdfdest.c + external/libhpdf/hpdfdest.h + external/libhpdf/hpdfdict.c + external/libhpdf/hpdfdoc.c + external/libhpdf/hpdfdoc.h + external/libhpdf/hpdfdocp.c + external/libhpdf/hpdfecy.c + external/libhpdf/hpdfecyd.c + external/libhpdf/hpdfencc.c + external/libhpdf/hpdfencj.c + external/libhpdf/hpdfenck.c + external/libhpdf/hpdfencn.c + external/libhpdf/hpdfenco.c + external/libhpdf/hpdfenco.h + external/libhpdf/hpdfencr.h + external/libhpdf/hpdfency.h + external/libhpdf/hpdferro.c + external/libhpdf/hpdferro.h + external/libhpdf/hpdfextg.c + external/libhpdf/hpdfextg.h + external/libhpdf/hpdffdf.c + external/libhpdf/hpdffdf1.c + external/libhpdf/hpdffdfb.c + external/libhpdf/hpdffdfc.c + external/libhpdf/hpdffdfi.c + external/libhpdf/hpdffdfj.c + external/libhpdf/hpdffdfk.c + external/libhpdf/hpdffdfn.c + external/libhpdf/hpdffdft.c + external/libhpdf/hpdffon1.c + external/libhpdf/hpdffonc.c + external/libhpdf/hpdffond.h + external/libhpdf/hpdffont.c + external/libhpdf/hpdffont.h + external/libhpdf/hpdffott.c + external/libhpdf/hpdfgsta.c + external/libhpdf/hpdfgsta.h + external/libhpdf/hpdfimag.c + external/libhpdf/hpdfimag.h + external/libhpdf/hpdfimap.c + external/libhpdf/hpdfinfo.c + external/libhpdf/hpdfinfo.h + external/libhpdf/hpdflist.c + external/libhpdf/hpdflist.h + external/libhpdf/hpdfmmgr.c + external/libhpdf/hpdfmmgr.h + external/libhpdf/hpdfname.c + external/libhpdf/hpdfnull.c + external/libhpdf/hpdfnumb.c + external/libhpdf/hpdfobje.c + external/libhpdf/hpdfobje.h + external/libhpdf/hpdfoutl.c + external/libhpdf/hpdfoutl.h + external/libhpdf/hpdfpage.c + external/libhpdf/hpdfpage.h + external/libhpdf/hpdfpago.c + external/libhpdf/hpdfpags.c + external/libhpdf/hpdfpags.h + external/libhpdf/hpdfreal.c + external/libhpdf/hpdfstre.c + external/libhpdf/hpdfstre.h + external/libhpdf/hpdfstri.c + external/libhpdf/hpdftype.h + external/libhpdf/hpdfu3d.c + external/libhpdf/hpdfu3d.h + external/libhpdf/hpdfutil.c + external/libhpdf/hpdfutil.h + external/libhpdf/hpdfvers.h + external/libhpdf/hpdfxref.c * external/libhpdf/hpdf.h * external/libhpdf/Makefile * Converted to short filenames. Added converted scripts. * source/hbpcre/cnv_hb2o.bat * source/hbpcre/cnv_o2hb.bat ! Fixed typo in prev. * Removed PCRE references from comment texts. --- harbour/ChangeLog | 176 ++++++++++++++++++ harbour/external/libhpdf/Makefile | 106 +++++------ harbour/external/libhpdf/cnv_hb2o.bat | 135 ++++++++++++++ harbour/external/libhpdf/cnv_o2hb.bat | 165 ++++++++++++++++ harbour/external/libhpdf/hpdf.h | 12 +- .../libhpdf/{hpdf_annotation.c => hpdfanno.c} | 6 +- .../libhpdf/{hpdf_annotation.h => hpdfanno.h} | 2 +- .../libhpdf/{hpdf_array.c => hpdfarra.c} | 6 +- .../libhpdf/{hpdf_binary.c => hpdfbina.c} | 6 +- .../libhpdf/{hpdf_boolean.c => hpdfbool.c} | 4 +- .../libhpdf/{hpdf_catalog.c => hpdfcata.c} | 8 +- .../libhpdf/{hpdf_catalog.h => hpdfcata.h} | 2 +- .../libhpdf/{hpdf_config.h => hpdfcfg.h} | 0 .../libhpdf/{hpdf_conf.h => hpdfconf.h} | 0 .../libhpdf/{hpdf_consts.h => hpdfcons.h} | 0 .../{hpdf_destination.c => hpdfdest.c} | 4 +- .../{hpdf_destination.h => hpdfdest.h} | 2 +- .../libhpdf/{hpdf_dict.c => hpdfdict.c} | 6 +- .../libhpdf/{hpdf_doc.c => hpdfdoc.c} | 12 +- .../libhpdf/{hpdf_doc.h => hpdfdoc.h} | 10 +- .../libhpdf/{hpdf_doc_png.c => hpdfdocp.c} | 6 +- .../libhpdf/{hpdf_encrypt.c => hpdfecy.c} | 8 +- .../{hpdf_encryptdict.c => hpdfecyd.c} | 10 +- .../{hpdf_encoder_cns.c => hpdfencc.c} | 6 +- .../libhpdf/{hpdf_encoder_jp.c => hpdfencj.c} | 6 +- .../libhpdf/{hpdf_encoder_kr.c => hpdfenck.c} | 6 +- .../{hpdf_encoder_cnt.c => hpdfencn.c} | 6 +- .../libhpdf/{hpdf_encoder.c => hpdfenco.c} | 6 +- .../libhpdf/{hpdf_encoder.h => hpdfenco.h} | 4 +- .../libhpdf/{hpdf_encrypt.h => hpdfencr.h} | 2 +- .../{hpdf_encryptdict.h => hpdfency.h} | 2 +- .../libhpdf/{hpdf_error.c => hpdferro.c} | 8 +- .../libhpdf/{hpdf_error.h => hpdferro.h} | 2 +- .../libhpdf/{hpdf_ext_gstate.c => hpdfextg.c} | 6 +- .../libhpdf/{hpdf_ext_gstate.h => hpdfextg.h} | 2 +- .../libhpdf/{hpdf_fontdef.c => hpdffdf.c} | 6 +- .../{hpdf_fontdef_type1.c => hpdffdf1.c} | 6 +- .../{hpdf_fontdef_base14.c => hpdffdfb.c} | 6 +- .../{hpdf_fontdef_cns.c => hpdffdfc.c} | 4 +- .../{hpdf_fontdef_cid.c => hpdffdfi.c} | 6 +- .../libhpdf/{hpdf_fontdef_jp.c => hpdffdfj.c} | 4 +- .../libhpdf/{hpdf_fontdef_kr.c => hpdffdfk.c} | 4 +- .../{hpdf_fontdef_cnt.c => hpdffdfn.c} | 4 +- .../libhpdf/{hpdf_fontdef_tt.c => hpdffdft.c} | 6 +- .../libhpdf/{hpdf_font_type1.c => hpdffon1.c} | 6 +- .../libhpdf/{hpdf_font_cid.c => hpdffonc.c} | 6 +- .../libhpdf/{hpdf_fontdef.h => hpdffond.h} | 2 +- .../libhpdf/{hpdf_font.c => hpdffont.c} | 4 +- .../libhpdf/{hpdf_font.h => hpdffont.h} | 2 +- .../libhpdf/{hpdf_font_tt.c => hpdffott.c} | 6 +- .../libhpdf/{hpdf_gstate.c => hpdfgsta.c} | 6 +- .../libhpdf/{hpdf_gstate.h => hpdfgsta.h} | 2 +- .../libhpdf/{hpdf_image.c => hpdfimag.c} | 4 +- .../libhpdf/{hpdf_image.h => hpdfimag.h} | 2 +- .../libhpdf/{hpdf_image_png.c => hpdfimap.c} | 6 +- .../libhpdf/{hpdf_info.c => hpdfinfo.c} | 6 +- .../libhpdf/{hpdf_info.h => hpdfinfo.h} | 2 +- .../libhpdf/{hpdf_list.c => hpdflist.c} | 8 +- .../libhpdf/{hpdf_list.h => hpdflist.h} | 4 +- .../libhpdf/{hpdf_mmgr.c => hpdfmmgr.c} | 8 +- .../libhpdf/{hpdf_mmgr.h => hpdfmmgr.h} | 4 +- .../libhpdf/{hpdf_name.c => hpdfname.c} | 6 +- .../libhpdf/{hpdf_null.c => hpdfnull.c} | 4 +- .../libhpdf/{hpdf_number.c => hpdfnumb.c} | 4 +- .../libhpdf/{hpdf_objects.c => hpdfobje.c} | 6 +- .../libhpdf/{hpdf_objects.h => hpdfobje.h} | 2 +- .../libhpdf/{hpdf_outline.c => hpdfoutl.c} | 6 +- .../libhpdf/{hpdf_outline.h => hpdfoutl.h} | 2 +- .../libhpdf/{hpdf_page_label.c => hpdfpage.c} | 6 +- .../libhpdf/{hpdf_page_label.h => hpdfpage.h} | 0 .../{hpdf_page_operator.c => hpdfpago.c} | 6 +- .../libhpdf/{hpdf_pages.c => hpdfpags.c} | 8 +- .../libhpdf/{hpdf_pages.h => hpdfpags.h} | 4 +- .../libhpdf/{hpdf_real.c => hpdfreal.c} | 6 +- .../libhpdf/{hpdf_streams.c => hpdfstre.c} | 8 +- .../libhpdf/{hpdf_streams.h => hpdfstre.h} | 4 +- .../libhpdf/{hpdf_string.c => hpdfstri.c} | 6 +- .../libhpdf/{hpdf_types.h => hpdftype.h} | 0 .../libhpdf/{hpdf_u3d.c => hpdfu3d.c} | 4 +- .../libhpdf/{hpdf_u3d.h => hpdfu3d.h} | 2 +- .../libhpdf/{hpdf_utils.c => hpdfutil.c} | 4 +- .../libhpdf/{hpdf_utils.h => hpdfutil.h} | 4 +- .../libhpdf/{hpdf_version.h => hpdfvers.h} | 0 .../libhpdf/{hpdf_xref.c => hpdfxref.c} | 6 +- harbour/source/hbpcre/cnv_hb2o.bat | 6 +- harbour/source/hbpcre/cnv_o2hb.bat | 6 +- 86 files changed, 724 insertions(+), 252 deletions(-) create mode 100644 harbour/external/libhpdf/cnv_hb2o.bat create mode 100644 harbour/external/libhpdf/cnv_o2hb.bat rename harbour/external/libhpdf/{hpdf_annotation.c => hpdfanno.c} (99%) rename harbour/external/libhpdf/{hpdf_annotation.h => hpdfanno.h} (98%) rename harbour/external/libhpdf/{hpdf_array.c => hpdfarra.c} (99%) rename harbour/external/libhpdf/{hpdf_binary.c => hpdfbina.c} (97%) rename harbour/external/libhpdf/{hpdf_boolean.c => hpdfbool.c} (96%) rename harbour/external/libhpdf/{hpdf_catalog.c => hpdfcata.c} (98%) rename harbour/external/libhpdf/{hpdf_catalog.h => hpdfcata.h} (98%) rename harbour/external/libhpdf/{hpdf_config.h => hpdfcfg.h} (100%) rename harbour/external/libhpdf/{hpdf_conf.h => hpdfconf.h} (100%) rename harbour/external/libhpdf/{hpdf_consts.h => hpdfcons.h} (100%) rename harbour/external/libhpdf/{hpdf_destination.c => hpdfdest.c} (99%) rename harbour/external/libhpdf/{hpdf_destination.h => hpdfdest.h} (97%) rename harbour/external/libhpdf/{hpdf_dict.c => hpdfdict.c} (99%) rename harbour/external/libhpdf/{hpdf_doc.c => hpdfdoc.c} (99%) rename harbour/external/libhpdf/{hpdf_doc.h => hpdfdoc.h} (96%) rename harbour/external/libhpdf/{hpdf_doc_png.c => hpdfdocp.c} (98%) rename harbour/external/libhpdf/{hpdf_encrypt.c => hpdfecy.c} (99%) rename harbour/external/libhpdf/{hpdf_encryptdict.c => hpdfecyd.c} (98%) rename harbour/external/libhpdf/{hpdf_encoder_cns.c => hpdfencc.c} (99%) rename harbour/external/libhpdf/{hpdf_encoder_jp.c => hpdfencj.c} (99%) rename harbour/external/libhpdf/{hpdf_encoder_kr.c => hpdfenck.c} (99%) rename harbour/external/libhpdf/{hpdf_encoder_cnt.c => hpdfencn.c} (99%) rename harbour/external/libhpdf/{hpdf_encoder.c => hpdfenco.c} (99%) rename harbour/external/libhpdf/{hpdf_encoder.h => hpdfenco.h} (99%) rename harbour/external/libhpdf/{hpdf_encrypt.h => hpdfencr.h} (99%) rename harbour/external/libhpdf/{hpdf_encryptdict.h => hpdfency.h} (98%) rename harbour/external/libhpdf/{hpdf_error.c => hpdferro.c} (96%) rename harbour/external/libhpdf/{hpdf_error.h => hpdferro.h} (99%) rename harbour/external/libhpdf/{hpdf_ext_gstate.c => hpdfextg.c} (98%) rename harbour/external/libhpdf/{hpdf_ext_gstate.h => hpdfextg.h} (97%) rename harbour/external/libhpdf/{hpdf_fontdef.c => hpdffdf.c} (94%) rename harbour/external/libhpdf/{hpdf_fontdef_type1.c => hpdffdf1.c} (99%) rename harbour/external/libhpdf/{hpdf_fontdef_base14.c => hpdffdfb.c} (99%) rename harbour/external/libhpdf/{hpdf_fontdef_cns.c => hpdffdfc.c} (99%) rename harbour/external/libhpdf/{hpdf_fontdef_cid.c => hpdffdfi.c} (98%) rename harbour/external/libhpdf/{hpdf_fontdef_jp.c => hpdffdfj.c} (99%) rename harbour/external/libhpdf/{hpdf_fontdef_kr.c => hpdffdfk.c} (99%) rename harbour/external/libhpdf/{hpdf_fontdef_cnt.c => hpdffdfn.c} (99%) rename harbour/external/libhpdf/{hpdf_fontdef_tt.c => hpdffdft.c} (99%) rename harbour/external/libhpdf/{hpdf_font_type1.c => hpdffon1.c} (99%) rename harbour/external/libhpdf/{hpdf_font_cid.c => hpdffonc.c} (99%) rename harbour/external/libhpdf/{hpdf_fontdef.h => hpdffond.h} (99%) rename harbour/external/libhpdf/{hpdf_font.c => hpdffont.c} (99%) rename harbour/external/libhpdf/{hpdf_font.h => hpdffont.h} (99%) rename harbour/external/libhpdf/{hpdf_font_tt.c => hpdffott.c} (99%) rename harbour/external/libhpdf/{hpdf_gstate.c => hpdfgsta.c} (98%) rename harbour/external/libhpdf/{hpdf_gstate.h => hpdfgsta.h} (99%) rename harbour/external/libhpdf/{hpdf_image.c => hpdfimag.c} (99%) rename harbour/external/libhpdf/{hpdf_image.h => hpdfimag.h} (98%) rename harbour/external/libhpdf/{hpdf_image_png.c => hpdfimap.c} (99%) rename harbour/external/libhpdf/{hpdf_info.c => hpdfinfo.c} (98%) rename harbour/external/libhpdf/{hpdf_info.h => hpdfinfo.h} (97%) rename harbour/external/libhpdf/{hpdf_list.c => hpdflist.c} (98%) rename harbour/external/libhpdf/{hpdf_list.h => hpdflist.h} (97%) rename harbour/external/libhpdf/{hpdf_mmgr.c => hpdfmmgr.c} (98%) rename harbour/external/libhpdf/{hpdf_mmgr.h => hpdfmmgr.h} (97%) rename harbour/external/libhpdf/{hpdf_name.c => hpdfname.c} (96%) rename harbour/external/libhpdf/{hpdf_null.c => hpdfnull.c} (94%) rename harbour/external/libhpdf/{hpdf_number.c => hpdfnumb.c} (96%) rename harbour/external/libhpdf/{hpdf_objects.c => hpdfobje.c} (98%) rename harbour/external/libhpdf/{hpdf_objects.h => hpdfobje.h} (99%) rename harbour/external/libhpdf/{hpdf_outline.c => hpdfoutl.c} (99%) rename harbour/external/libhpdf/{hpdf_outline.h => hpdfoutl.h} (98%) rename harbour/external/libhpdf/{hpdf_page_label.c => hpdfpage.c} (96%) rename harbour/external/libhpdf/{hpdf_page_label.h => hpdfpage.h} (100%) rename harbour/external/libhpdf/{hpdf_page_operator.c => hpdfpago.c} (99%) rename harbour/external/libhpdf/{hpdf_pages.c => hpdfpags.c} (99%) rename harbour/external/libhpdf/{hpdf_pages.h => hpdfpags.h} (98%) rename harbour/external/libhpdf/{hpdf_real.c => hpdfreal.c} (95%) rename harbour/external/libhpdf/{hpdf_streams.c => hpdfstre.c} (99%) rename harbour/external/libhpdf/{hpdf_streams.h => hpdfstre.h} (99%) rename harbour/external/libhpdf/{hpdf_string.c => hpdfstri.c} (98%) rename harbour/external/libhpdf/{hpdf_types.h => hpdftype.h} (100%) rename harbour/external/libhpdf/{hpdf_u3d.c => hpdfu3d.c} (99%) rename harbour/external/libhpdf/{hpdf_u3d.h => hpdfu3d.h} (98%) rename harbour/external/libhpdf/{hpdf_utils.c => hpdfutil.c} (99%) rename harbour/external/libhpdf/{hpdf_utils.h => hpdfutil.h} (98%) rename harbour/external/libhpdf/{hpdf_version.h => hpdfvers.h} (100%) rename harbour/external/libhpdf/{hpdf_xref.c => hpdfxref.c} (99%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index da36e7ef17..9cb505cdb5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,182 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-10 09:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * external/libhpdf/Makefile + + Enabled for all dos platforms (dos/watcom currently and + probably all dos builds done on MS-DOS hosts). + + + external/libhpdf/ori_dst + + external/libhpdf/ori_src + + external/libhpdf/cnv_hb2o.bat + + external/libhpdf/cnv_o2hb.bat + - external/libhpdf/hpdf_annotation.c + - external/libhpdf/hpdf_annotation.h + - external/libhpdf/hpdf_array.c + - external/libhpdf/hpdf_binary.c + - external/libhpdf/hpdf_boolean.c + - external/libhpdf/hpdf_catalog.c + - external/libhpdf/hpdf_catalog.h + - external/libhpdf/hpdf_conf.h + - external/libhpdf/hpdf_config.h + - external/libhpdf/hpdf_consts.h + - external/libhpdf/hpdf_destination.c + - external/libhpdf/hpdf_destination.h + - external/libhpdf/hpdf_dict.c + - external/libhpdf/hpdf_doc.c + - external/libhpdf/hpdf_doc.h + - external/libhpdf/hpdf_doc_png.c + - external/libhpdf/hpdf_encoder.c + - external/libhpdf/hpdf_encoder.h + - external/libhpdf/hpdf_encoder_cns.c + - external/libhpdf/hpdf_encoder_cnt.c + - external/libhpdf/hpdf_encoder_jp.c + - external/libhpdf/hpdf_encoder_kr.c + - external/libhpdf/hpdf_encrypt.c + - external/libhpdf/hpdf_encrypt.h + - external/libhpdf/hpdf_encryptdict.c + - external/libhpdf/hpdf_encryptdict.h + - external/libhpdf/hpdf_error.c + - external/libhpdf/hpdf_error.h + - external/libhpdf/hpdf_ext_gstate.c + - external/libhpdf/hpdf_ext_gstate.h + - external/libhpdf/hpdf_font.c + - external/libhpdf/hpdf_font.h + - external/libhpdf/hpdf_font_cid.c + - external/libhpdf/hpdf_font_tt.c + - external/libhpdf/hpdf_font_type1.c + - external/libhpdf/hpdf_fontdef.c + - external/libhpdf/hpdf_fontdef.h + - external/libhpdf/hpdf_fontdef_base14.c + - external/libhpdf/hpdf_fontdef_cid.c + - external/libhpdf/hpdf_fontdef_cns.c + - external/libhpdf/hpdf_fontdef_cnt.c + - external/libhpdf/hpdf_fontdef_jp.c + - external/libhpdf/hpdf_fontdef_kr.c + - external/libhpdf/hpdf_fontdef_tt.c + - external/libhpdf/hpdf_fontdef_type1.c + - external/libhpdf/hpdf_gstate.c + - external/libhpdf/hpdf_gstate.h + - external/libhpdf/hpdf_image.c + - external/libhpdf/hpdf_image.h + - external/libhpdf/hpdf_image_png.c + - external/libhpdf/hpdf_info.c + - external/libhpdf/hpdf_info.h + - external/libhpdf/hpdf_list.c + - external/libhpdf/hpdf_list.h + - external/libhpdf/hpdf_mmgr.c + - external/libhpdf/hpdf_mmgr.h + - external/libhpdf/hpdf_name.c + - external/libhpdf/hpdf_null.c + - external/libhpdf/hpdf_number.c + - external/libhpdf/hpdf_objects.c + - external/libhpdf/hpdf_objects.h + - external/libhpdf/hpdf_outline.c + - external/libhpdf/hpdf_outline.h + - external/libhpdf/hpdf_page_label.c + - external/libhpdf/hpdf_page_label.h + - external/libhpdf/hpdf_page_operator.c + - external/libhpdf/hpdf_pages.c + - external/libhpdf/hpdf_pages.h + - external/libhpdf/hpdf_real.c + - external/libhpdf/hpdf_streams.c + - external/libhpdf/hpdf_streams.h + - external/libhpdf/hpdf_string.c + - external/libhpdf/hpdf_types.h + - external/libhpdf/hpdf_u3d.c + - external/libhpdf/hpdf_u3d.h + - external/libhpdf/hpdf_utils.c + - external/libhpdf/hpdf_utils.h + - external/libhpdf/hpdf_version.h + - external/libhpdf/hpdf_xref.c + + external/libhpdf/hpdfanno.c + + external/libhpdf/hpdfanno.h + + external/libhpdf/hpdfarra.c + + external/libhpdf/hpdfbina.c + + external/libhpdf/hpdfbool.c + + external/libhpdf/hpdfcata.c + + external/libhpdf/hpdfcata.h + + external/libhpdf/hpdfcfg.h + + external/libhpdf/hpdfconf.h + + external/libhpdf/hpdfcons.h + + external/libhpdf/hpdfdest.c + + external/libhpdf/hpdfdest.h + + external/libhpdf/hpdfdict.c + + external/libhpdf/hpdfdoc.c + + external/libhpdf/hpdfdoc.h + + external/libhpdf/hpdfdocp.c + + external/libhpdf/hpdfecy.c + + external/libhpdf/hpdfecyd.c + + external/libhpdf/hpdfencc.c + + external/libhpdf/hpdfencj.c + + external/libhpdf/hpdfenck.c + + external/libhpdf/hpdfencn.c + + external/libhpdf/hpdfenco.c + + external/libhpdf/hpdfenco.h + + external/libhpdf/hpdfencr.h + + external/libhpdf/hpdfency.h + + external/libhpdf/hpdferro.c + + external/libhpdf/hpdferro.h + + external/libhpdf/hpdfextg.c + + external/libhpdf/hpdfextg.h + + external/libhpdf/hpdffdf.c + + external/libhpdf/hpdffdf1.c + + external/libhpdf/hpdffdfb.c + + external/libhpdf/hpdffdfc.c + + external/libhpdf/hpdffdfi.c + + external/libhpdf/hpdffdfj.c + + external/libhpdf/hpdffdfk.c + + external/libhpdf/hpdffdfn.c + + external/libhpdf/hpdffdft.c + + external/libhpdf/hpdffon1.c + + external/libhpdf/hpdffonc.c + + external/libhpdf/hpdffond.h + + external/libhpdf/hpdffont.c + + external/libhpdf/hpdffont.h + + external/libhpdf/hpdffott.c + + external/libhpdf/hpdfgsta.c + + external/libhpdf/hpdfgsta.h + + external/libhpdf/hpdfimag.c + + external/libhpdf/hpdfimag.h + + external/libhpdf/hpdfimap.c + + external/libhpdf/hpdfinfo.c + + external/libhpdf/hpdfinfo.h + + external/libhpdf/hpdflist.c + + external/libhpdf/hpdflist.h + + external/libhpdf/hpdfmmgr.c + + external/libhpdf/hpdfmmgr.h + + external/libhpdf/hpdfname.c + + external/libhpdf/hpdfnull.c + + external/libhpdf/hpdfnumb.c + + external/libhpdf/hpdfobje.c + + external/libhpdf/hpdfobje.h + + external/libhpdf/hpdfoutl.c + + external/libhpdf/hpdfoutl.h + + external/libhpdf/hpdfpage.c + + external/libhpdf/hpdfpage.h + + external/libhpdf/hpdfpago.c + + external/libhpdf/hpdfpags.c + + external/libhpdf/hpdfpags.h + + external/libhpdf/hpdfreal.c + + external/libhpdf/hpdfstre.c + + external/libhpdf/hpdfstre.h + + external/libhpdf/hpdfstri.c + + external/libhpdf/hpdftype.h + + external/libhpdf/hpdfu3d.c + + external/libhpdf/hpdfu3d.h + + external/libhpdf/hpdfutil.c + + external/libhpdf/hpdfutil.h + + external/libhpdf/hpdfvers.h + + external/libhpdf/hpdfxref.c + * external/libhpdf/hpdf.h + * external/libhpdf/Makefile + * Converted to short filenames. Added converted scripts. + + * source/hbpcre/cnv_hb2o.bat + * source/hbpcre/cnv_o2hb.bat + ! Fixed typo in prev. + * Removed PCRE references from comment texts. + 2009-09-10 08:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbgtinfo.ch + contrib/gtqtc/hbgtqtc.ch diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index 20f7c9c488..34fb3eb89b 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -13,57 +13,57 @@ LIBNAME := libhpdf C_SOURCES := \ _hbhbpdf.c \ - hpdf_annotation.c \ - hpdf_array.c \ - hpdf_binary.c \ - hpdf_boolean.c \ - hpdf_catalog.c \ - hpdf_destination.c \ - hpdf_dict.c \ - hpdf_doc.c \ - hpdf_doc_png.c \ - hpdf_encoder.c \ - hpdf_encoder_cns.c \ - hpdf_encoder_cnt.c \ - hpdf_encoder_jp.c \ - hpdf_encoder_kr.c \ - hpdf_encrypt.c \ - hpdf_encryptdict.c \ - hpdf_error.c \ - hpdf_ext_gstate.c \ - hpdf_font.c \ - hpdf_font_cid.c \ - hpdf_font_tt.c \ - hpdf_font_type1.c \ - hpdf_fontdef.c \ - hpdf_fontdef_base14.c \ - hpdf_fontdef_cid.c \ - hpdf_fontdef_cns.c \ - hpdf_fontdef_cnt.c \ - hpdf_fontdef_jp.c \ - hpdf_fontdef_kr.c \ - hpdf_fontdef_tt.c \ - hpdf_fontdef_type1.c \ - hpdf_gstate.c \ - hpdf_image.c \ - hpdf_image_png.c \ - hpdf_info.c \ - hpdf_list.c \ - hpdf_mmgr.c \ - hpdf_name.c \ - hpdf_null.c \ - hpdf_number.c \ - hpdf_objects.c \ - hpdf_outline.c \ - hpdf_page_label.c \ - hpdf_page_operator.c \ - hpdf_pages.c \ - hpdf_real.c \ - hpdf_streams.c \ - hpdf_string.c \ - hpdf_u3d.c \ - hpdf_utils.c \ - hpdf_xref.c \ + hpdfanno.c \ + hpdfarra.c \ + hpdfbina.c \ + hpdfbool.c \ + hpdfcata.c \ + hpdfdest.c \ + hpdfdict.c \ + hpdfdoc.c \ + hpdfdocp.c \ + hpdfecy.c \ + hpdfecyd.c \ + hpdfencc.c \ + hpdfencj.c \ + hpdfenck.c \ + hpdfencn.c \ + hpdfenco.c \ + hpdferro.c \ + hpdfextg.c \ + hpdffdf.c \ + hpdffdf1.c \ + hpdffdfb.c \ + hpdffdfc.c \ + hpdffdfi.c \ + hpdffdfj.c \ + hpdffdfk.c \ + hpdffdfn.c \ + hpdffdft.c \ + hpdffon1.c \ + hpdffonc.c \ + hpdffont.c \ + hpdffott.c \ + hpdfgsta.c \ + hpdfimag.c \ + hpdfimap.c \ + hpdfinfo.c \ + hpdflist.c \ + hpdfmmgr.c \ + hpdfname.c \ + hpdfnull.c \ + hpdfnumb.c \ + hpdfobje.c \ + hpdfoutl.c \ + hpdfpage.c \ + hpdfpago.c \ + hpdfpags.c \ + hpdfreal.c \ + hpdfstre.c \ + hpdfstri.c \ + hpdfu3d.c \ + hpdfutil.c \ + hpdfxref.c \ # decide whether to build it locally ifeq ($(HB_INC_LIBHARU),) @@ -71,10 +71,6 @@ ifeq ($(HB_INC_LIBHARU),) ifeq ($(HB_PLATFORM)-$(HB_COMPILER),win-watcom) HB_INC_LIBHARU := no endif - # NOTE: dos hosts can't build this lib due to long filename. [vszakats] - ifeq ($(HB_HOST_PLAT),dos) - HB_INC_LIBHARU := no - endif ifeq ($(HB_COMPILER),pocc64) HB_INC_LIBHARU := no endif diff --git a/harbour/external/libhpdf/cnv_hb2o.bat b/harbour/external/libhpdf/cnv_hb2o.bat new file mode 100644 index 0000000000..4731d6245d --- /dev/null +++ b/harbour/external/libhpdf/cnv_hb2o.bat @@ -0,0 +1,135 @@ +@echo off +rem +rem $Id$ +rem + +rem NOTE: Purpose of this script is to take the source files +rem in Harbour repo and convert them back to the filenames +rem used in the original source distribution. +rem This is to aid finding local modifications and +rem apply them after an original source update. +rem [vszakats] +rem +rem This tool uses 'GNU gsar' for search and replace. +rem +rem DISCLAIMER: This tool is targeted only to Harbour core +rem maintainers. If you're not one of them you +rem don't have to mess with this tool. + +md ori_dst +del ori_dst\*.* /Y + +copy README ori_dst\README +copy hpdfanno.c ori_dst\hpdf_annotation.c +copy hpdfarra.c ori_dst\hpdf_array.c +copy hpdfbina.c ori_dst\hpdf_binary.c +copy hpdfbool.c ori_dst\hpdf_boolean.c +copy hpdfcata.c ori_dst\hpdf_catalog.c +copy hpdfdest.c ori_dst\hpdf_destination.c +copy hpdfdict.c ori_dst\hpdf_dict.c +copy hpdfdoc.c ori_dst\hpdf_doc.c +copy hpdfdocp.c ori_dst\hpdf_doc_png.c +copy hpdfenco.c ori_dst\hpdf_encoder.c +copy hpdfencc.c ori_dst\hpdf_encoder_cns.c +copy hpdfencn.c ori_dst\hpdf_encoder_cnt.c +copy hpdfencj.c ori_dst\hpdf_encoder_jp.c +copy hpdfenck.c ori_dst\hpdf_encoder_kr.c +copy hpdfecy.c ori_dst\hpdf_encrypt.c +copy hpdfecyd.c ori_dst\hpdf_encryptdict.c +copy hpdferro.c ori_dst\hpdf_error.c +copy hpdfextg.c ori_dst\hpdf_ext_gstate.c +copy hpdffont.c ori_dst\hpdf_font.c +copy hpdffonc.c ori_dst\hpdf_font_cid.c +copy hpdffott.c ori_dst\hpdf_font_tt.c +copy hpdffon1.c ori_dst\hpdf_font_type1.c +copy hpdffdf.c ori_dst\hpdf_fontdef.c +copy hpdffdfb.c ori_dst\hpdf_fontdef_base14.c +copy hpdffdfi.c ori_dst\hpdf_fontdef_cid.c +copy hpdffdfc.c ori_dst\hpdf_fontdef_cns.c +copy hpdffdfn.c ori_dst\hpdf_fontdef_cnt.c +copy hpdffdfj.c ori_dst\hpdf_fontdef_jp.c +copy hpdffdfk.c ori_dst\hpdf_fontdef_kr.c +copy hpdffdft.c ori_dst\hpdf_fontdef_tt.c +copy hpdffdf1.c ori_dst\hpdf_fontdef_type1.c +copy hpdfgsta.c ori_dst\hpdf_gstate.c +copy hpdfimag.c ori_dst\hpdf_image.c +copy hpdfimap.c ori_dst\hpdf_image_png.c +copy hpdfinfo.c ori_dst\hpdf_info.c +copy hpdflist.c ori_dst\hpdf_list.c +copy hpdfmmgr.c ori_dst\hpdf_mmgr.c +copy hpdfname.c ori_dst\hpdf_name.c +copy hpdfnull.c ori_dst\hpdf_null.c +copy hpdfnumb.c ori_dst\hpdf_number.c +copy hpdfobje.c ori_dst\hpdf_objects.c +copy hpdfoutl.c ori_dst\hpdf_outline.c +copy hpdfpage.c ori_dst\hpdf_page_label.c +copy hpdfpago.c ori_dst\hpdf_page_operator.c +copy hpdfpags.c ori_dst\hpdf_pages.c +copy hpdfreal.c ori_dst\hpdf_real.c +copy hpdfstre.c ori_dst\hpdf_streams.c +copy hpdfstri.c ori_dst\hpdf_string.c +copy hpdfu3d.c ori_dst\hpdf_u3d.c +copy hpdfutil.c ori_dst\hpdf_utils.c +copy hpdfxref.c ori_dst\hpdf_xref.c +copy hpdf.h ori_dst\hpdf.h +copy hpdfanno.h ori_dst\hpdf_annotation.h +copy hpdfcata.h ori_dst\hpdf_catalog.h +copy hpdfconf.h ori_dst\hpdf_conf.h +copy hpdfcfg.h ori_dst\hpdf_config.h +copy hpdfcons.h ori_dst\hpdf_consts.h +copy hpdfdest.h ori_dst\hpdf_destination.h +copy hpdfdoc.h ori_dst\hpdf_doc.h +copy hpdfenco.h ori_dst\hpdf_encoder.h +copy hpdfencr.h ori_dst\hpdf_encrypt.h +copy hpdfency.h ori_dst\hpdf_encryptdict.h +copy hpdferro.h ori_dst\hpdf_error.h +copy hpdfextg.h ori_dst\hpdf_ext_gstate.h +copy hpdffont.h ori_dst\hpdf_font.h +copy hpdffond.h ori_dst\hpdf_fontdef.h +copy hpdfgsta.h ori_dst\hpdf_gstate.h +copy hpdfimag.h ori_dst\hpdf_image.h +copy hpdfinfo.h ori_dst\hpdf_info.h +copy hpdflist.h ori_dst\hpdf_list.h +copy hpdfmmgr.h ori_dst\hpdf_mmgr.h +copy hpdfobje.h ori_dst\hpdf_objects.h +copy hpdfoutl.h ori_dst\hpdf_outline.h +copy hpdfpage.h ori_dst\hpdf_page_label.h +copy hpdfpags.h ori_dst\hpdf_pages.h +copy hpdfstre.h ori_dst\hpdf_streams.h +copy hpdftype.h ori_dst\hpdf_types.h +copy hpdfu3d.h ori_dst\hpdf_u3d.h +copy hpdfutil.h ori_dst\hpdf_utils.h +copy hpdfvers.h ori_dst\hpdf_version.h + +cd ori_dst + +gsar -o -s":x22hpdfanno.h:x22" -r":x22hpdf_annotation.h:x22" *.* +gsar -o -s":x22hpdfcata.h:x22" -r":x22hpdf_catalog.h:x22" *.* +gsar -o -s":x22hpdfconf.h:x22" -r":x22hpdf_conf.h:x22" *.* +gsar -o -s":x22hpdfcfg.h:x22" -r":x22hpdf_config.h:x22" *.* +gsar -o -s":x22hpdfcons.h:x22" -r":x22hpdf_consts.h:x22" *.* +gsar -o -s":x22hpdfdest.h:x22" -r":x22hpdf_destination.h:x22" *.* +gsar -o -s":x22hpdfdoc.h:x22" -r":x22hpdf_doc.h:x22" *.* +gsar -o -s":x22hpdfenco.h:x22" -r":x22hpdf_encoder.h:x22" *.* +gsar -o -s":x22hpdfencr.h:x22" -r":x22hpdf_encrypt.h:x22" *.* +gsar -o -s":x22hpdfency.h:x22" -r":x22hpdf_encryptdict.h:x22" *.* +gsar -o -s":x22hpdferro.h:x22" -r":x22hpdf_error.h:x22" *.* +gsar -o -s":x22hpdfextg.h:x22" -r":x22hpdf_ext_gstate.h:x22" *.* +gsar -o -s":x22hpdffont.h:x22" -r":x22hpdf_font.h:x22" *.* +gsar -o -s":x22hpdffond.h:x22" -r":x22hpdf_fontdef.h:x22" *.* +gsar -o -s":x22hpdfgsta.h:x22" -r":x22hpdf_gstate.h:x22" *.* +gsar -o -s":x22hpdfimag.h:x22" -r":x22hpdf_image.h:x22" *.* +gsar -o -s":x22hpdfinfo.h:x22" -r":x22hpdf_info.h:x22" *.* +gsar -o -s":x22hpdflist.h:x22" -r":x22hpdf_list.h:x22" *.* +gsar -o -s":x22hpdfmmgr.h:x22" -r":x22hpdf_mmgr.h:x22" *.* +gsar -o -s":x22hpdfobje.h:x22" -r":x22hpdf_objects.h:x22" *.* +gsar -o -s":x22hpdfoutl.h:x22" -r":x22hpdf_outline.h:x22" *.* +gsar -o -s":x22hpdfpage.h:x22" -r":x22hpdf_page_label.h:x22" *.* +gsar -o -s":x22hpdfpags.h:x22" -r":x22hpdf_pages.h:x22" *.* +gsar -o -s":x22hpdfstre.h:x22" -r":x22hpdf_streams.h:x22" *.* +gsar -o -s":x22hpdftype.h:x22" -r":x22hpdf_types.h:x22" *.* +gsar -o -s":x22hpdfu3d.h:x22" -r":x22hpdf_u3d.h:x22" *.* +gsar -o -s":x22hpdfutil.h:x22" -r":x22hpdf_utils.h:x22" *.* +gsar -o -s":x22hpdfvers.h:x22" -r":x22hpdf_version.h:x22" *.* + +cd .. diff --git a/harbour/external/libhpdf/cnv_o2hb.bat b/harbour/external/libhpdf/cnv_o2hb.bat new file mode 100644 index 0000000000..55355d3c8c --- /dev/null +++ b/harbour/external/libhpdf/cnv_o2hb.bat @@ -0,0 +1,165 @@ +@echo off +rem +rem $Id$ +rem + +rem Tested with PCRE 7.7 + +rem NOTE: Purpose of this script is to take the original +rem files from its source distribution and convert +rem them to the short filenames we use here in Harbour. +rem Short filenames are needed for dos compiler support. +rem Some other automated modifications are also done +rem to help compiling the sources "as-is", to try to +rem avoid any manual editing on these foreign sources. +rem [vszakats] +rem +rem This tool uses 'GNU gsar' for search and replace. +rem and 'GNU unix2dos' for line ending conversion. +rem +rem DISCLAIMER: This tool is targeted only to Harbour core +rem maintainers. If you're not one of them you +rem don't have to mess with this tool. + +copy ori_src\README README +copy ori_src\hpdf_annotation.c hpdfanno.c +copy ori_src\hpdf_array.c hpdfarra.c +copy ori_src\hpdf_binary.c hpdfbina.c +copy ori_src\hpdf_boolean.c hpdfbool.c +copy ori_src\hpdf_catalog.c hpdfcata.c +copy ori_src\hpdf_destination.c hpdfdest.c +copy ori_src\hpdf_dict.c hpdfdict.c +copy ori_src\hpdf_doc.c hpdfdoc.c +copy ori_src\hpdf_doc_png.c hpdfdocp.c +copy ori_src\hpdf_encoder.c hpdfenco.c +copy ori_src\hpdf_encoder_cns.c hpdfencc.c +copy ori_src\hpdf_encoder_cnt.c hpdfencn.c +copy ori_src\hpdf_encoder_jp.c hpdfencj.c +copy ori_src\hpdf_encoder_kr.c hpdfenck.c +copy ori_src\hpdf_encrypt.c hpdfecy.c +copy ori_src\hpdf_encryptdict.c hpdfecyd.c +copy ori_src\hpdf_error.c hpdferro.c +copy ori_src\hpdf_ext_gstate.c hpdfextg.c +copy ori_src\hpdf_font.c hpdffont.c +copy ori_src\hpdf_font_cid.c hpdffonc.c +copy ori_src\hpdf_font_tt.c hpdffott.c +copy ori_src\hpdf_font_type1.c hpdffon1.c +copy ori_src\hpdf_fontdef.c hpdffdf.c +copy ori_src\hpdf_fontdef_base14.c hpdffdfb.c +copy ori_src\hpdf_fontdef_cid.c hpdffdfi.c +copy ori_src\hpdf_fontdef_cns.c hpdffdfc.c +copy ori_src\hpdf_fontdef_cnt.c hpdffdfn.c +copy ori_src\hpdf_fontdef_jp.c hpdffdfj.c +copy ori_src\hpdf_fontdef_kr.c hpdffdfk.c +copy ori_src\hpdf_fontdef_tt.c hpdffdft.c +copy ori_src\hpdf_fontdef_type1.c hpdffdf1.c +copy ori_src\hpdf_gstate.c hpdfgsta.c +copy ori_src\hpdf_image.c hpdfimag.c +copy ori_src\hpdf_image_png.c hpdfimap.c +copy ori_src\hpdf_info.c hpdfinfo.c +copy ori_src\hpdf_list.c hpdflist.c +copy ori_src\hpdf_mmgr.c hpdfmmgr.c +copy ori_src\hpdf_name.c hpdfname.c +copy ori_src\hpdf_null.c hpdfnull.c +copy ori_src\hpdf_number.c hpdfnumb.c +copy ori_src\hpdf_objects.c hpdfobje.c +copy ori_src\hpdf_outline.c hpdfoutl.c +copy ori_src\hpdf_page_label.c hpdfpage.c +copy ori_src\hpdf_page_operator.c hpdfpago.c +copy ori_src\hpdf_pages.c hpdfpags.c +copy ori_src\hpdf_real.c hpdfreal.c +copy ori_src\hpdf_streams.c hpdfstre.c +copy ori_src\hpdf_string.c hpdfstri.c +copy ori_src\hpdf_u3d.c hpdfu3d.c +copy ori_src\hpdf_utils.c hpdfutil.c +copy ori_src\hpdf_xref.c hpdfxref.c +copy ori_src\hpdf.h hpdf.h +copy ori_src\hpdf_annotation.h hpdfanno.h +copy ori_src\hpdf_catalog.h hpdfcata.h +copy ori_src\hpdf_conf.h hpdfconf.h +copy ori_src\hpdf_config.h hpdfcfg.h +copy ori_src\hpdf_consts.h hpdfcons.h +copy ori_src\hpdf_destination.h hpdfdest.h +copy ori_src\hpdf_doc.h hpdfdoc.h +copy ori_src\hpdf_encoder.h hpdfenco.h +copy ori_src\hpdf_encrypt.h hpdfencr.h +copy ori_src\hpdf_encryptdict.h hpdfency.h +copy ori_src\hpdf_error.h hpdferro.h +copy ori_src\hpdf_ext_gstate.h hpdfextg.h +copy ori_src\hpdf_font.h hpdffont.h +copy ori_src\hpdf_fontdef.h hpdffond.h +copy ori_src\hpdf_gstate.h hpdfgsta.h +copy ori_src\hpdf_image.h hpdfimag.h +copy ori_src\hpdf_info.h hpdfinfo.h +copy ori_src\hpdf_list.h hpdflist.h +copy ori_src\hpdf_mmgr.h hpdfmmgr.h +copy ori_src\hpdf_objects.h hpdfobje.h +copy ori_src\hpdf_outline.h hpdfoutl.h +copy ori_src\hpdf_page_label.h hpdfpage.h +copy ori_src\hpdf_pages.h hpdfpags.h +copy ori_src\hpdf_streams.h hpdfstre.h +copy ori_src\hpdf_types.h hpdftype.h +copy ori_src\hpdf_u3d.h hpdfu3d.h +copy ori_src\hpdf_utils.h hpdfutil.h +copy ori_src\hpdf_version.h hpdfvers.h + +unix2dos *.c +unix2dos *.h + +gsar -o -s":x22hpdf_annotation.h:x22" -r":x22hpdfanno.h:x22" *.c +gsar -o -s":x22hpdf_catalog.h:x22" -r":x22hpdfcata.h:x22" *.c +gsar -o -s":x22hpdf_conf.h:x22" -r":x22hpdfconf.h:x22" *.c +gsar -o -s":x22hpdf_config.h:x22" -r":x22hpdfcfg.h:x22" *.c +gsar -o -s":x22hpdf_consts.h:x22" -r":x22hpdfcons.h:x22" *.c +gsar -o -s":x22hpdf_destination.h:x22" -r":x22hpdfdest.h:x22" *.c +gsar -o -s":x22hpdf_doc.h:x22" -r":x22hpdfdoc.h:x22" *.c +gsar -o -s":x22hpdf_encoder.h:x22" -r":x22hpdfenco.h:x22" *.c +gsar -o -s":x22hpdf_encrypt.h:x22" -r":x22hpdfencr.h:x22" *.c +gsar -o -s":x22hpdf_encryptdict.h:x22" -r":x22hpdfency.h:x22" *.c +gsar -o -s":x22hpdf_error.h:x22" -r":x22hpdferro.h:x22" *.c +gsar -o -s":x22hpdf_ext_gstate.h:x22" -r":x22hpdfextg.h:x22" *.c +gsar -o -s":x22hpdf_font.h:x22" -r":x22hpdffont.h:x22" *.c +gsar -o -s":x22hpdf_fontdef.h:x22" -r":x22hpdffond.h:x22" *.c +gsar -o -s":x22hpdf_gstate.h:x22" -r":x22hpdfgsta.h:x22" *.c +gsar -o -s":x22hpdf_image.h:x22" -r":x22hpdfimag.h:x22" *.c +gsar -o -s":x22hpdf_info.h:x22" -r":x22hpdfinfo.h:x22" *.c +gsar -o -s":x22hpdf_list.h:x22" -r":x22hpdflist.h:x22" *.c +gsar -o -s":x22hpdf_mmgr.h:x22" -r":x22hpdfmmgr.h:x22" *.c +gsar -o -s":x22hpdf_objects.h:x22" -r":x22hpdfobje.h:x22" *.c +gsar -o -s":x22hpdf_outline.h:x22" -r":x22hpdfoutl.h:x22" *.c +gsar -o -s":x22hpdf_page_label.h:x22" -r":x22hpdfpage.h:x22" *.c +gsar -o -s":x22hpdf_pages.h:x22" -r":x22hpdfpags.h:x22" *.c +gsar -o -s":x22hpdf_streams.h:x22" -r":x22hpdfstre.h:x22" *.c +gsar -o -s":x22hpdf_types.h:x22" -r":x22hpdftype.h:x22" *.c +gsar -o -s":x22hpdf_u3d.h:x22" -r":x22hpdfu3d.h:x22" *.c +gsar -o -s":x22hpdf_utils.h:x22" -r":x22hpdfutil.h:x22" *.c +gsar -o -s":x22hpdf_version.h:x22" -r":x22hpdfvers.h:x22" *.c + +gsar -o -s":x22hpdf_annotation.h:x22" -r":x22hpdfanno.h:x22" *.h +gsar -o -s":x22hpdf_catalog.h:x22" -r":x22hpdfcata.h:x22" *.h +gsar -o -s":x22hpdf_conf.h:x22" -r":x22hpdfconf.h:x22" *.h +gsar -o -s":x22hpdf_config.h:x22" -r":x22hpdfcfg.h:x22" *.h +gsar -o -s":x22hpdf_consts.h:x22" -r":x22hpdfcons.h:x22" *.h +gsar -o -s":x22hpdf_destination.h:x22" -r":x22hpdfdest.h:x22" *.h +gsar -o -s":x22hpdf_doc.h:x22" -r":x22hpdfdoc.h:x22" *.h +gsar -o -s":x22hpdf_encoder.h:x22" -r":x22hpdfenco.h:x22" *.h +gsar -o -s":x22hpdf_encrypt.h:x22" -r":x22hpdfencr.h:x22" *.h +gsar -o -s":x22hpdf_encryptdict.h:x22" -r":x22hpdfency.h:x22" *.h +gsar -o -s":x22hpdf_error.h:x22" -r":x22hpdferro.h:x22" *.h +gsar -o -s":x22hpdf_ext_gstate.h:x22" -r":x22hpdfextg.h:x22" *.h +gsar -o -s":x22hpdf_font.h:x22" -r":x22hpdffont.h:x22" *.h +gsar -o -s":x22hpdf_fontdef.h:x22" -r":x22hpdffond.h:x22" *.h +gsar -o -s":x22hpdf_gstate.h:x22" -r":x22hpdfgsta.h:x22" *.h +gsar -o -s":x22hpdf_image.h:x22" -r":x22hpdfimag.h:x22" *.h +gsar -o -s":x22hpdf_info.h:x22" -r":x22hpdfinfo.h:x22" *.h +gsar -o -s":x22hpdf_list.h:x22" -r":x22hpdflist.h:x22" *.h +gsar -o -s":x22hpdf_mmgr.h:x22" -r":x22hpdfmmgr.h:x22" *.h +gsar -o -s":x22hpdf_objects.h:x22" -r":x22hpdfobje.h:x22" *.h +gsar -o -s":x22hpdf_outline.h:x22" -r":x22hpdfoutl.h:x22" *.h +gsar -o -s":x22hpdf_page_label.h:x22" -r":x22hpdfpage.h:x22" *.h +gsar -o -s":x22hpdf_pages.h:x22" -r":x22hpdfpags.h:x22" *.h +gsar -o -s":x22hpdf_streams.h:x22" -r":x22hpdfstre.h:x22" *.h +gsar -o -s":x22hpdf_types.h:x22" -r":x22hpdftype.h:x22" *.h +gsar -o -s":x22hpdf_u3d.h:x22" -r":x22hpdfu3d.h:x22" *.h +gsar -o -s":x22hpdf_utils.h:x22" -r":x22hpdfutil.h:x22" *.h +gsar -o -s":x22hpdf_version.h:x22" -r":x22hpdfvers.h:x22" *.h diff --git a/harbour/external/libhpdf/hpdf.h b/harbour/external/libhpdf/hpdf.h index 469928509a..9234625461 100644 --- a/harbour/external/libhpdf/hpdf.h +++ b/harbour/external/libhpdf/hpdf.h @@ -17,8 +17,8 @@ #ifndef _HPDF_H #define _HPDF_H -#include "hpdf_config.h" -#include "hpdf_version.h" +#include "hpdfcfg.h" +#include "hpdfvers.h" #ifdef HPDF_DLL_MAKE # define HPDF_EXPORT(A) __declspec(dllexport) A __stdcall @@ -48,8 +48,8 @@ #define HPDF_EXPORT(A) extern A #endif /* HPDF_EXPORT */ -#include "hpdf_consts.h" -#include "hpdf_types.h" +#include "hpdfcons.h" +#include "hpdftype.h" typedef void *HPDF_HANDLE; typedef HPDF_HANDLE HPDF_Doc; @@ -71,8 +71,8 @@ typedef HPDF_HANDLE HPDF_ExtGState; #define HPDF_EXPORT(A) A #endif /* HPDF_EXPORT */ -#include "hpdf_consts.h" -#include "hpdf_doc.h" +#include "hpdfcons.h" +#include "hpdfdoc.h" #endif /* HPDF_SHARED */ diff --git a/harbour/external/libhpdf/hpdf_annotation.c b/harbour/external/libhpdf/hpdfanno.c similarity index 99% rename from harbour/external/libhpdf/hpdf_annotation.c rename to harbour/external/libhpdf/hpdfanno.c index 9cfa03dc00..4f2a72c2a9 100644 --- a/harbour/external/libhpdf/hpdf_annotation.c +++ b/harbour/external/libhpdf/hpdfanno.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_annotation.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfanno.h" #include "hpdf.h" const static char *HPDF_ANNOT_TYPE_NAMES[] = { diff --git a/harbour/external/libhpdf/hpdf_annotation.h b/harbour/external/libhpdf/hpdfanno.h similarity index 98% rename from harbour/external/libhpdf/hpdf_annotation.h rename to harbour/external/libhpdf/hpdfanno.h index 78446fe5ed..4df131b7ad 100644 --- a/harbour/external/libhpdf/hpdf_annotation.h +++ b/harbour/external/libhpdf/hpdfanno.h @@ -18,7 +18,7 @@ #ifndef _HPDF_ANNOTATION_H #define _HPDF_ANNOTATION_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_array.c b/harbour/external/libhpdf/hpdfarra.c similarity index 99% rename from harbour/external/libhpdf/hpdf_array.c rename to harbour/external/libhpdf/hpdfarra.c index 52d3086ca8..63bf334fcc 100644 --- a/harbour/external/libhpdf/hpdf_array.c +++ b/harbour/external/libhpdf/hpdfarra.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" HPDF_Array HPDF_Array_New (HPDF_MMgr mmgr) diff --git a/harbour/external/libhpdf/hpdf_binary.c b/harbour/external/libhpdf/hpdfbina.c similarity index 97% rename from harbour/external/libhpdf/hpdf_binary.c rename to harbour/external/libhpdf/hpdfbina.c index ed1a715180..58410fdaa8 100644 --- a/harbour/external/libhpdf/hpdf_binary.c +++ b/harbour/external/libhpdf/hpdfbina.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" HPDF_Binary diff --git a/harbour/external/libhpdf/hpdf_boolean.c b/harbour/external/libhpdf/hpdfbool.c similarity index 96% rename from harbour/external/libhpdf/hpdf_boolean.c rename to harbour/external/libhpdf/hpdfbool.c index 28a3a62410..a4af464a23 100644 --- a/harbour/external/libhpdf/hpdf_boolean.c +++ b/harbour/external/libhpdf/hpdfbool.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfutil.h" +#include "hpdfobje.h" HPDF_Boolean HPDF_Boolean_New (HPDF_MMgr mmgr, diff --git a/harbour/external/libhpdf/hpdf_catalog.c b/harbour/external/libhpdf/hpdfcata.c similarity index 98% rename from harbour/external/libhpdf/hpdf_catalog.c rename to harbour/external/libhpdf/hpdfcata.c index 508d0e2b5f..e22688f2ac 100644 --- a/harbour/external/libhpdf/hpdf_catalog.c +++ b/harbour/external/libhpdf/hpdfcata.c @@ -15,10 +15,10 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_catalog.h" -#include "hpdf_pages.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfcata.h" +#include "hpdfpags.h" static const char *HPDF_PAGE_LAYOUT_NAMES[] = { "SinglePage", diff --git a/harbour/external/libhpdf/hpdf_catalog.h b/harbour/external/libhpdf/hpdfcata.h similarity index 98% rename from harbour/external/libhpdf/hpdf_catalog.h rename to harbour/external/libhpdf/hpdfcata.h index 0f6426612f..b071c05c86 100644 --- a/harbour/external/libhpdf/hpdf_catalog.h +++ b/harbour/external/libhpdf/hpdfcata.h @@ -18,7 +18,7 @@ #ifndef _HPDF_CATALOG_H #define _HPDF_CATALOG_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_config.h b/harbour/external/libhpdf/hpdfcfg.h similarity index 100% rename from harbour/external/libhpdf/hpdf_config.h rename to harbour/external/libhpdf/hpdfcfg.h diff --git a/harbour/external/libhpdf/hpdf_conf.h b/harbour/external/libhpdf/hpdfconf.h similarity index 100% rename from harbour/external/libhpdf/hpdf_conf.h rename to harbour/external/libhpdf/hpdfconf.h diff --git a/harbour/external/libhpdf/hpdf_consts.h b/harbour/external/libhpdf/hpdfcons.h similarity index 100% rename from harbour/external/libhpdf/hpdf_consts.h rename to harbour/external/libhpdf/hpdfcons.h diff --git a/harbour/external/libhpdf/hpdf_destination.c b/harbour/external/libhpdf/hpdfdest.c similarity index 99% rename from harbour/external/libhpdf/hpdf_destination.c rename to harbour/external/libhpdf/hpdfdest.c index 187489862a..5e840b3bcc 100644 --- a/harbour/external/libhpdf/hpdf_destination.c +++ b/harbour/external/libhpdf/hpdfdest.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" const char *HPDF_DESTINATION_TYPE_NAMES[] = { diff --git a/harbour/external/libhpdf/hpdf_destination.h b/harbour/external/libhpdf/hpdfdest.h similarity index 97% rename from harbour/external/libhpdf/hpdf_destination.h rename to harbour/external/libhpdf/hpdfdest.h index 18581bf31b..24bccf2674 100644 --- a/harbour/external/libhpdf/hpdf_destination.h +++ b/harbour/external/libhpdf/hpdfdest.h @@ -18,7 +18,7 @@ #ifndef _HPDF_DESTINATION_H #define _HPDF_DESTINATION_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_dict.c b/harbour/external/libhpdf/hpdfdict.c similarity index 99% rename from harbour/external/libhpdf/hpdf_dict.c rename to harbour/external/libhpdf/hpdfdict.c index 2656665976..283aca3add 100644 --- a/harbour/external/libhpdf/hpdf_dict.c +++ b/harbour/external/libhpdf/hpdfdict.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" HPDF_DictElement GetElement (HPDF_Dict dict, diff --git a/harbour/external/libhpdf/hpdf_doc.c b/harbour/external/libhpdf/hpdfdoc.c similarity index 99% rename from harbour/external/libhpdf/hpdf_doc.c rename to harbour/external/libhpdf/hpdfdoc.c index 33d5a5c0ac..31ea6ecb99 100644 --- a/harbour/external/libhpdf/hpdf_doc.c +++ b/harbour/external/libhpdf/hpdfdoc.c @@ -16,12 +16,12 @@ */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_encryptdict.h" -#include "hpdf_destination.h" -#include "hpdf_info.h" -#include "hpdf_page_label.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfency.h" +#include "hpdfdest.h" +#include "hpdfinfo.h" +#include "hpdfpage.h" #include "hpdf.h" diff --git a/harbour/external/libhpdf/hpdf_doc.h b/harbour/external/libhpdf/hpdfdoc.h similarity index 96% rename from harbour/external/libhpdf/hpdf_doc.h rename to harbour/external/libhpdf/hpdfdoc.h index 51e2674f62..e2f618d970 100644 --- a/harbour/external/libhpdf/hpdf_doc.h +++ b/harbour/external/libhpdf/hpdfdoc.h @@ -21,11 +21,11 @@ #define HPDF_SIG_BYTES 0x41504446L -#include "hpdf_catalog.h" -#include "hpdf_image.h" -#include "hpdf_pages.h" -#include "hpdf_outline.h" -#include "hpdf_ext_gstate.h" +#include "hpdfcata.h" +#include "hpdfimag.h" +#include "hpdfpags.h" +#include "hpdfoutl.h" +#include "hpdfextg.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_doc_png.c b/harbour/external/libhpdf/hpdfdocp.c similarity index 98% rename from harbour/external/libhpdf/hpdf_doc_png.c rename to harbour/external/libhpdf/hpdfdocp.c index 53bf85d352..9a8d6364a7 100644 --- a/harbour/external/libhpdf/hpdf_doc_png.c +++ b/harbour/external/libhpdf/hpdfdocp.c @@ -16,10 +16,10 @@ */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" -#include "hpdf_image.h" +#include "hpdfimag.h" static HPDF_Image diff --git a/harbour/external/libhpdf/hpdf_encrypt.c b/harbour/external/libhpdf/hpdfecy.c similarity index 99% rename from harbour/external/libhpdf/hpdf_encrypt.c rename to harbour/external/libhpdf/hpdfecy.c index 064122cd2a..28b5249451 100644 --- a/harbour/external/libhpdf/hpdf_encrypt.c +++ b/harbour/external/libhpdf/hpdfecy.c @@ -36,10 +36,10 @@ * *---------------------------------------------------------------------------*/ -#include "hpdf_conf.h" -#include "hpdf_consts.h" -#include "hpdf_utils.h" -#include "hpdf_encrypt.h" +#include "hpdfconf.h" +#include "hpdfcons.h" +#include "hpdfutil.h" +#include "hpdfencr.h" static const HPDF_BYTE HPDF_PADDING_STRING[] = { 0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, diff --git a/harbour/external/libhpdf/hpdf_encryptdict.c b/harbour/external/libhpdf/hpdfecyd.c similarity index 98% rename from harbour/external/libhpdf/hpdf_encryptdict.c rename to harbour/external/libhpdf/hpdfecyd.c index cd2606ff46..cb0881ae4f 100644 --- a/harbour/external/libhpdf/hpdf_encryptdict.c +++ b/harbour/external/libhpdf/hpdfecyd.c @@ -16,11 +16,11 @@ */ #include -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" -#include "hpdf_encryptdict.h" -#include "hpdf_info.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" +#include "hpdfency.h" +#include "hpdfinfo.h" HPDF_EncryptDict HPDF_EncryptDict_New (HPDF_MMgr mmgr, diff --git a/harbour/external/libhpdf/hpdf_encoder_cns.c b/harbour/external/libhpdf/hpdfencc.c similarity index 99% rename from harbour/external/libhpdf/hpdf_encoder_cns.c rename to harbour/external/libhpdf/hpdfencc.c index acf0ebbca1..41a9eeb3df 100644 --- a/harbour/external/libhpdf/hpdf_encoder_cns.c +++ b/harbour/external/libhpdf/hpdfencc.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_encoder.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfenco.h" #include "hpdf.h" static const HPDF_UnicodeMap_Rec CP936_UNICODE_ARRAY[] = { diff --git a/harbour/external/libhpdf/hpdf_encoder_jp.c b/harbour/external/libhpdf/hpdfencj.c similarity index 99% rename from harbour/external/libhpdf/hpdf_encoder_jp.c rename to harbour/external/libhpdf/hpdfencj.c index 653bb973c5..e1aec776d0 100644 --- a/harbour/external/libhpdf/hpdf_encoder_jp.c +++ b/harbour/external/libhpdf/hpdfencj.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_encoder.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfenco.h" #include "hpdf.h" static const HPDF_UnicodeMap_Rec CP932_UNICODE_ARRAY[] = { diff --git a/harbour/external/libhpdf/hpdf_encoder_kr.c b/harbour/external/libhpdf/hpdfenck.c similarity index 99% rename from harbour/external/libhpdf/hpdf_encoder_kr.c rename to harbour/external/libhpdf/hpdfenck.c index b6d9dd01b0..c3f7d98aa5 100644 --- a/harbour/external/libhpdf/hpdf_encoder_kr.c +++ b/harbour/external/libhpdf/hpdfenck.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_encoder.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfenco.h" #include "hpdf.h" static const HPDF_UnicodeMap_Rec CP949_UNICODE_ARRAY[] = { diff --git a/harbour/external/libhpdf/hpdf_encoder_cnt.c b/harbour/external/libhpdf/hpdfencn.c similarity index 99% rename from harbour/external/libhpdf/hpdf_encoder_cnt.c rename to harbour/external/libhpdf/hpdfencn.c index 66ef8abb3c..58d386baba 100644 --- a/harbour/external/libhpdf/hpdf_encoder_cnt.c +++ b/harbour/external/libhpdf/hpdfencn.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_encoder.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfenco.h" #include "hpdf.h" static const HPDF_UnicodeMap_Rec CP950_UNICODE_ARRAY[] = { diff --git a/harbour/external/libhpdf/hpdf_encoder.c b/harbour/external/libhpdf/hpdfenco.c similarity index 99% rename from harbour/external/libhpdf/hpdf_encoder.c rename to harbour/external/libhpdf/hpdfenco.c index 789b0e9d17..c82a57dc59 100644 --- a/harbour/external/libhpdf/hpdf_encoder.c +++ b/harbour/external/libhpdf/hpdfenco.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_encoder.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfenco.h" #include "hpdf.h" typedef struct _HPDF_UnicodeGryphPair { diff --git a/harbour/external/libhpdf/hpdf_encoder.h b/harbour/external/libhpdf/hpdfenco.h similarity index 99% rename from harbour/external/libhpdf/hpdf_encoder.h rename to harbour/external/libhpdf/hpdfenco.h index 82cd900db5..09d47eec3d 100644 --- a/harbour/external/libhpdf/hpdf_encoder.h +++ b/harbour/external/libhpdf/hpdfenco.h @@ -18,8 +18,8 @@ #ifndef _HPDF_ENCODER_H #define _HPDF_ENCODER_H -#include "hpdf_consts.h" -#include "hpdf_streams.h" +#include "hpdfcons.h" +#include "hpdfstre.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_encrypt.h b/harbour/external/libhpdf/hpdfencr.h similarity index 99% rename from harbour/external/libhpdf/hpdf_encrypt.h rename to harbour/external/libhpdf/hpdfencr.h index 377c287900..49d46bec8b 100644 --- a/harbour/external/libhpdf/hpdf_encrypt.h +++ b/harbour/external/libhpdf/hpdfencr.h @@ -39,7 +39,7 @@ #ifndef HPDF_ENCRYPT_H #define HPDF_ENCRYPT_H -#include "hpdf_mmgr.h" +#include "hpdfmmgr.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_encryptdict.h b/harbour/external/libhpdf/hpdfency.h similarity index 98% rename from harbour/external/libhpdf/hpdf_encryptdict.h rename to harbour/external/libhpdf/hpdfency.h index 392222703f..3562d638d7 100644 --- a/harbour/external/libhpdf/hpdf_encryptdict.h +++ b/harbour/external/libhpdf/hpdfency.h @@ -18,7 +18,7 @@ #ifndef _HPDF_ENCRYPTDICT_H #define _HPDF_ENCRYPTDICT_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_error.c b/harbour/external/libhpdf/hpdferro.c similarity index 96% rename from harbour/external/libhpdf/hpdf_error.c rename to harbour/external/libhpdf/hpdferro.c index 0496282bb0..7ad7679826 100644 --- a/harbour/external/libhpdf/hpdf_error.c +++ b/harbour/external/libhpdf/hpdferro.c @@ -15,10 +15,10 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_error.h" -#include "hpdf_consts.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdferro.h" +#include "hpdfcons.h" #ifndef HPDF_STDCALL #ifdef HPDF_DLL_MAKE diff --git a/harbour/external/libhpdf/hpdf_error.h b/harbour/external/libhpdf/hpdferro.h similarity index 99% rename from harbour/external/libhpdf/hpdf_error.h rename to harbour/external/libhpdf/hpdferro.h index 5112277255..d88bb5d225 100644 --- a/harbour/external/libhpdf/hpdf_error.h +++ b/harbour/external/libhpdf/hpdferro.h @@ -18,7 +18,7 @@ #ifndef _HPDF_ERROR_H #define _HPDF_ERROR_H -#include "hpdf_types.h" +#include "hpdftype.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_ext_gstate.c b/harbour/external/libhpdf/hpdfextg.c similarity index 98% rename from harbour/external/libhpdf/hpdf_ext_gstate.c rename to harbour/external/libhpdf/hpdfextg.c index df3d8f6ade..773c56011f 100644 --- a/harbour/external/libhpdf/hpdf_ext_gstate.c +++ b/harbour/external/libhpdf/hpdfextg.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_ext_gstate.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfextg.h" #include "hpdf.h" const static char *HPDF_BM_NAMES[] = { diff --git a/harbour/external/libhpdf/hpdf_ext_gstate.h b/harbour/external/libhpdf/hpdfextg.h similarity index 97% rename from harbour/external/libhpdf/hpdf_ext_gstate.h rename to harbour/external/libhpdf/hpdfextg.h index 92f4d52139..ef4ff4838e 100644 --- a/harbour/external/libhpdf/hpdf_ext_gstate.h +++ b/harbour/external/libhpdf/hpdfextg.h @@ -18,7 +18,7 @@ #ifndef _HPDF_EXT_GSTATE_H #define _HPDF_EXT_GSTATE_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_fontdef.c b/harbour/external/libhpdf/hpdffdf.c similarity index 94% rename from harbour/external/libhpdf/hpdf_fontdef.c rename to harbour/external/libhpdf/hpdffdf.c index c6ed9188b4..374bffab4f 100644 --- a/harbour/external/libhpdf/hpdf_fontdef.c +++ b/harbour/external/libhpdf/hpdffdf.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_fontdef.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdffond.h" void HPDF_FontDef_Cleanup (HPDF_FontDef fontdef) diff --git a/harbour/external/libhpdf/hpdf_fontdef_type1.c b/harbour/external/libhpdf/hpdffdf1.c similarity index 99% rename from harbour/external/libhpdf/hpdf_fontdef_type1.c rename to harbour/external/libhpdf/hpdffdf1.c index 302184b2b4..194ec2f6be 100644 --- a/harbour/external/libhpdf/hpdf_fontdef_type1.c +++ b/harbour/external/libhpdf/hpdffdf1.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_fontdef.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdffond.h" static void FreeWidth (HPDF_FontDef fontdef); diff --git a/harbour/external/libhpdf/hpdf_fontdef_base14.c b/harbour/external/libhpdf/hpdffdfb.c similarity index 99% rename from harbour/external/libhpdf/hpdf_fontdef_base14.c rename to harbour/external/libhpdf/hpdffdfb.c index f8b83d40bd..631833df1d 100644 --- a/harbour/external/libhpdf/hpdf_fontdef_base14.c +++ b/harbour/external/libhpdf/hpdffdfb.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_fontdef.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdffond.h" static const HPDF_CharData CHAR_DATA_COURIER[316] = { {32, 0x0020, 600}, diff --git a/harbour/external/libhpdf/hpdf_fontdef_cns.c b/harbour/external/libhpdf/hpdffdfc.c similarity index 99% rename from harbour/external/libhpdf/hpdf_fontdef_cns.c rename to harbour/external/libhpdf/hpdffdfc.c index 6fcd8f6ebe..3abe415867 100644 --- a/harbour/external/libhpdf/hpdf_fontdef_cns.c +++ b/harbour/external/libhpdf/hpdffdfc.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" /*----------------------------------------------------------------------------*/ diff --git a/harbour/external/libhpdf/hpdf_fontdef_cid.c b/harbour/external/libhpdf/hpdffdfi.c similarity index 98% rename from harbour/external/libhpdf/hpdf_fontdef_cid.c rename to harbour/external/libhpdf/hpdffdfi.c index 0d169bc7c0..6abd07925f 100644 --- a/harbour/external/libhpdf/hpdf_fontdef_cid.c +++ b/harbour/external/libhpdf/hpdffdfi.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_fontdef.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdffond.h" void HPDF_CIDFontDef_FreeWidth (HPDF_FontDef fontdef); diff --git a/harbour/external/libhpdf/hpdf_fontdef_jp.c b/harbour/external/libhpdf/hpdffdfj.c similarity index 99% rename from harbour/external/libhpdf/hpdf_fontdef_jp.c rename to harbour/external/libhpdf/hpdffdfj.c index dcf2bdd770..a1cac16553 100644 --- a/harbour/external/libhpdf/hpdf_fontdef_jp.c +++ b/harbour/external/libhpdf/hpdffdfj.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" /*----------------------------------------------------------------------------*/ diff --git a/harbour/external/libhpdf/hpdf_fontdef_kr.c b/harbour/external/libhpdf/hpdffdfk.c similarity index 99% rename from harbour/external/libhpdf/hpdf_fontdef_kr.c rename to harbour/external/libhpdf/hpdffdfk.c index 19158d6ace..8f54db7176 100644 --- a/harbour/external/libhpdf/hpdf_fontdef_kr.c +++ b/harbour/external/libhpdf/hpdffdfk.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" /*----------------------------------------------------------------------------*/ diff --git a/harbour/external/libhpdf/hpdf_fontdef_cnt.c b/harbour/external/libhpdf/hpdffdfn.c similarity index 99% rename from harbour/external/libhpdf/hpdf_fontdef_cnt.c rename to harbour/external/libhpdf/hpdffdfn.c index 01f160d4bb..df165e4067 100644 --- a/harbour/external/libhpdf/hpdf_fontdef_cnt.c +++ b/harbour/external/libhpdf/hpdffdfn.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" /*----------------------------------------------------------------------------*/ diff --git a/harbour/external/libhpdf/hpdf_fontdef_tt.c b/harbour/external/libhpdf/hpdffdft.c similarity index 99% rename from harbour/external/libhpdf/hpdf_fontdef_tt.c rename to harbour/external/libhpdf/hpdffdft.c index f5d24c72b5..0f98482ddf 100644 --- a/harbour/external/libhpdf/hpdf_fontdef_tt.c +++ b/harbour/external/libhpdf/hpdffdft.c @@ -16,9 +16,9 @@ * 2006.08.24 fixed for composite glyph description. */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_fontdef.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdffond.h" #define HPDF_TTF_MAX_MEM_SIZ 10000 diff --git a/harbour/external/libhpdf/hpdf_font_type1.c b/harbour/external/libhpdf/hpdffon1.c similarity index 99% rename from harbour/external/libhpdf/hpdf_font_type1.c rename to harbour/external/libhpdf/hpdffon1.c index abf6757845..7b9147f310 100644 --- a/harbour/external/libhpdf/hpdf_font_type1.c +++ b/harbour/external/libhpdf/hpdffon1.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_font.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdffont.h" static HPDF_STATUS Type1Font_OnWrite (HPDF_Dict obj, diff --git a/harbour/external/libhpdf/hpdf_font_cid.c b/harbour/external/libhpdf/hpdffonc.c similarity index 99% rename from harbour/external/libhpdf/hpdf_font_cid.c rename to harbour/external/libhpdf/hpdffonc.c index fd3a45759f..66d6af7b75 100644 --- a/harbour/external/libhpdf/hpdf_font_cid.c +++ b/harbour/external/libhpdf/hpdffonc.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_font.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdffont.h" static HPDF_Font CIDFontType0_New (HPDF_Font parent, diff --git a/harbour/external/libhpdf/hpdf_fontdef.h b/harbour/external/libhpdf/hpdffond.h similarity index 99% rename from harbour/external/libhpdf/hpdf_fontdef.h rename to harbour/external/libhpdf/hpdffond.h index 14da6bde80..48fccb6d04 100644 --- a/harbour/external/libhpdf/hpdf_fontdef.h +++ b/harbour/external/libhpdf/hpdffond.h @@ -18,7 +18,7 @@ #ifndef _HPDF_FONTDEF_H #define _HPDF_FONTDEF_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_font.c b/harbour/external/libhpdf/hpdffont.c similarity index 99% rename from harbour/external/libhpdf/hpdf_font.c rename to harbour/external/libhpdf/hpdffont.c index 10716035bd..3c60f01400 100644 --- a/harbour/external/libhpdf/hpdf_font.c +++ b/harbour/external/libhpdf/hpdffont.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" diff --git a/harbour/external/libhpdf/hpdf_font.h b/harbour/external/libhpdf/hpdffont.h similarity index 99% rename from harbour/external/libhpdf/hpdf_font.h rename to harbour/external/libhpdf/hpdffont.h index 9db4c88a7f..b0693efa8e 100644 --- a/harbour/external/libhpdf/hpdf_font.h +++ b/harbour/external/libhpdf/hpdffont.h @@ -18,7 +18,7 @@ #ifndef _HPDF_FONT_H #define _HPDF_FONT_H -#include "hpdf_fontdef.h" +#include "hpdffond.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_font_tt.c b/harbour/external/libhpdf/hpdffott.c similarity index 99% rename from harbour/external/libhpdf/hpdf_font_tt.c rename to harbour/external/libhpdf/hpdffott.c index 01c8a1245d..58410bd509 100644 --- a/harbour/external/libhpdf/hpdf_font_tt.c +++ b/harbour/external/libhpdf/hpdffott.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_font.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdffont.h" static HPDF_STATUS OnWrite (HPDF_Dict obj, diff --git a/harbour/external/libhpdf/hpdf_gstate.c b/harbour/external/libhpdf/hpdfgsta.c similarity index 98% rename from harbour/external/libhpdf/hpdf_gstate.c rename to harbour/external/libhpdf/hpdfgsta.c index 42089e5ba4..b06cdc4374 100644 --- a/harbour/external/libhpdf/hpdf_gstate.c +++ b/harbour/external/libhpdf/hpdfgsta.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_gstate.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfgsta.h" HPDF_GState HPDF_GState_New (HPDF_MMgr mmgr, diff --git a/harbour/external/libhpdf/hpdf_gstate.h b/harbour/external/libhpdf/hpdfgsta.h similarity index 99% rename from harbour/external/libhpdf/hpdf_gstate.h rename to harbour/external/libhpdf/hpdfgsta.h index ac75a99ef5..39770bcb11 100644 --- a/harbour/external/libhpdf/hpdf_gstate.h +++ b/harbour/external/libhpdf/hpdfgsta.h @@ -18,7 +18,7 @@ #ifndef _HPDF_GSTATE_H #define _HPDF_GSTATE_H -#include "hpdf_font.h" +#include "hpdffont.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_image.c b/harbour/external/libhpdf/hpdfimag.c similarity index 99% rename from harbour/external/libhpdf/hpdf_image.c rename to harbour/external/libhpdf/hpdfimag.c index ccd02034ba..7a4f3ad373 100644 --- a/harbour/external/libhpdf/hpdf_image.c +++ b/harbour/external/libhpdf/hpdfimag.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" static const char *COL_CMYK = "DeviceCMYK"; diff --git a/harbour/external/libhpdf/hpdf_image.h b/harbour/external/libhpdf/hpdfimag.h similarity index 98% rename from harbour/external/libhpdf/hpdf_image.h rename to harbour/external/libhpdf/hpdfimag.h index 103231505e..a2cb671965 100644 --- a/harbour/external/libhpdf/hpdf_image.h +++ b/harbour/external/libhpdf/hpdfimag.h @@ -18,7 +18,7 @@ #ifndef _HPDF_IMAGE_H #define _HPDF_IMAGE_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_image_png.c b/harbour/external/libhpdf/hpdfimap.c similarity index 99% rename from harbour/external/libhpdf/hpdf_image_png.c rename to harbour/external/libhpdf/hpdfimap.c index d86354bb35..aa6abb99b2 100644 --- a/harbour/external/libhpdf/hpdf_image_png.c +++ b/harbour/external/libhpdf/hpdfimap.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_image.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfimag.h" #ifndef HPDF_NOPNGLIB #include diff --git a/harbour/external/libhpdf/hpdf_info.c b/harbour/external/libhpdf/hpdfinfo.c similarity index 98% rename from harbour/external/libhpdf/hpdf_info.c rename to harbour/external/libhpdf/hpdfinfo.c index 429d7e23e7..a58c2883f7 100644 --- a/harbour/external/libhpdf/hpdf_info.c +++ b/harbour/external/libhpdf/hpdfinfo.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_info.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfinfo.h" static const char *HPDF_INFO_ATTR_NAMES[] = { "CreationDate", diff --git a/harbour/external/libhpdf/hpdf_info.h b/harbour/external/libhpdf/hpdfinfo.h similarity index 97% rename from harbour/external/libhpdf/hpdf_info.h rename to harbour/external/libhpdf/hpdfinfo.h index eba8459d35..ca965d6973 100644 --- a/harbour/external/libhpdf/hpdf_info.h +++ b/harbour/external/libhpdf/hpdfinfo.h @@ -19,7 +19,7 @@ #ifndef _HPDF_INFO_H #define _HPDF_INFO_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_list.c b/harbour/external/libhpdf/hpdflist.c similarity index 98% rename from harbour/external/libhpdf/hpdf_list.c rename to harbour/external/libhpdf/hpdflist.c index da7fa75dc7..af7ccb522f 100644 --- a/harbour/external/libhpdf/hpdf_list.c +++ b/harbour/external/libhpdf/hpdflist.c @@ -15,10 +15,10 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_consts.h" -#include "hpdf_list.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfcons.h" +#include "hpdflist.h" static HPDF_STATUS Resize (HPDF_List list, diff --git a/harbour/external/libhpdf/hpdf_list.h b/harbour/external/libhpdf/hpdflist.h similarity index 97% rename from harbour/external/libhpdf/hpdf_list.h rename to harbour/external/libhpdf/hpdflist.h index 8e0539bb84..dd359e66b2 100644 --- a/harbour/external/libhpdf/hpdf_list.h +++ b/harbour/external/libhpdf/hpdflist.h @@ -18,8 +18,8 @@ #ifndef _HPDF_LIST_H #define _HPDF_LIST_H -#include "hpdf_error.h" -#include "hpdf_mmgr.h" +#include "hpdferro.h" +#include "hpdfmmgr.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_mmgr.c b/harbour/external/libhpdf/hpdfmmgr.c similarity index 98% rename from harbour/external/libhpdf/hpdf_mmgr.c rename to harbour/external/libhpdf/hpdfmmgr.c index 718aaf300d..710c8994ee 100644 --- a/harbour/external/libhpdf/hpdf_mmgr.c +++ b/harbour/external/libhpdf/hpdfmmgr.c @@ -15,10 +15,10 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_consts.h" -#include "hpdf_mmgr.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfcons.h" +#include "hpdfmmgr.h" +#include "hpdfutil.h" #ifndef HPDF_STDCALL #ifdef HPDF_DLL_MAKE diff --git a/harbour/external/libhpdf/hpdf_mmgr.h b/harbour/external/libhpdf/hpdfmmgr.h similarity index 97% rename from harbour/external/libhpdf/hpdf_mmgr.h rename to harbour/external/libhpdf/hpdfmmgr.h index 967d32523c..b37d914a76 100644 --- a/harbour/external/libhpdf/hpdf_mmgr.h +++ b/harbour/external/libhpdf/hpdfmmgr.h @@ -18,8 +18,8 @@ #ifndef _HPDF_MMGR_H #define _HPDF_MMGR_H -#include "hpdf_types.h" -#include "hpdf_error.h" +#include "hpdftype.h" +#include "hpdferro.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_name.c b/harbour/external/libhpdf/hpdfname.c similarity index 96% rename from harbour/external/libhpdf/hpdf_name.c rename to harbour/external/libhpdf/hpdfname.c index 7479e0edca..b2e5e868ec 100644 --- a/harbour/external/libhpdf/hpdf_name.c +++ b/harbour/external/libhpdf/hpdfname.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" HPDF_Name diff --git a/harbour/external/libhpdf/hpdf_null.c b/harbour/external/libhpdf/hpdfnull.c similarity index 94% rename from harbour/external/libhpdf/hpdf_null.c rename to harbour/external/libhpdf/hpdfnull.c index 2bc764a5dc..09ad8272fb 100644 --- a/harbour/external/libhpdf/hpdf_null.c +++ b/harbour/external/libhpdf/hpdfnull.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfutil.h" +#include "hpdfobje.h" HPDF_Null diff --git a/harbour/external/libhpdf/hpdf_number.c b/harbour/external/libhpdf/hpdfnumb.c similarity index 96% rename from harbour/external/libhpdf/hpdf_number.c rename to harbour/external/libhpdf/hpdfnumb.c index fbd97318aa..8933bf5b47 100644 --- a/harbour/external/libhpdf/hpdf_number.c +++ b/harbour/external/libhpdf/hpdfnumb.c @@ -15,8 +15,8 @@ * */ -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfutil.h" +#include "hpdfobje.h" HPDF_Number diff --git a/harbour/external/libhpdf/hpdf_objects.c b/harbour/external/libhpdf/hpdfobje.c similarity index 98% rename from harbour/external/libhpdf/hpdf_objects.c rename to harbour/external/libhpdf/hpdfobje.c index 0ac6f403f6..73a5f1a813 100644 --- a/harbour/external/libhpdf/hpdf_objects.c +++ b/harbour/external/libhpdf/hpdfobje.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" void HPDF_Obj_Free (HPDF_MMgr mmgr, diff --git a/harbour/external/libhpdf/hpdf_objects.h b/harbour/external/libhpdf/hpdfobje.h similarity index 99% rename from harbour/external/libhpdf/hpdf_objects.h rename to harbour/external/libhpdf/hpdfobje.h index 2986e4eb8b..a69924e274 100644 --- a/harbour/external/libhpdf/hpdf_objects.h +++ b/harbour/external/libhpdf/hpdfobje.h @@ -18,7 +18,7 @@ #ifndef _HPDF_OBJECTS_H #define _HPDF_OBJECTS_H -#include "hpdf_encoder.h" +#include "hpdfenco.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_outline.c b/harbour/external/libhpdf/hpdfoutl.c similarity index 99% rename from harbour/external/libhpdf/hpdf_outline.c rename to harbour/external/libhpdf/hpdfoutl.c index 9226120b60..4e7514006f 100644 --- a/harbour/external/libhpdf/hpdf_outline.c +++ b/harbour/external/libhpdf/hpdfoutl.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_destination.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfdest.h" #include "hpdf.h" #define HPDF_OUTLINE_CLOSED 0 diff --git a/harbour/external/libhpdf/hpdf_outline.h b/harbour/external/libhpdf/hpdfoutl.h similarity index 98% rename from harbour/external/libhpdf/hpdf_outline.h rename to harbour/external/libhpdf/hpdfoutl.h index 1598c31205..06facd9dd6 100644 --- a/harbour/external/libhpdf/hpdf_outline.h +++ b/harbour/external/libhpdf/hpdfoutl.h @@ -18,7 +18,7 @@ #ifndef _HPDF_OUTLINE_H #define _HPDF_OUTLINE_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_page_label.c b/harbour/external/libhpdf/hpdfpage.c similarity index 96% rename from harbour/external/libhpdf/hpdf_page_label.c rename to harbour/external/libhpdf/hpdfpage.c index 9cbd8c754a..2cff8a9b46 100644 --- a/harbour/external/libhpdf/hpdf_page_label.c +++ b/harbour/external/libhpdf/hpdfpage.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_page_label.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfpage.h" HPDF_Dict HPDF_PageLabel_New (HPDF_Doc pdf, diff --git a/harbour/external/libhpdf/hpdf_page_label.h b/harbour/external/libhpdf/hpdfpage.h similarity index 100% rename from harbour/external/libhpdf/hpdf_page_label.h rename to harbour/external/libhpdf/hpdfpage.h diff --git a/harbour/external/libhpdf/hpdf_page_operator.c b/harbour/external/libhpdf/hpdfpago.c similarity index 99% rename from harbour/external/libhpdf/hpdf_page_operator.c rename to harbour/external/libhpdf/hpdfpago.c index b51bbb0a7d..1a4e8dfec4 100644 --- a/harbour/external/libhpdf/hpdf_page_operator.c +++ b/harbour/external/libhpdf/hpdfpago.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_pages.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfpags.h" #include "hpdf.h" static const HPDF_Point INIT_POS = {0, 0}; diff --git a/harbour/external/libhpdf/hpdf_pages.c b/harbour/external/libhpdf/hpdfpags.c similarity index 99% rename from harbour/external/libhpdf/hpdf_pages.c rename to harbour/external/libhpdf/hpdfpags.c index 15e0c235dc..2874419e59 100644 --- a/harbour/external/libhpdf/hpdf_pages.c +++ b/harbour/external/libhpdf/hpdfpags.c @@ -15,11 +15,11 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" -#include "hpdf_annotation.h" -#include "hpdf_destination.h" +#include "hpdfanno.h" +#include "hpdfdest.h" /*----------------------------------------------------------------------------*/ diff --git a/harbour/external/libhpdf/hpdf_pages.h b/harbour/external/libhpdf/hpdfpags.h similarity index 98% rename from harbour/external/libhpdf/hpdf_pages.h rename to harbour/external/libhpdf/hpdfpags.h index 3efcb22a85..7cac25ebce 100644 --- a/harbour/external/libhpdf/hpdf_pages.h +++ b/harbour/external/libhpdf/hpdfpags.h @@ -18,8 +18,8 @@ #ifndef _HPDF_PAGES_H #define _HPDF_PAGES_H -#include "hpdf_gstate.h" -#include "hpdf_ext_gstate.h" +#include "hpdfgsta.h" +#include "hpdfextg.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_real.c b/harbour/external/libhpdf/hpdfreal.c similarity index 95% rename from harbour/external/libhpdf/hpdf_real.c rename to harbour/external/libhpdf/hpdfreal.c index d90e1b7cac..bc3eae82d7 100644 --- a/harbour/external/libhpdf/hpdf_real.c +++ b/harbour/external/libhpdf/hpdfreal.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" HPDF_Real diff --git a/harbour/external/libhpdf/hpdf_streams.c b/harbour/external/libhpdf/hpdfstre.c similarity index 99% rename from harbour/external/libhpdf/hpdf_streams.c rename to harbour/external/libhpdf/hpdfstre.c index 2a0f662ceb..48f7cbe02d 100644 --- a/harbour/external/libhpdf/hpdf_streams.c +++ b/harbour/external/libhpdf/hpdfstre.c @@ -22,10 +22,10 @@ #include #endif /* HPDF_NOZLIB */ -#include "hpdf_conf.h" -#include "hpdf_consts.h" -#include "hpdf_utils.h" -#include "hpdf_streams.h" +#include "hpdfconf.h" +#include "hpdfcons.h" +#include "hpdfutil.h" +#include "hpdfstre.h" HPDF_STATUS HPDF_MemStream_WriteFunc (HPDF_Stream stream, diff --git a/harbour/external/libhpdf/hpdf_streams.h b/harbour/external/libhpdf/hpdfstre.h similarity index 99% rename from harbour/external/libhpdf/hpdf_streams.h rename to harbour/external/libhpdf/hpdfstre.h index de7d1e9e0e..8d282eef58 100644 --- a/harbour/external/libhpdf/hpdf_streams.h +++ b/harbour/external/libhpdf/hpdfstre.h @@ -20,8 +20,8 @@ #ifndef _HPDF_STREAMS_H #define _HPDF_STREAMS_H -#include "hpdf_list.h" -#include "hpdf_encrypt.h" +#include "hpdflist.h" +#include "hpdfencr.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_string.c b/harbour/external/libhpdf/hpdfstri.c similarity index 98% rename from harbour/external/libhpdf/hpdf_string.c rename to harbour/external/libhpdf/hpdfstri.c index 8951d12fa4..13990b61e5 100644 --- a/harbour/external/libhpdf/hpdf_string.c +++ b/harbour/external/libhpdf/hpdfstri.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" static const HPDF_BYTE UNICODE_HEADER[] = { 0xFE, 0xFF diff --git a/harbour/external/libhpdf/hpdf_types.h b/harbour/external/libhpdf/hpdftype.h similarity index 100% rename from harbour/external/libhpdf/hpdf_types.h rename to harbour/external/libhpdf/hpdftype.h diff --git a/harbour/external/libhpdf/hpdf_u3d.c b/harbour/external/libhpdf/hpdfu3d.c similarity index 99% rename from harbour/external/libhpdf/hpdf_u3d.c rename to harbour/external/libhpdf/hpdfu3d.c index 7cc068ac8a..c23a5e4890 100644 --- a/harbour/external/libhpdf/hpdf_u3d.c +++ b/harbour/external/libhpdf/hpdfu3d.c @@ -14,8 +14,8 @@ * It is provided "as is" without express or implied warranty. * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" +#include "hpdfconf.h" +#include "hpdfutil.h" #include "hpdf.h" #include diff --git a/harbour/external/libhpdf/hpdf_u3d.h b/harbour/external/libhpdf/hpdfu3d.h similarity index 98% rename from harbour/external/libhpdf/hpdf_u3d.h rename to harbour/external/libhpdf/hpdfu3d.h index b676b8a6bf..9da25d3700 100644 --- a/harbour/external/libhpdf/hpdf_u3d.h +++ b/harbour/external/libhpdf/hpdfu3d.h @@ -18,7 +18,7 @@ #ifndef _HPDF_U3D_H #define _HPDF_U3D_H -#include "hpdf_objects.h" +#include "hpdfobje.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_utils.c b/harbour/external/libhpdf/hpdfutil.c similarity index 99% rename from harbour/external/libhpdf/hpdf_utils.c rename to harbour/external/libhpdf/hpdfutil.c index 29114a348f..ca76c952d6 100644 --- a/harbour/external/libhpdf/hpdf_utils.c +++ b/harbour/external/libhpdf/hpdfutil.c @@ -16,8 +16,8 @@ */ #include -#include "hpdf_utils.h" -#include "hpdf_consts.h" +#include "hpdfutil.h" +#include "hpdfcons.h" /*---------------------------------------------------------------------------*/ diff --git a/harbour/external/libhpdf/hpdf_utils.h b/harbour/external/libhpdf/hpdfutil.h similarity index 98% rename from harbour/external/libhpdf/hpdf_utils.h rename to harbour/external/libhpdf/hpdfutil.h index 5cb79c9108..06277b4e8a 100644 --- a/harbour/external/libhpdf/hpdf_utils.h +++ b/harbour/external/libhpdf/hpdfutil.h @@ -18,8 +18,8 @@ #ifndef _HPDF_UTILS_H #define _HPDF_UTILS_H -#include "hpdf_config.h" -#include "hpdf_types.h" +#include "hpdfcfg.h" +#include "hpdftype.h" #ifdef __cplusplus extern "C" { diff --git a/harbour/external/libhpdf/hpdf_version.h b/harbour/external/libhpdf/hpdfvers.h similarity index 100% rename from harbour/external/libhpdf/hpdf_version.h rename to harbour/external/libhpdf/hpdfvers.h diff --git a/harbour/external/libhpdf/hpdf_xref.c b/harbour/external/libhpdf/hpdfxref.c similarity index 99% rename from harbour/external/libhpdf/hpdf_xref.c rename to harbour/external/libhpdf/hpdfxref.c index 323da109aa..efc2fce4fc 100644 --- a/harbour/external/libhpdf/hpdf_xref.c +++ b/harbour/external/libhpdf/hpdfxref.c @@ -15,9 +15,9 @@ * */ -#include "hpdf_conf.h" -#include "hpdf_utils.h" -#include "hpdf_objects.h" +#include "hpdfconf.h" +#include "hpdfutil.h" +#include "hpdfobje.h" static HPDF_STATUS WriteTrailer (HPDF_Xref xref, diff --git a/harbour/source/hbpcre/cnv_hb2o.bat b/harbour/source/hbpcre/cnv_hb2o.bat index 9a6bee94d5..7be1f7a925 100644 --- a/harbour/source/hbpcre/cnv_hb2o.bat +++ b/harbour/source/hbpcre/cnv_hb2o.bat @@ -5,11 +5,11 @@ rem rem Tested with PCRE 7.7 -rem NOTE: Purpose of this script is to take the PCRE files +rem NOTE: Purpose of this script is to take the source files rem in Harbour repo and convert them back to the filenames -rem used in the original PCRE source distribution. +rem used in the original source distribution. rem This is to aid finding local modifications and -rem apply them after a PCRE source update. +rem apply them after an original source update. rem [vszakats] rem rem This tool uses 'GNU gsar' for search and replace. diff --git a/harbour/source/hbpcre/cnv_o2hb.bat b/harbour/source/hbpcre/cnv_o2hb.bat index c5a4193882..0ecc4a5007 100644 --- a/harbour/source/hbpcre/cnv_o2hb.bat +++ b/harbour/source/hbpcre/cnv_o2hb.bat @@ -6,9 +6,9 @@ rem rem Tested with PCRE 7.7 rem NOTE: Purpose of this script is to take the original -rem PCRE file from its source distribution and convert +rem files from its source distribution and convert rem them to the short filenames we use here in Harbour. -rem Short filenames are needed for full DJGPP support. +rem Short filenames are needed for dos compiler support. rem Some other automated modifications are also done rem to help compiling the sources "as-is", to try to rem avoid any manual editing on these foreign sources. @@ -33,7 +33,7 @@ copy ori_src\pcre_dfa_exec.c pcredfa.c copy ori_src\pcre_exec.c pcreexec.c copy ori_src\pcre_fullinfo.c pcrefinf.c copy ori_src\pcre_get.c pcreget.c -copy ori_dst\pcre_globals.c pcreglob.c +copy ori_src\pcre_globals.c pcreglob.c copy ori_src\pcre_info.c pcreinfo.c copy ori_src\pcre_maketables.c pcremktb.c copy ori_src\pcre_newline.c pcrenewl.c