From cdef53218cb2ed652aed9274e5b7fcafd42cea74 Mon Sep 17 00:00:00 2001 From: Michael Pfeiffer Date: Tue, 7 Jan 2003 16:35:09 +0000 Subject: [PATCH] Enabled pattern support. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2386 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/print/drivers/pdf/source/PDFWriter.cpp | 14 -------------- src/add-ons/print/drivers/pdf/source/PDFWriter.h | 6 +----- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp b/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp index a8840d2d41..ca8d5f4336 100644 --- a/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp +++ b/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp @@ -634,7 +634,6 @@ PDFWriter::CreatePattern() void PDFWriter::SetPattern() { -#if PATTERN_SUPPORT REPORT(kDebug, fPage, "SetPattern (bitmap version)"); if (MakesPattern()) { if (FindPattern() == -1) CreatePattern(); @@ -647,19 +646,6 @@ PDFWriter::SetPattern() REPORT(kError, fPage, "pattern missing!"); } } -#else - REPORT(kDebug, fPage, "SetPattern (color version)"); - if (IsSame(fState->pattern0, B_MIXED_COLORS)) { - rgb_color mixed; // approximate mixed colors - mixed.red = (fState->foregroundColor.red + fState->backgroundColor.red) / 2; - mixed.green = (fState->foregroundColor.green + fState->backgroundColor.green) / 2; - mixed.blue = (fState->foregroundColor.blue + fState->backgroundColor.blue) / 2; - mixed.alpha = (fState->foregroundColor.alpha + fState->backgroundColor.alpha) / 2; - SetColor(mixed); - } else { - SetColor(fState->foregroundColor); - } -#endif } diff --git a/src/add-ons/print/drivers/pdf/source/PDFWriter.h b/src/add-ons/print/drivers/pdf/source/PDFWriter.h index 75e2ab3368..780488f2fa 100644 --- a/src/add-ons/print/drivers/pdf/source/PDFWriter.h +++ b/src/add-ons/print/drivers/pdf/source/PDFWriter.h @@ -309,13 +309,9 @@ class PDFWriter : public PrinterDriver, public PictureIterator kFill = false }; -#if PATTERN_SUPPORT inline bool MakesPattern() { return Pass() == 0; } inline bool MakesPDF() { return Pass() == 1; } -#else - inline bool MakesPattern() { return false; } - inline bool MakesPDF() { return true; } -#endif + inline bool IsDrawing() const { return fMode == kDrawingMode; } inline bool IsClipping() const { return fMode == kClippingMode; }