diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:10:40 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:10:40 +0100 |
commit | 55f07d4daa76503530d96b9c20b53c59bcd5bcf9 (patch) | |
tree | 7ad8a720341e38258dab12597d25616c3bff8807 /vcl/workben | |
parent | e235da515af0e2a5d5a0cf80773943b65fdb8f7b (diff) |
More loplugin:cstylecast: vcl
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: I363c01a1ae9e863fca4fb4589829492d7280d711
Diffstat (limited to 'vcl/workben')
-rw-r--r-- | vcl/workben/fftester.cxx | 86 | ||||
-rw-r--r-- | vcl/workben/icontest.cxx | 8 | ||||
-rw-r--r-- | vcl/workben/outdevgrind.cxx | 6 | ||||
-rw-r--r-- | vcl/workben/svptest.cxx | 16 | ||||
-rw-r--r-- | vcl/workben/vcldemo.cxx | 30 |
5 files changed, 73 insertions, 73 deletions
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index 8957a89480cb..0b44e408cce6 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -109,43 +109,43 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { GDIMetaFile aGDIMetaFile; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) ReadWindowMetafile(aFileStream, aGDIMetaFile); + ret = static_cast<int>(ReadWindowMetafile(aFileStream, aGDIMetaFile)); } else if (strcmp(argv[2], "jpg") == 0) { Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) ImportJPEG(aFileStream, aGraphic, GraphicFilterImportFlags::NONE, nullptr); + ret = static_cast<int>(ImportJPEG(aFileStream, aGraphic, GraphicFilterImportFlags::NONE, nullptr)); } else if (strcmp(argv[2], "gif") == 0) { SvFileStream aFileStream(out, StreamMode::READ); Graphic aGraphic; - ret = (int) ImportGIF(aFileStream, aGraphic); + ret = static_cast<int>(ImportGIF(aFileStream, aGraphic)); } else if (strcmp(argv[2], "xbm") == 0) { Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) ImportXBM(aFileStream, aGraphic); + ret = static_cast<int>(ImportXBM(aFileStream, aGraphic)); } else if (strcmp(argv[2], "xpm") == 0) { Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) ImportXPM(aFileStream, aGraphic); + ret = static_cast<int>(ImportXPM(aFileStream, aGraphic)); } else if (strcmp(argv[2], "png") == 0) { SvFileStream aFileStream(out, StreamMode::READ); vcl::PNGReader aReader(aFileStream); - ret = (int) !!aReader.Read(); + ret = static_cast<int>(!!aReader.Read()); } else if (strcmp(argv[2], "bmp") == 0) { Bitmap aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) ReadDIB(aTarget, aFileStream, true); + ret = static_cast<int>(ReadDIB(aTarget, aFileStream, true)); } else if (strcmp(argv[2], "svm") == 0) { @@ -167,7 +167,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "dxf") == 0) { @@ -182,7 +182,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "met") == 0) { @@ -197,7 +197,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if ((strcmp(argv[2], "pbm") == 0) || strcmp(argv[2], "ppm") == 0) { @@ -212,7 +212,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "psd") == 0) { @@ -227,7 +227,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "eps") == 0) { @@ -242,7 +242,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "pct") == 0) { @@ -257,7 +257,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "pcx") == 0) { @@ -272,7 +272,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "ras") == 0) { @@ -287,7 +287,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "tga") == 0) { @@ -302,7 +302,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if (strcmp(argv[2], "tif") == 0) { @@ -317,7 +317,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); + ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); } else if ((strcmp(argv[2], "doc") == 0) || (strcmp(argv[2], "ww8") == 0)) { @@ -331,7 +331,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "ww6") == 0) { @@ -345,7 +345,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "ww2") == 0) { @@ -359,7 +359,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "rtf") == 0) { @@ -373,7 +373,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "html") == 0) { @@ -387,7 +387,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "fodt") == 0) { @@ -401,7 +401,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "docx") == 0) { @@ -415,7 +415,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "fods") == 0) { @@ -429,7 +429,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "xlsx") == 0) { @@ -443,7 +443,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "fodp") == 0) { @@ -457,7 +457,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "pptx") == 0) { @@ -471,7 +471,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "xls") == 0) { @@ -485,7 +485,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "wks") == 0) { @@ -499,7 +499,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "hwp") == 0) { @@ -513,7 +513,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "602") == 0) { @@ -527,7 +527,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "lwp") == 0) { @@ -541,7 +541,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "ppt") == 0) { @@ -555,7 +555,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "cgm") == 0) { @@ -569,7 +569,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "qpw") == 0) { @@ -583,7 +583,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "dif") == 0) { @@ -597,7 +597,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "sc-rtf") == 0) { @@ -611,7 +611,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "slk") == 0) { @@ -625,7 +625,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "ole") == 0) { @@ -639,7 +639,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "mml") == 0) { @@ -653,7 +653,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } else if (strcmp(argv[2], "mtp") == 0) { @@ -667,7 +667,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aLibrary.release(); } SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream); + ret = static_cast<int>((*pfnImport)(aFileStream)); } #endif } diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index 08524157f906..0806ddcaf98c 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -52,8 +52,8 @@ namespace { { TimeValue aValue; osl_getSystemTime(&aValue); - return (double)aValue.Seconds + - (double)aValue.Nanosec / (1000*1000*1000); + return static_cast<double>(aValue.Seconds) + + static_cast<double>(aValue.Nanosec) / (1000*1000*1000); } } @@ -103,9 +103,9 @@ void MyWorkWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan std::cout << "==> Paint! " << mnPaintCount++ << " (vcl) " << GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl; Size aGraphicSize( maGraphic.GetSizePixel() ); - float aspect = ((float) aGraphicSize.Width()) / aGraphicSize.Height(); + float aspect = static_cast<float>(aGraphicSize.Width()) / aGraphicSize.Height(); Size aSize; - if( aspect >= ((float) WIDTH) / HEIGHT ) + if( aspect >= (float(WIDTH)) / HEIGHT ) aSize = Size( WIDTH, HEIGHT/aspect ); else aSize = Size( WIDTH * aspect, HEIGHT ); diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 60d5c61db837..79e025ad3b79 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -561,7 +561,7 @@ void setupMethodStubs( functor_vector_type& res ) add(res, "DrawTransparent", [&] (OutputDevice * pDev) { - return pDev->DrawTransparent(aPoly3, (sal_uInt16)50); + return pDev->DrawTransparent(aPoly3, sal_uInt16(50)); }); /* void DrawTransparent( const GDIMetaFile& rMtf, @@ -596,8 +596,8 @@ void grindFunc( OutputDevice& rTarget, fprintf( stdout, "Duration: %d ms (%d repetitions)\tOperation: %s\tSetup: %s\n", - (int)(osl_getGlobalTimer() - nStartTime), - (int)nTurns, + static_cast<int>(osl_getGlobalTimer() - nStartTime), + static_cast<int>(nTurns), iter->first, pMsg ); } diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index b107ccdca990..21a6a86d20fe 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -107,13 +107,13 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : { for( int nY = 0; nY < 256; nY++ ) { - double fRed = 255.0-1.5*sqrt((double)(nX*nX+nY*nY)); + double fRed = 255.0-1.5*sqrt(static_cast<double>(nX*nX+nY*nY)); if( fRed < 0.0 ) fRed = 0.0; - double fGreen = 255.0-1.5*sqrt((double)((255-nX)*(255-nX)+nY*nY)); + double fGreen = 255.0-1.5*sqrt(static_cast<double>((255-nX)*(255-nX)+nY*nY)); if( fGreen < 0.0 ) fGreen = 0.0; - double fBlue = 255.0-1.5*sqrt((double)((128-nX)*(128-nX)+(255-nY)*(255-nY))); + double fBlue = 255.0-1.5*sqrt(static_cast<double>((128-nX)*(128-nX)+(255-nY)*(255-nY))); if( fBlue < 0.0 ) fBlue = 0.0; pAcc->SetPixel( nY, nX, BitmapColor( sal_uInt8(fRed), sal_uInt8(fGreen), sal_uInt8(fBlue) ) ); @@ -141,7 +141,7 @@ static Point project( const Point& rPoint ) //double y2 = y1 * cos( angle_z ) - x1 * sin( angle_z ); double z2 = z1; - return Point( (sal_Int32)x2, (sal_Int32)z2 ); + return Point( static_cast<sal_Int32>(x2), static_cast<sal_Int32>(z2) ); } static Color approachColor( const Color& rFrom, const Color& rTo ) @@ -310,11 +310,11 @@ void MyWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rR rRenderContext.DrawLine(project(aP1) + aCenter, project(aP2) + aCenter, aLineInfo); - aPoint.X() = (int)((((double)aP1.X())*cosd - ((double)aP1.Y())*sind)*factor); - aPoint.Y() = (int)((((double)aP1.Y())*cosd + ((double)aP1.X())*sind)*factor); + aPoint.X() = static_cast<int>((static_cast<double>(aP1.X())*cosd - static_cast<double>(aP1.Y())*sind)*factor); + aPoint.Y() = static_cast<int>((static_cast<double>(aP1.Y())*cosd + static_cast<double>(aP1.X())*sind)*factor); aP1 = aPoint; - aPoint.X() = (int)((((double)aP2.X())*cosd - ((double)aP2.Y())*sind)*factor); - aPoint.Y() = (int)((((double)aP2.Y())*cosd + ((double)aP2.X())*sind)*factor); + aPoint.X() = static_cast<int>((static_cast<double>(aP2.X())*cosd - static_cast<double>(aP2.Y())*sind)*factor); + aPoint.Y() = static_cast<int>((static_cast<double>(aP2.Y())*cosd + static_cast<double>(aP2.X())*sind)*factor); aP2 = aPoint; } rRenderContext.Pop(); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index fdc1f9b85098..f94414b380d2 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -71,8 +71,8 @@ namespace { { TimeValue aValue; osl_getSystemTime(&aValue); - return (double)aValue.Seconds * 1000 + - (double)aValue.Nanosec / (1000*1000); + return static_cast<double>(aValue.Seconds) * 1000 + + static_cast<double>(aValue.Nanosec) / (1000*1000); } } @@ -1087,7 +1087,7 @@ public: { ScopedVclPtr<VirtualDevice> pNested; - if ((int)eType < RENDER_AS_BITMAPEX) + if (static_cast<int>(eType) < RENDER_AS_BITMAPEX) pNested = VclPtr<VirtualDevice>::Create(rDev).get(); else pNested = VclPtr<VirtualDevice>::Create(rDev,DeviceFormat::DEFAULT,DeviceFormat::DEFAULT).get(); @@ -1244,16 +1244,16 @@ public: switch (i % 4) { case 2: - aTransform.shearX((double)((i >> 2) % 8) / 8); - aTransform.shearY((double)((i >> 4) % 8) / 8); + aTransform.shearX(static_cast<double>((i >> 2) % 8) / 8); + aTransform.shearY(static_cast<double>((i >> 4) % 8) / 8); break; case 3: aTransform.translate(-aSize.Width()/2, -aSize.Height()/2); aTransform.rotate(i); if (i & 0x100) { - aTransform.shearX((double)((i >> 2) % 8) / 8); - aTransform.shearY((double)((i >> 4) % 8) / 8); + aTransform.shearX(static_cast<double>((i >> 2) % 8) / 8); + aTransform.shearY(static_cast<double>((i >> 4) % 8) / 8); } aTransform.translate(aSize.Width()/2, aSize.Height()/2); break; @@ -1313,9 +1313,9 @@ public: { BitmapColor aColW = pAccW->GetPixel(y,x); BitmapColor aColB = pAccB->GetPixel(y,x); - long nAR = (long)(aColW.GetRed() - aColB.GetRed()); // (1-a) - long nAG = (long)(aColW.GetGreen() - aColB.GetGreen()); // (1-a) - long nAB = (long)(aColW.GetBlue() - aColB.GetBlue()); // (1-a) + long nAR = static_cast<long>(aColW.GetRed() - aColB.GetRed()); // (1-a) + long nAG = static_cast<long>(aColW.GetGreen() - aColB.GetGreen()); // (1-a) + long nAB = static_cast<long>(aColW.GetBlue() - aColB.GetBlue()); // (1-a) #define CLAMP(a,b,c) (((a)<=(b))?(b):(((a)>=(c))?(c):(a))) @@ -1324,7 +1324,7 @@ public: nInverseAlpha = CLAMP(nInverseAlpha, 0, 255); long nAlpha = 255 - nInverseAlpha; - pMaskAcc->SetPixel(y,x,BitmapColor((sal_Int8)CLAMP(nInverseAlpha,0,255))); + pMaskAcc->SetPixel(y,x,BitmapColor(static_cast<sal_Int8>(CLAMP(nInverseAlpha,0,255)))); // now recover the pixels long nR = (aColW.GetRed() + aColB.GetRed() - nInverseAlpha) * 128; long nG = (aColW.GetGreen() + aColB.GetGreen() - nInverseAlpha) * 128; @@ -1338,9 +1338,9 @@ public: nR /= nAlpha; nG /= nAlpha; nB /= nAlpha; } pRecAcc->SetPixel(y,x,BitmapColor( - (sal_uInt8)CLAMP(nR,0,255), - (sal_uInt8)CLAMP(nG,0,255), - (sal_uInt8)CLAMP(nB,0,255))); + static_cast<sal_uInt8>(CLAMP(nR,0,255)), + static_cast<sal_uInt8>(CLAMP(nG,0,255)), + static_cast<sal_uInt8>(CLAMP(nB,0,255)))); #undef CLAMP } } @@ -1693,7 +1693,7 @@ void DemoRenderer::selectRenderer(const OUString &rName ) int DemoRenderer::selectNextRenderer() { mnSelectedRenderer++; - if (mnSelectedRenderer == (signed) maRenderers.size()) + if (mnSelectedRenderer == static_cast<signed>(maRenderers.size())) mnSelectedRenderer = -1; Invalidate(); return mnSelectedRenderer; |