From cecbb5fb079fd193aa76539ca5f046b65d07c6cf Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Mon, 19 Jan 2004 21:53:54 +0000 Subject: [PATCH] Fix some warnings. Prepare to package future PDF Writer print driver as OBOS package: openbeos-pdf_writer-cvs... git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6154 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/print/drivers/pdf/Jamfile | 6 ++++++ src/add-ons/print/drivers/pdf/bookmarks/Jamfile | 5 +++++ src/add-ons/print/drivers/pdf/encoding/Jamfile | 6 ++++++ .../print/drivers/pdf/source/AdvancedSettingsWindow.cpp | 2 +- src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp | 6 +++--- src/add-ons/print/drivers/pdf/source/Jamfile | 6 +++++- src/add-ons/print/drivers/pdf/source/PDFWriter.cpp | 7 +++---- src/add-ons/print/drivers/pdf/xrefs/Jamfile | 5 +++++ 8 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 src/add-ons/print/drivers/pdf/bookmarks/Jamfile create mode 100644 src/add-ons/print/drivers/pdf/encoding/Jamfile create mode 100644 src/add-ons/print/drivers/pdf/xrefs/Jamfile diff --git a/src/add-ons/print/drivers/pdf/Jamfile b/src/add-ons/print/drivers/pdf/Jamfile index 782b0d70c1..d1241bf90a 100644 --- a/src/add-ons/print/drivers/pdf/Jamfile +++ b/src/add-ons/print/drivers/pdf/Jamfile @@ -1,3 +1,9 @@ SubDir OBOS_TOP src add-ons print drivers pdf ; SubInclude OBOS_TOP src add-ons print drivers pdf source ; +SubInclude OBOS_TOP src add-ons print drivers pdf bookmarks ; +SubInclude OBOS_TOP src add-ons print drivers pdf encoding ; +SubInclude OBOS_TOP src add-ons print drivers pdf xrefs ; + +Package openbeos-pdf_writer-cvs : + README TODO CHANGES ; diff --git a/src/add-ons/print/drivers/pdf/bookmarks/Jamfile b/src/add-ons/print/drivers/pdf/bookmarks/Jamfile new file mode 100644 index 0000000000..df6d914099 --- /dev/null +++ b/src/add-ons/print/drivers/pdf/bookmarks/Jamfile @@ -0,0 +1,5 @@ +SubDir OBOS_TOP src add-ons print drivers pdf bookmarks ; + +Package openbeos-pdf_writer-cvs : + Sample : + boot home config settings PDF_Writer bookmarks ; diff --git a/src/add-ons/print/drivers/pdf/encoding/Jamfile b/src/add-ons/print/drivers/pdf/encoding/Jamfile new file mode 100644 index 0000000000..0cfc09a445 --- /dev/null +++ b/src/add-ons/print/drivers/pdf/encoding/Jamfile @@ -0,0 +1,6 @@ +SubDir OBOS_TOP src add-ons print drivers pdf encoding ; + +Package openbeos-pdf_writer-cvs : + t1enc0.enc t1enc1.enc t1enc2.enc t1enc3.enc t1enc4.enc + ttenc0.cpg ttenc1.cpg ttenc2.cpg ttenc3.cpg ttenc4.cpg : + boot home config settings PDF_Writer encoding ; diff --git a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp index 5787fa12f0..c7994d15cc 100644 --- a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp @@ -54,7 +54,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage *settings) BRect r; BBox *panel; BButton *button; - BCheckBox *cb; + // BCheckBox *cb; BMenuField *mf; float x, y, w, h; fSettings = settings; diff --git a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp index 4e1cb6db4b..b7f05971ae 100644 --- a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp @@ -87,7 +87,7 @@ DocInfoWindow::DocInfoWindow(BMessage *doc_info) { // ---- Ok, build a default page setup user interface BRect r; - BBox *panel; + // BBox *panel; BTabView *tabView; BString permissions; fDocInfo = doc_info; @@ -161,8 +161,8 @@ DocInfoWindow::SetupButtons(BBox* panel) { void DocInfoWindow::SetupDocInfoView(BBox* panel) { - BButton *button; - float x, y, w, h; + // BButton *button; + // float x, y, w, h; BRect r(panel->Bounds()); diff --git a/src/add-ons/print/drivers/pdf/source/Jamfile b/src/add-ons/print/drivers/pdf/source/Jamfile index 38b97ed7bc..8665826ee5 100644 --- a/src/add-ons/print/drivers/pdf/source/Jamfile +++ b/src/add-ons/print/drivers/pdf/source/Jamfile @@ -1,7 +1,6 @@ SubDir OBOS_TOP src add-ons print drivers pdf source ; AddResources PDF\ Writer : - # PDFWriter.rsrc PDFWriter.rdef ; @@ -55,3 +54,8 @@ LinkSharedOSLibs ; # /boot/home/config/lib/libpdf.so + +Package openbeos-pdf_writer-cvs : + PDF\ Writer : + boot home config add-ons Print ; + diff --git a/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp b/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp index 16a6dbc21f..7a9797459a 100644 --- a/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp +++ b/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp @@ -1599,11 +1599,10 @@ PDFWriter::GetImages(BRect src, int32 /*width*/, int32 /*height*/, int32 bytesPe int32 width = src.IntegerWidth() + 1; int32 height = src.IntegerHeight() + 1; - int length; - int bpc; - - + int length = 0; + int bpc = 0; + if (HasAlphaChannel(pixelFormat)) { if (NeedsBPC1Mask(pixelFormat) || !SupportsSoftMask()) { int32 w = (width+7)/8; diff --git a/src/add-ons/print/drivers/pdf/xrefs/Jamfile b/src/add-ons/print/drivers/pdf/xrefs/Jamfile new file mode 100644 index 0000000000..e1823c871a --- /dev/null +++ b/src/add-ons/print/drivers/pdf/xrefs/Jamfile @@ -0,0 +1,5 @@ +SubDir OBOS_TOP src add-ons print drivers pdf xrefs ; + +Package openbeos-pdf_writer-cvs : + English Deutsch : + boot home config settings PDF_Writer xrefs ;