]>
Commit | Line | Data |
---|---|---|
05f25247 | 1 | --- oo/vcl/unx/source/gdi/salgdi2.cxx.orig Fri May 23 18:44:38 2003 |
2 | +++ oo/vcl/unx/source/gdi/salgdi2.cxx Fri May 23 18:50:05 2003 | |
3 | @@ -410,8 +410,8 @@ | |
4 | Scanline mpScanAccess; | |
5 | sal_Int32 mnScanOffset; | |
6 | ||
7 | - sal_uInt32 ColorOf (BitmapColor& rColor) const; | |
8 | - sal_uInt8 GrayOf (BitmapColor& rColor) const; | |
9 | + sal_uInt32 ColorOf (const BitmapColor& rColor) const; | |
10 | + sal_uInt8 GrayOf (const BitmapColor& rColor) const; | |
11 | ||
12 | SalPrinterBmp (); | |
13 | ||
14 | @@ -536,7 +536,7 @@ | |
15 | } | |
16 | ||
17 | sal_uInt32 | |
18 | -SalPrinterBmp::ColorOf (BitmapColor& rColor) const | |
19 | +SalPrinterBmp::ColorOf (const BitmapColor& rColor) const | |
20 | { | |
21 | if (rColor.IsIndex()) | |
22 | return ColorOf (mpBmpBuffer->maPalette[rColor.GetIndex()]); | |
23 | @@ -547,7 +547,7 @@ | |
24 | } | |
25 | ||
26 | sal_uInt8 | |
27 | -SalPrinterBmp::GrayOf (BitmapColor& rColor) const | |
28 | +SalPrinterBmp::GrayOf (const BitmapColor& rColor) const | |
29 | { | |
30 | if (rColor.IsIndex()) | |
31 | return GrayOf (mpBmpBuffer->maPalette[rColor.GetIndex()]); | |
32 | @@ -573,7 +573,7 @@ | |
33 | SalPrinterBmp::GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const | |
34 | { | |
35 | Scanline pScan = mpScanAccess + nRow * mnScanOffset; | |
36 | - BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); | |
37 | + const BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); | |
38 | ||
39 | return ColorOf (aColor); | |
40 | } | |
41 | @@ -582,7 +582,7 @@ | |
42 | SalPrinterBmp::GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const | |
43 | { | |
44 | Scanline pScan = mpScanAccess + nRow * mnScanOffset; | |
45 | - BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); | |
46 | + const BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); | |
47 | ||
48 | return GrayOf (aColor); | |
49 | } | |
50 | @@ -591,7 +591,7 @@ | |
51 | SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const | |
52 | { | |
53 | Scanline pScan = mpScanAccess + nRow * mnScanOffset; | |
54 | - BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); | |
55 | + const BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); | |
56 | ||
57 | if (aColor.IsIndex()) | |
58 | return aColor.GetIndex(); |