From 5029115dff00084153f6a08766557cbe6a3c1c2b Mon Sep 17 00:00:00 2001 From: shatty Date: Sun, 21 Nov 2004 08:55:17 +0000 Subject: [PATCH] address compiler warnings git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10100 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/print/drivers/pdf/source/PDFWriter.cpp | 6 +++--- src/add-ons/print/drivers/pdf/source/PDFWriter.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp b/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp index 7c1dd52957..bd89f23938 100644 --- a/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp +++ b/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp @@ -1106,7 +1106,7 @@ PDFWriter::IsTransparentGRAY1(uint8* in, int8 bit) // -------------------------------------------------- -void * +uint8 * PDFWriter::CreateMask(BRect src, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data) { uint8 *in; @@ -1206,7 +1206,7 @@ PDFWriter::AlphaFromRGBA32_BIG(uint8* in) // -------------------------------------------------- -void * +uint8 * PDFWriter::CreateSoftMask(BRect src, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data) { static bool errorReported = false; @@ -1606,7 +1606,7 @@ bool PDFWriter::GetImages(BRect src, int32 /*width*/, int32 /*height*/, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data, int* maskId, int* image) { - void *mask = NULL; + uint8 *mask = NULL; *maskId = -1; int32 width = src.IntegerWidth() + 1; diff --git a/src/add-ons/print/drivers/pdf/source/PDFWriter.h b/src/add-ons/print/drivers/pdf/source/PDFWriter.h index 8c77275f80..e979a2ec1d 100644 --- a/src/add-ons/print/drivers/pdf/source/PDFWriter.h +++ b/src/add-ons/print/drivers/pdf/source/PDFWriter.h @@ -134,8 +134,8 @@ class PDFWriter : public PrinterDriver, public PictureIterator inline void ConvertFromGRAY8(uint8* in, uint8* out); inline void ConvertFromGRAY1(uint8* in, uint8* out, int8 bit); - void *CreateMask(BRect src, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data); - void *CreateSoftMask(BRect src, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data); + uint8 *CreateMask(BRect src, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data); + uint8 *CreateSoftMask(BRect src, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data); BBitmap *ConvertBitmap(BRect src, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data); bool GetImages(BRect src, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data, int* mask, int* image);