summaryrefslogtreecommitdiff
path: root/vcl/source/bitmap
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/bitmap')
-rw-r--r--vcl/source/bitmap/BitmapProcessor.cxx30
-rw-r--r--vcl/source/bitmap/BitmapTools.cxx8
2 files changed, 19 insertions, 19 deletions
diff --git a/vcl/source/bitmap/BitmapProcessor.cxx b/vcl/source/bitmap/BitmapProcessor.cxx
index 44a0f7d54bea..68a50bdd80e7 100644
--- a/vcl/source/bitmap/BitmapProcessor.cxx
+++ b/vcl/source/bitmap/BitmapProcessor.cxx
@@ -137,9 +137,9 @@ void BitmapProcessor::colorizeImage(BitmapEx& rBitmapEx, Color aColor)
BitmapColor aBitmapColor;
const long nW = pWriteAccess->Width();
const long nH = pWriteAccess->Height();
- std::vector<sal_uInt8> pMapR(256);
- std::vector<sal_uInt8> pMapG(256);
- std::vector<sal_uInt8> pMapB(256);
+ std::vector<sal_uInt8> aMapR(256);
+ std::vector<sal_uInt8> aMapG(256);
+ std::vector<sal_uInt8> aMapB(256);
long nX;
long nY;
@@ -149,9 +149,9 @@ void BitmapProcessor::colorizeImage(BitmapEx& rBitmapEx, Color aColor)
for (nX = 0; nX < 256; ++nX)
{
- pMapR[nX] = MinMax((nX + cR) / 2, 0, 255);
- pMapG[nX] = MinMax((nX + cG) / 2, 0, 255);
- pMapB[nX] = MinMax((nX + cB) / 2, 0, 255);
+ aMapR[nX] = MinMax((nX + cR) / 2, 0, 255);
+ aMapG[nX] = MinMax((nX + cG) / 2, 0, 255);
+ aMapB[nX] = MinMax((nX + cB) / 2, 0, 255);
}
if (pWriteAccess->HasPalette())
@@ -159,9 +159,9 @@ void BitmapProcessor::colorizeImage(BitmapEx& rBitmapEx, Color aColor)
for (sal_uInt16 i = 0, nCount = pWriteAccess->GetPaletteEntryCount(); i < nCount; i++)
{
const BitmapColor& rCol = pWriteAccess->GetPaletteColor(i);
- aBitmapColor.SetRed(pMapR[rCol.GetRed()]);
- aBitmapColor.SetGreen(pMapG[rCol.GetGreen()]);
- aBitmapColor.SetBlue(pMapB[rCol.GetBlue()]);
+ aBitmapColor.SetRed(aMapR[rCol.GetRed()]);
+ aBitmapColor.SetGreen(aMapG[rCol.GetGreen()]);
+ aBitmapColor.SetBlue(aMapB[rCol.GetBlue()]);
pWriteAccess->SetPaletteColor(i, aBitmapColor);
}
}
@@ -173,9 +173,9 @@ void BitmapProcessor::colorizeImage(BitmapEx& rBitmapEx, Color aColor)
for (nX = 0; nX < nW; ++nX)
{
- *pScan = pMapB[*pScan]; pScan++;
- *pScan = pMapG[*pScan]; pScan++;
- *pScan = pMapR[*pScan]; pScan++;
+ *pScan = aMapB[*pScan]; pScan++;
+ *pScan = aMapG[*pScan]; pScan++;
+ *pScan = aMapR[*pScan]; pScan++;
}
}
}
@@ -186,9 +186,9 @@ void BitmapProcessor::colorizeImage(BitmapEx& rBitmapEx, Color aColor)
for (nX = 0; nX < nW; ++nX)
{
aBitmapColor = pWriteAccess->GetPixel(nY, nX);
- aBitmapColor.SetRed(pMapR[aBitmapColor.GetRed()]);
- aBitmapColor.SetGreen(pMapG[aBitmapColor.GetGreen()]);
- aBitmapColor.SetBlue(pMapB[aBitmapColor.GetBlue()]);
+ aBitmapColor.SetRed(aMapR[aBitmapColor.GetRed()]);
+ aBitmapColor.SetGreen(aMapG[aBitmapColor.GetGreen()]);
+ aBitmapColor.SetBlue(aMapB[aBitmapColor.GetBlue()]);
pWriteAccess->SetPixel(nY, nX, aBitmapColor);
}
}
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index a82b95ca924c..e9aef95fb00d 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -35,11 +35,11 @@ void BitmapTools::loadFromSvg(SvStream& rStream, const OUString& sPath, BitmapEx
const uno::Reference<graphic::XSvgParser> xSvgParser = graphic::SvgTools::create(xContext);
sal_Size nSize = rStream.remainingSize();
- std::vector<sal_Int8> pBuffer(nSize + 1);
- rStream.Read(pBuffer.data(), nSize);
- pBuffer[nSize] = 0;
+ std::vector<sal_Int8> aBuffer(nSize + 1);
+ rStream.Read(aBuffer.data(), nSize);
+ aBuffer[nSize] = 0;
- uno::Sequence<sal_Int8> aData(pBuffer.data(), nSize + 1);
+ uno::Sequence<sal_Int8> aData(aBuffer.data(), nSize + 1);
uno::Reference<io::XInputStream> aInputStream(new comphelper::SequenceInputStream(aData));
Primitive2DSequence aPrimitiveSequence = xSvgParser->getDecomposition(aInputStream, sPath);