From 6b176bef5bf73e6a3523972a7dd196273460fede Mon Sep 17 00:00:00 2001 From: Wim van der Meer Date: Sat, 3 Jul 2010 08:11:37 +0000 Subject: [PATCH] Style cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37366 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/print/drivers/pcl5/PCL5.cpp | 148 +++++++++++-------- src/add-ons/print/drivers/pcl5/PCL5.h | 42 +++--- src/add-ons/print/drivers/pcl5/PCL5Cap.cpp | 84 ++++++----- src/add-ons/print/drivers/pcl5/PCL5Cap.h | 13 +- src/add-ons/print/drivers/pcl5/PCL5Entry.cpp | 8 +- 5 files changed, 169 insertions(+), 126 deletions(-) diff --git a/src/add-ons/print/drivers/pcl5/PCL5.cpp b/src/add-ons/print/drivers/pcl5/PCL5.cpp index 8956f47700..bc337bef2b 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5.cpp +++ b/src/add-ons/print/drivers/pcl5/PCL5.cpp @@ -4,19 +4,24 @@ * Copyright 2003 Michael Pfeiffer. */ + +#include "PCL5.h" + +#include + #include #include #include -#include -#include "PCL5.h" -#include "UIDriver.h" -#include "JobData.h" -#include "PrinterData.h" -#include "PCL5Cap.h" -#include "PackBits.h" -#include "Halftone.h" -#include "ValidRect.h" + #include "DbgMsg.h" +#include "Halftone.h" +#include "JobData.h" +#include "PackBits.h" +#include "PCL5Cap.h" +#include "PrinterData.h" +#include "UIDriver.h" +#include "ValidRect.h" + #if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE)) using namespace std; @@ -24,41 +29,54 @@ using namespace std; #define std #endif -PCL5Driver::PCL5Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap) - : GraphicsDriver(msg, printer_data, printer_cap) + +PCL5Driver::PCL5Driver(BMessage* msg, PrinterData* printer_data, + const PrinterCap* printer_cap) + : + GraphicsDriver(msg, printer_data, printer_cap) { fHalftone = NULL; } -bool PCL5Driver::startDoc() + +bool +PCL5Driver::startDoc() { try { jobStart(); - fHalftone = new Halftone(getJobData()->getSurfaceType(), getJobData()->getGamma(), getJobData()->getInkDensity(), getJobData()->getDitherType()); + fHalftone = new Halftone(getJobData()->getSurfaceType(), + getJobData()->getGamma(), getJobData()->getInkDensity(), + getJobData()->getDitherType()); return true; } - catch (TransportException &err) { + catch (TransportException& err) { return false; } } -bool PCL5Driver::startPage(int) + +bool +PCL5Driver::startPage(int) { return true; } -bool PCL5Driver::endPage(int) + +bool +PCL5Driver::endPage(int) { try { writeSpoolChar('\014'); return true; } - catch (TransportException &err) { + catch (TransportException& err) { return false; } } -bool PCL5Driver::endDoc(bool) + +bool +PCL5Driver::endDoc(bool) { try { if (fHalftone) { @@ -67,12 +85,14 @@ bool PCL5Driver::endDoc(bool) jobEnd(); return true; } - catch (TransportException &err) { + catch (TransportException& err) { return false; } } -bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) + +bool +PCL5Driver::nextBand(BBitmap* bitmap, BPoint* offset) { DBGMSG(("> nextBand\n")); @@ -80,9 +100,9 @@ bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) BRect bounds = bitmap->Bounds(); RECT rc; - rc.left = (int)bounds.left; - rc.top = (int)bounds.top; - rc.right = (int)bounds.right; + rc.left = (int)bounds.left; + rc.top = (int)bounds.top; + rc.right = (int)bounds.right; rc.bottom = (int)bounds.bottom; int height = rc.bottom - rc.top + 1; @@ -92,9 +112,8 @@ bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) int page_height = getPageHeight(); - if (y + height > page_height) { + if (y + height > page_height) height = page_height - y; - } rc.bottom = height - 1; @@ -111,11 +130,12 @@ bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) y += rc.top; int width = rc.right - rc.left + 1; - int widthByte = (width + 7) / 8; /* byte boundary */ - int height = rc.bottom - rc.top + 1; - int in_size = widthByte; - int out_size = (widthByte * 6 + 4) / 5; - int delta = bitmap->BytesPerRow(); + int widthByte = (width + 7) / 8; + // byte boundary + int height = rc.bottom - rc.top + 1; + int in_size = widthByte; + int out_size = (widthByte * 6 + 4) / 5; + int delta = bitmap->BytesPerRow(); DBGMSG(("width = %d\n", width)); DBGMSG(("widthByte = %d\n", widthByte)); @@ -125,16 +145,16 @@ bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) DBGMSG(("delta = %d\n", delta)); DBGMSG(("renderobj->get_pixel_depth() = %d\n", fHalftone->getPixelDepth())); - uchar *ptr = (uchar *)bitmap->Bits() + uchar* ptr = static_cast(bitmap->Bits()) + rc.top * delta + (rc.left * fHalftone->getPixelDepth()) / 8; int compression_method; int compressed_size; - const uchar *buffer; + const uchar* buffer; - uchar *in_buffer = new uchar[in_size]; - uchar *out_buffer = new uchar[out_size]; + uchar* in_buffer = new uchar[in_size]; + uchar* out_buffer = new uchar[out_size]; auto_ptr _in_buffer (in_buffer); auto_ptr _out_buffer(out_buffer); @@ -160,7 +180,8 @@ bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) compressed_size = pack_bits(out_buffer, in_buffer, in_size); - if (compressed_size + bytesToEnterCompressionMethod(2) < in_size + bytesToEnterCompressionMethod(0)) { + if (compressed_size + bytesToEnterCompressionMethod(2) + < in_size + bytesToEnterCompressionMethod(0)) { compression_method = 2; // back bits buffer = out_buffer; } else { @@ -183,28 +204,28 @@ bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) endRasterGraphics(); - } else { + } else DBGMSG(("band bitmap is clean.\n")); - } if (y >= page_height) { offset->x = -1.0; offset->y = -1.0; - } else { + } else offset->y += height; - } DBGMSG(("< nextBand\n")); return true; } - catch (TransportException &err) { - BAlert *alert = new BAlert("", err.what(), "OK"); + catch (TransportException& err) { + BAlert* alert = new BAlert("", err.what(), "OK"); alert->Go(); return false; } } -void PCL5Driver::jobStart() + +void +PCL5Driver::jobStart() { const bool color = getJobData()->getColor() == JobData::kColor; // enter PCL5 @@ -233,7 +254,9 @@ void PCL5Driver::jobStart() // writeSpoolString("\033&l%ldL", getJobData()->getCopies()); } -void PCL5Driver::startRasterGraphics(int width, int height) + +void +PCL5Driver::startRasterGraphics(int width, int height) { // width writeSpoolString("\033*r%dS", width); @@ -244,47 +267,52 @@ void PCL5Driver::startRasterGraphics(int width, int height) fCompressionMethod = -1; } -void PCL5Driver::endRasterGraphics() + +void +PCL5Driver::endRasterGraphics() { writeSpoolString("\033*rB"); } -void PCL5Driver::rasterGraphics( - int compression_method, - const uchar *buffer, - int size, - bool lastPlane) + +void +PCL5Driver::rasterGraphics(int compression_method, const uchar* buffer, + int size, bool lastPlane) { if (fCompressionMethod != compression_method) { writeSpoolString("\033*b%dM", compression_method); fCompressionMethod = compression_method; } writeSpoolString("\033*b%d", size); - if (lastPlane) { + if (lastPlane) writeSpoolString("W"); - } else { + else writeSpoolString("V"); - } + writeSpoolData(buffer, size); } -void PCL5Driver::jobEnd() + +void +PCL5Driver::jobEnd() { writeSpoolString("\033&l1T"); writeSpoolString("\033E"); } -void PCL5Driver::move(int x, int y) + +void +PCL5Driver::move(int x, int y) { - writeSpoolString("\033*p%dx%dY", x, y+75); + writeSpoolString("\033*p%dx%dY", x, y + 75); } -int PCL5Driver::bytesToEnterCompressionMethod(int compression_method) + +int +PCL5Driver::bytesToEnterCompressionMethod(int compression_method) { - if (fCompressionMethod == compression_method) { + if (fCompressionMethod == compression_method) return 0; - } else { + else return 5; - } } - diff --git a/src/add-ons/print/drivers/pcl5/PCL5.h b/src/add-ons/print/drivers/pcl5/PCL5.h index 45bc07a4ea..6da26711e9 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5.h +++ b/src/add-ons/print/drivers/pcl5/PCL5.h @@ -2,40 +2,40 @@ * PCL5.h * Copyright 1999-2000 Y.Takagi. All Rights Reserved. */ - #ifndef __PCL5_H #define __PCL5_H + #include "GraphicsDriver.h" + class Halftone; + class PCL5Driver : public GraphicsDriver { public: - PCL5Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap); + PCL5Driver(BMessage* msg, PrinterData* printer_data, + const PrinterCap* printer_cap); protected: - virtual bool startDoc(); - virtual bool startPage(int page); - virtual bool nextBand(BBitmap *bitmap, BPoint *offset); - virtual bool endPage(int page); - virtual bool endDoc(bool success); + virtual bool startDoc(); + virtual bool startPage(int page); + virtual bool nextBand(BBitmap* bitmap, BPoint* offset); + virtual bool endPage(int page); + virtual bool endDoc(bool success); private: - void move(int x, int y); - void jobStart(); - void startRasterGraphics(int width, int height); - void endRasterGraphics(); - void rasterGraphics( - int compression_method, - const uchar *buffer, - int size, - bool lastPlane); - void jobEnd(); - int bytesToEnterCompressionMethod(int compression_method); + void move(int x, int y); + void jobStart(); + void startRasterGraphics(int width, int height); + void endRasterGraphics(); + void rasterGraphics(int compression_method, + const uchar* buffer, int size, bool lastPlane); + void jobEnd(); + int bytesToEnterCompressionMethod(int compression_method); - int fCompressionMethod; - Halftone *fHalftone; + int fCompressionMethod; + Halftone* fHalftone; }; -#endif /* __PCL5_H */ +#endif // __PCL5_H diff --git a/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp b/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp index 3835891d1c..3cf6af11f1 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp +++ b/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp @@ -3,9 +3,11 @@ * Copyright 1999-2000 Y.Takagi. All Rights Reserved. */ -#include "PrinterData.h" + #include "PCL5Cap.h" +#include "PrinterData.h" + #define TO72DPI(a) (a * 72.0f / 600.0f) const PaperCap a3( @@ -70,7 +72,7 @@ const ResolutionCap dpi300("300dpi", true, 300, 300); const ResolutionCap dpi600("600dpi", false, 600, 600); const ResolutionCap dpi1200("1200dpi", false, 1200, 1200); -const PaperCap *papers[] = { +const PaperCap* papers[] = { &a4, &a3, &a5, @@ -80,11 +82,11 @@ const PaperCap *papers[] = { &legal }; -const PaperSourceCap *papersources[] = { +const PaperSourceCap* papersources[] = { &autobin, }; -const ResolutionCap *resolutions[] = { +const ResolutionCap* resolutions[] = { &dpi300, &dpi600, &dpi1200, @@ -93,57 +95,65 @@ const ResolutionCap *resolutions[] = { const ColorCap color("Color", false, JobData::kColor); const ColorCap monochrome("Shades of Gray", true, JobData::kMonochrome); -const ColorCap *colors[] = { +const ColorCap* colors[] = { &color, &monochrome }; -PCL5Cap::PCL5Cap(const PrinterData *printer_data) - : PrinterCap(printer_data) + +PCL5Cap::PCL5Cap(const PrinterData* printer_data) + : + PrinterCap(printer_data) { } -int PCL5Cap::countCap(CapID capid) const + +int +PCL5Cap::countCap(CapID capid) const { switch (capid) { - case kPaper: - return sizeof(papers) / sizeof(papers[0]); - case kPaperSource: - return sizeof(papersources) / sizeof(papersources[0]); - case kResolution: - return sizeof(resolutions) / sizeof(resolutions[0]); - case kColor: - return sizeof(colors) / sizeof(colors[0]); - default: - return 0; + case kPaper: + return sizeof(papers) / sizeof(papers[0]); + case kPaperSource: + return sizeof(papersources) / sizeof(papersources[0]); + case kResolution: + return sizeof(resolutions) / sizeof(resolutions[0]); + case kColor: + return sizeof(colors) / sizeof(colors[0]); + default: + return 0; } } -const BaseCap **PCL5Cap::enumCap(CapID capid) const + +const BaseCap** +PCL5Cap::enumCap(CapID capid) const { switch (capid) { - case kPaper: - return (const BaseCap **)papers; - case kPaperSource: - return (const BaseCap **)papersources; - case kResolution: - return (const BaseCap **)resolutions; - case kColor: - return (const BaseCap **)colors; - default: - return NULL; + case kPaper: + return (const BaseCap **)papers; + case kPaperSource: + return (const BaseCap **)papersources; + case kResolution: + return (const BaseCap **)resolutions; + case kColor: + return (const BaseCap **)colors; + default: + return NULL; } } -bool PCL5Cap::isSupport(CapID capid) const + +bool +PCL5Cap::isSupport(CapID capid) const { switch (capid) { - case kPaper: - case kPaperSource: - case kResolution: - case kColor: - return true; - default: - return false; + case kPaper: + case kPaperSource: + case kResolution: + case kColor: + return true; + default: + return false; } } diff --git a/src/add-ons/print/drivers/pcl5/PCL5Cap.h b/src/add-ons/print/drivers/pcl5/PCL5Cap.h index 20f65505b1..0bef68bb9b 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5Cap.h +++ b/src/add-ons/print/drivers/pcl5/PCL5Cap.h @@ -2,18 +2,19 @@ * PCL5Cap.h * Copyright 1999-2000 Y.Takagi. All Rights Reserved. */ - #ifndef __PCL5CAP_H #define __PCL5CAP_H + #include "PrinterCap.h" + class PCL5Cap : public PrinterCap { public: - PCL5Cap(const PrinterData *printer_data); - virtual int countCap(CapID) const; - virtual bool isSupport(CapID) const; - virtual const BaseCap **enumCap(CapID) const; + PCL5Cap(const PrinterData* printer_data); + virtual int countCap(CapID) const; + virtual bool isSupport(CapID) const; + virtual const BaseCap **enumCap(CapID) const; }; -#endif /* __PCL5CAP_H */ +#endif // __PCL5CAP_H diff --git a/src/add-ons/print/drivers/pcl5/PCL5Entry.cpp b/src/add-ons/print/drivers/pcl5/PCL5Entry.cpp index 1635e6b14d..316e460100 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5Entry.cpp +++ b/src/add-ons/print/drivers/pcl5/PCL5Entry.cpp @@ -4,10 +4,12 @@ * Copyright 2003 Michael Pfeiffer. */ + #include "PCL5.h" #include "PCL5Cap.h" #include "PrinterDriver.h" + class PCL5PrinterDriver : public PrinterDriver { public: @@ -23,7 +25,7 @@ public: return "PCL5 compatible"; } - const char* GetVersion() const + const char* GetVersion() const { return "1.0"; } @@ -38,12 +40,14 @@ public: return new PCL5Cap(printerData); } - GraphicsDriver* InstantiateGraphicsDriver(BMessage* settings, PrinterData* printerData, PrinterCap* printerCap) + GraphicsDriver* InstantiateGraphicsDriver(BMessage* settings, + PrinterData* printerData, PrinterCap* printerCap) { return new PCL5Driver(settings, printerData, printerCap); } }; + PrinterDriver* instantiate_printer_driver(BNode* printerFolder) { return new PCL5PrinterDriver(printerFolder);