i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more gcc4 fixes for print addons

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19108 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-10-23 22:39:57 +00:00
parent ada60fd8cc
commit d03f6d5c29
14 changed files with 113 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/print/libprint/MarginView.h
+1 -1
View File
@@ -147,7 +147,7 @@ enum MarginUnit {
*/ */
class MarginView : public BBox class MarginView : public BBox
{ {
friend MarginManager; friend class MarginManager;
private: private:
headers/private/print/libprint/SpoolMetaData.h
+1
View File
@@ -9,6 +9,7 @@
#include <SupportDefs.h> #include <SupportDefs.h>
#include <File.h> #include <File.h>
#include <string> #include <string>
using namespace std;
class SpoolMetaData { class SpoolMetaData {
private: private:
src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp
+1
View File
@@ -27,6 +27,7 @@ THE SOFTWARE.
*/ */
#include <math.h>
#include "LinePathBuilder.h" #include "LinePathBuilder.h"
static const float kNearZero = 0.000000000001; static const float kNearZero = 0.000000000001;
src/add-ons/print/drivers/pdf/source/MarginView.h
+1 -1
View File
@@ -140,7 +140,7 @@ const uint32 FLIP_PAGE = 'flip';
*/ */
class MarginView : public BBox class MarginView : public BBox
{ {
friend MarginManager; friend class MarginManager;
public: public:
// used to index unitFormat array // used to index unitFormat array
src/add-ons/print/drivers/pdf/source/PictureIterator.cpp
+50 -50
View File
@@ -91,56 +91,56 @@ static void _op49(void * p) { return ((PictureIterator *) p)->Op(49); }
static void * static void *
playbackHandlers[] = { playbackHandlers[] = {
_op0, // 0 no operation (void*)_op0, // 0 no operation
_MovePenBy, // 1 MovePenBy(void *user, BPoint delta) (void*)_MovePenBy, // 1 MovePenBy(void *user, BPoint delta)
_StrokeLine, // 2 StrokeLine(void *user, BPoint start, BPoint end) (void*)_StrokeLine, // 2 StrokeLine(void *user, BPoint start, BPoint end)
_StrokeRect, // 3 StrokeRect(void *user, BRect rect) (void*)_StrokeRect, // 3 StrokeRect(void *user, BRect rect)
_FillRect, // 4 FillRect(void *user, BRect rect) (void*)_FillRect, // 4 FillRect(void *user, BRect rect)
_StrokeRoundRect, // 5 StrokeRoundRect(void *user, BRect rect, BPoint radii) (void*)_StrokeRoundRect, // 5 StrokeRoundRect(void *user, BRect rect, BPoint radii)
_FillRoundRect, // 6 FillRoundRect(void *user, BRect rect, BPoint radii) (void*)_FillRoundRect, // 6 FillRoundRect(void *user, BRect rect, BPoint radii)
_StrokeBezier, // 7 StrokeBezier(void *user, BPoint *control) (void*)_StrokeBezier, // 7 StrokeBezier(void *user, BPoint *control)
_FillBezier, // 8 FillBezier(void *user, BPoint *control) (void*)_FillBezier, // 8 FillBezier(void *user, BPoint *control)
_StrokeArc, // 9 StrokeArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) (void*)_StrokeArc, // 9 StrokeArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta)
_FillArc, // 10 FillArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) (void*)_FillArc, // 10 FillArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta)
_StrokeEllipse, // 11 StrokeEllipse(void *user, BPoint center, BPoint radii) (void*)_StrokeEllipse, // 11 StrokeEllipse(void *user, BPoint center, BPoint radii)
_FillEllipse, // 12 FillEllipse(void *user, BPoint center, BPoint radii) (void*)_FillEllipse, // 12 FillEllipse(void *user, BPoint center, BPoint radii)
_StrokePolygon, // 13 StrokePolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) (void*)_StrokePolygon, // 13 StrokePolygon(void *user, int32 numPoints, BPoint *points, bool isClosed)
_FillPolygon, // 14 FillPolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) (void*)_FillPolygon, // 14 FillPolygon(void *user, int32 numPoints, BPoint *points, bool isClosed)
_StrokeShape, // 15 StrokeShape(void *user, BShape *shape) (void*)_StrokeShape, // 15 StrokeShape(void *user, BShape *shape)
_FillShape, // 16 FillShape(void *user, BShape *shape) (void*)_FillShape, // 16 FillShape(void *user, BShape *shape)
_DrawString, // 17 DrawString(void *user, char *string, float deltax, float deltay) (void*)_DrawString, // 17 DrawString(void *user, char *string, float deltax, float deltay)
_DrawPixels, // 18 DrawPixels(void *user, BRect src, BRect dest, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data) (void*)_DrawPixels, // 18 DrawPixels(void *user, BRect src, BRect dest, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data)
_op19, // 19 *reserved* (void*)_op19, // 19 *reserved*
_SetClippingRects, // 20 SetClippingRects(void *user, BRect *rects, uint32 numRects) (void*)_SetClippingRects, // 20 SetClippingRects(void *user, BRect *rects, uint32 numRects)
_ClipToPicture, // 21 ClipToPicture(void *user, BPicture *picture, BPoint pt, bool clip_to_inverse_picture) (void*)_ClipToPicture, // 21 ClipToPicture(void *user, BPicture *picture, BPoint pt, bool clip_to_inverse_picture)
_PushState, // 22 PushState(void *user) (void*)_PushState, // 22 PushState(void *user)
_PopState, // 23 PopState(void *user) (void*)_PopState, // 23 PopState(void *user)
_EnterStateChange, // 24 EnterStateChange(void *user) (void*)_EnterStateChange, // 24 EnterStateChange(void *user)
_ExitStateChange, // 25 ExitStateChange(void *user) (void*)_ExitStateChange, // 25 ExitStateChange(void *user)
_EnterFontState, // 26 EnterFontState(void *user) (void*)_EnterFontState, // 26 EnterFontState(void *user)
_ExitFontState, // 27 ExitFontState(void *user) (void*)_ExitFontState, // 27 ExitFontState(void *user)
_SetOrigin, // 28 SetOrigin(void *user, BPoint pt) (void*)_SetOrigin, // 28 SetOrigin(void *user, BPoint pt)
_SetPenLocation, // 29 SetPenLocation(void *user, BPoint pt) (void*)_SetPenLocation, // 29 SetPenLocation(void *user, BPoint pt)
_SetDrawingMode, // 30 SetDrawingMode(void *user, drawing_mode mode) (void*)_SetDrawingMode, // 30 SetDrawingMode(void *user, drawing_mode mode)
_SetLineMode, // 31 SetLineMode(void *user, cap_mode capMode, join_mode joinMode, float miterLimit) (void*)_SetLineMode, // 31 SetLineMode(void *user, cap_mode capMode, join_mode joinMode, float miterLimit)
_SetPenSize, // 32 SetPenSize(void *user, float size) (void*)_SetPenSize, // 32 SetPenSize(void *user, float size)
_SetForeColor, // 33 SetForeColor(void *user, rgb_color color) (void*)_SetForeColor, // 33 SetForeColor(void *user, rgb_color color)
_SetBackColor, // 34 SetBackColor(void *user, rgb_color color) (void*)_SetBackColor, // 34 SetBackColor(void *user, rgb_color color)
_SetStipplePattern, // 35 SetStipplePattern(void *user, pattern p) (void*)_SetStipplePattern, // 35 SetStipplePattern(void *user, pattern p)
_SetScale, // 36 SetScale(void *user, float scale) (void*)_SetScale, // 36 SetScale(void *user, float scale)
_SetFontFamily, // 37 SetFontFamily(void *user, char *family) (void*)_SetFontFamily, // 37 SetFontFamily(void *user, char *family)
_SetFontStyle, // 38 SetFontStyle(void *user, char *style) (void*)_SetFontStyle, // 38 SetFontStyle(void *user, char *style)
_SetFontSpacing, // 39 SetFontSpacing(void *user, int32 spacing) (void*)_SetFontSpacing, // 39 SetFontSpacing(void *user, int32 spacing)
_SetFontSize, // 40 SetFontSize(void *user, float size) (void*)_SetFontSize, // 40 SetFontSize(void *user, float size)
_SetFontRotate, // 41 SetFontRotate(void *user, float rotation) (void*)_SetFontRotate, // 41 SetFontRotate(void *user, float rotation)
_SetFontEncoding, // 42 SetFontEncoding(void *user, int32 encoding) (void*)_SetFontEncoding, // 42 SetFontEncoding(void *user, int32 encoding)
_SetFontFlags, // 43 SetFontFlags(void *user, int32 flags) (void*)_SetFontFlags, // 43 SetFontFlags(void *user, int32 flags)
_SetFontShear, // 44 SetFontShear(void *user, float shear) (void*)_SetFontShear, // 44 SetFontShear(void *user, float shear)
_op45, // 45 *reserved* (void*)_op45, // 45 *reserved*
_SetFontFace, // 46 SetFontFace(void *user, int32 flags) (void*)_SetFontFace, // 46 SetFontFace(void *user, int32 flags)
_op47, (void*)_op47,
_op48, (void*)_op48,
_op49, (void*)_op49,
NULL NULL
}; };
src/add-ons/print/drivers/pdf/source/PictureIterator.h
+1 -1
View File
@@ -90,4 +90,4 @@ public:
virtual void Iterate(BPicture* picture); virtual void Iterate(BPicture* picture);
}; };
#endif _PICTURE_ITERATOR_H #endif // _PICTURE_ITERATOR_H
src/add-ons/print/drivers/pdf/source/Utils.cpp
+2 -1
View File
@@ -29,6 +29,7 @@ THE SOFTWARE.
*/ */
#include <string.h>
#include "Utils.h" #include "Utils.h"
// -------------------------------------------------- // --------------------------------------------------
@@ -64,7 +65,7 @@ static bool InList(const char* list[], const char* name) {
// -------------------------------------------------- // --------------------------------------------------
// copied from BeUtils.cpp // copied from BeUtils.cpp
void AddFields(BMessage* to, const BMessage* from, bool overwrite = true, const char* excludeList[], const char* includeList[]) { void AddFields(BMessage* to, const BMessage* from, bool overwrite, const char* excludeList[], const char* includeList[]) {
if (to == from) return; if (to == from) return;
char* name; char* name;
type_code type; type_code type;
src/add-ons/print/drivers/postscript/Jamfile
+1 -1
View File
@@ -12,7 +12,7 @@ Addon PS\ Compatible : Print :
PSCap.cpp PSCap.cpp
; ;
LinkAgainst PS\ Compatible : be $(TARGET_LIBSTDC++) libprint.a ; LinkAgainst PS\ Compatible : be libprint.a $(TARGET_LIBSTDC++) ;
Package haiku-printingkit-cvs : Package haiku-printingkit-cvs :
PS\ Compatible : PS\ Compatible :
src/add-ons/print/drivers/preview/MarginView.h
+1 -1
View File
@@ -140,7 +140,7 @@ const uint32 FLIP_PAGE = 'flip';
*/ */
class MarginView : public BBox class MarginView : public BBox
{ {
friend MarginManager; friend class MarginManager;
public: public:
// used to index unitFormat array // used to index unitFormat array
src/add-ons/print/drivers/preview/Utils.cpp
+2 -1
View File
@@ -30,6 +30,7 @@ THE SOFTWARE.
*/ */
#include <string.h>
#include "Utils.h" #include "Utils.h"
// -------------------------------------------------- // --------------------------------------------------
@@ -135,4 +136,4 @@ BRect ScaleRect(BRect rect, float scale) {
rect.top *= scale; rect.top *= scale;
rect.bottom *= scale; rect.bottom *= scale;
return rect; return rect;
} }
src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>
#include "_sstream" #include <sstream>
#include <string> #include <string>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
src/add-ons/print/drivers/shared/libprint/_sstream
-24
View File
@@ -1,24 +0,0 @@
/*
* _sstream
* Copyright 1999-2000 Y.Takagi. All Rights Reserved.
*/
#if __MWERKS__
#include <sstream>
#else
#ifndef __SSTREAM_H
#define __SSTREAM_H
#include <strstream>
#include <string>
class ostringstream : public ostrstream {
public:
ostringstream() : ostrstream() {}
~ostringstream() { delete [] ostrstream::str(); }
string str() { *this << ends; return string(ostrstream::str()); }
};
#endif /* __SSTREAM_H */
#endif /* USING_STRSTREAM */
src/add-ons/print/shared/PictureIterator.cpp
+50 -50
View File
@@ -91,56 +91,56 @@ static void _op49(void * p) { return ((PictureIterator *) p)->Op(49); }
static void * static void *
playbackHandlers[] = { playbackHandlers[] = {
_op0, // 0 no operation (void *)_op0, // 0 no operation
_MovePenBy, // 1 MovePenBy(void *user, BPoint delta) (void *)_MovePenBy, // 1 MovePenBy(void *user, BPoint delta)
_StrokeLine, // 2 StrokeLine(void *user, BPoint start, BPoint end) (void *)_StrokeLine, // 2 StrokeLine(void *user, BPoint start, BPoint end)
_StrokeRect, // 3 StrokeRect(void *user, BRect rect) (void *)_StrokeRect, // 3 StrokeRect(void *user, BRect rect)
_FillRect, // 4 FillRect(void *user, BRect rect) (void *)_FillRect, // 4 FillRect(void *user, BRect rect)
_StrokeRoundRect, // 5 StrokeRoundRect(void *user, BRect rect, BPoint radii) (void *)_StrokeRoundRect, // 5 StrokeRoundRect(void *user, BRect rect, BPoint radii)
_FillRoundRect, // 6 FillRoundRect(void *user, BRect rect, BPoint radii) (void *)_FillRoundRect, // 6 FillRoundRect(void *user, BRect rect, BPoint radii)
_StrokeBezier, // 7 StrokeBezier(void *user, BPoint *control) (void *)_StrokeBezier, // 7 StrokeBezier(void *user, BPoint *control)
_FillBezier, // 8 FillBezier(void *user, BPoint *control) (void *)_FillBezier, // 8 FillBezier(void *user, BPoint *control)
_StrokeArc, // 9 StrokeArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) (void *)_StrokeArc, // 9 StrokeArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta)
_FillArc, // 10 FillArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) (void *)_FillArc, // 10 FillArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta)
_StrokeEllipse, // 11 StrokeEllipse(void *user, BPoint center, BPoint radii) (void *)_StrokeEllipse, // 11 StrokeEllipse(void *user, BPoint center, BPoint radii)
_FillEllipse, // 12 FillEllipse(void *user, BPoint center, BPoint radii) (void *)_FillEllipse, // 12 FillEllipse(void *user, BPoint center, BPoint radii)
_StrokePolygon, // 13 StrokePolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) (void *)_StrokePolygon, // 13 StrokePolygon(void *user, int32 numPoints, BPoint *points, bool isClosed)
_FillPolygon, // 14 FillPolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) (void *)_FillPolygon, // 14 FillPolygon(void *user, int32 numPoints, BPoint *points, bool isClosed)
_StrokeShape, // 15 StrokeShape(void *user, BShape *shape) (void *)_StrokeShape, // 15 StrokeShape(void *user, BShape *shape)
_FillShape, // 16 FillShape(void *user, BShape *shape) (void *)_FillShape, // 16 FillShape(void *user, BShape *shape)
_DrawString, // 17 DrawString(void *user, char *string, float deltax, float deltay) (void *)_DrawString, // 17 DrawString(void *user, char *string, float deltax, float deltay)
_DrawPixels, // 18 DrawPixels(void *user, BRect src, BRect dest, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data) (void *)_DrawPixels, // 18 DrawPixels(void *user, BRect src, BRect dest, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data)
_op19, // 19 *reserved* (void *)_op19, // 19 *reserved*
_SetClippingRects, // 20 SetClippingRects(void *user, BRect *rects, uint32 numRects) (void *)_SetClippingRects, // 20 SetClippingRects(void *user, BRect *rects, uint32 numRects)
_ClipToPicture, // 21 ClipToPicture(void *user, BPicture *picture, BPoint pt, bool clip_to_inverse_picture) (void *)_ClipToPicture, // 21 ClipToPicture(void *user, BPicture *picture, BPoint pt, bool clip_to_inverse_picture)
_PushState, // 22 PushState(void *user) (void *)_PushState, // 22 PushState(void *user)
_PopState, // 23 PopState(void *user) (void *)_PopState, // 23 PopState(void *user)
_EnterStateChange, // 24 EnterStateChange(void *user) (void *)_EnterStateChange, // 24 EnterStateChange(void *user)
_ExitStateChange, // 25 ExitStateChange(void *user) (void *)_ExitStateChange, // 25 ExitStateChange(void *user)
_EnterFontState, // 26 EnterFontState(void *user) (void *)_EnterFontState, // 26 EnterFontState(void *user)
_ExitFontState, // 27 ExitFontState(void *user) (void *)_ExitFontState, // 27 ExitFontState(void *user)
_SetOrigin, // 28 SetOrigin(void *user, BPoint pt) (void *)_SetOrigin, // 28 SetOrigin(void *user, BPoint pt)
_SetPenLocation, // 29 SetPenLocation(void *user, BPoint pt) (void *)_SetPenLocation, // 29 SetPenLocation(void *user, BPoint pt)
_SetDrawingMode, // 30 SetDrawingMode(void *user, drawing_mode mode) (void *)_SetDrawingMode, // 30 SetDrawingMode(void *user, drawing_mode mode)
_SetLineMode, // 31 SetLineMode(void *user, cap_mode capMode, join_mode joinMode, float miterLimit) (void *)_SetLineMode, // 31 SetLineMode(void *user, cap_mode capMode, join_mode joinMode, float miterLimit)
_SetPenSize, // 32 SetPenSize(void *user, float size) (void *)_SetPenSize, // 32 SetPenSize(void *user, float size)
_SetForeColor, // 33 SetForeColor(void *user, rgb_color color) (void *)_SetForeColor, // 33 SetForeColor(void *user, rgb_color color)
_SetBackColor, // 34 SetBackColor(void *user, rgb_color color) (void *)_SetBackColor, // 34 SetBackColor(void *user, rgb_color color)
_SetStipplePattern, // 35 SetStipplePattern(void *user, pattern p) (void *)_SetStipplePattern, // 35 SetStipplePattern(void *user, pattern p)
_SetScale, // 36 SetScale(void *user, float scale) (void *)_SetScale, // 36 SetScale(void *user, float scale)
_SetFontFamily, // 37 SetFontFamily(void *user, char *family) (void *)_SetFontFamily, // 37 SetFontFamily(void *user, char *family)
_SetFontStyle, // 38 SetFontStyle(void *user, char *style) (void *)_SetFontStyle, // 38 SetFontStyle(void *user, char *style)
_SetFontSpacing, // 39 SetFontSpacing(void *user, int32 spacing) (void *)_SetFontSpacing, // 39 SetFontSpacing(void *user, int32 spacing)
_SetFontSize, // 40 SetFontSize(void *user, float size) (void *)_SetFontSize, // 40 SetFontSize(void *user, float size)
_SetFontRotate, // 41 SetFontRotate(void *user, float rotation) (void *)_SetFontRotate, // 41 SetFontRotate(void *user, float rotation)
_SetFontEncoding, // 42 SetFontEncoding(void *user, int32 encoding) (void *)_SetFontEncoding, // 42 SetFontEncoding(void *user, int32 encoding)
_SetFontFlags, // 43 SetFontFlags(void *user, int32 flags) (void *)_SetFontFlags, // 43 SetFontFlags(void *user, int32 flags)
_SetFontShear, // 44 SetFontShear(void *user, float shear) (void *)_SetFontShear, // 44 SetFontShear(void *user, float shear)
_op45, // 45 *reserved* (void *)_op45, // 45 *reserved*
_SetFontFace, // 46 SetFontFace(void *user, int32 flags) (void *)_SetFontFace, // 46 SetFontFace(void *user, int32 flags)
_op47, (void *)_op47,
_op48, (void *)_op48,
_op49, (void *)_op49,
NULL NULL
}; };
src/add-ons/print/shared/PicturePrinter.cpp
+1 -1
View File
@@ -391,7 +391,7 @@ void PicturePrinter::SetFontEncoding(int32 encoding) {
} }
#define PRINT_FLAG(flag) \ #define PRINT_FLAG(flag) \
if (flags & flag) { f |= flag; Print(##flag); } if (flags & flag) { f |= flag; Print(#flag); }
void PicturePrinter::SetFontFlags(int32 flags) { void PicturePrinter::SetFontFlags(int32 flags) {
Indent(); Print("SetFontFlags"); Indent(); Print("SetFontFlags");