diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-19 15:12:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-19 21:34:46 +0200 |
| commit | 3aef606f2758172a27718a06fea0ff9080e4d80f (patch) | |
| tree | ad323c90301d80bbb3b68163d8b87e5402b687ed /vcl/source/filter/jpeg/jpegc.cxx | |
| parent | 5afba3e12c8d4eb1ebb8e087134eb87593bb017a (diff) | |
use tools::Long in vcl
Change-Id: Ice1055021e8568634e9a66ba89d3bb4ef4e731df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104522
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/filter/jpeg/jpegc.cxx')
| -rw-r--r-- | vcl/source/filter/jpeg/jpegc.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index 0270cc448e82..804278ec8300 100644 --- a/vcl/source/filter/jpeg/jpegc.cxx +++ b/vcl/source/filter/jpeg/jpegc.cxx @@ -154,7 +154,7 @@ struct JpegStuff } -static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream, long* pLines, +static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream, tools::Long* pLines, GraphicFilterImportFlags nImportFlags, BitmapScopedWriteAccess* ppAccess) { @@ -182,10 +182,10 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS jpeg_calc_output_dimensions(&rContext.cinfo); - long nWidth = rContext.cinfo.output_width; - long nHeight = rContext.cinfo.output_height; + tools::Long nWidth = rContext.cinfo.output_width; + tools::Long nHeight = rContext.cinfo.output_height; - long nResult = 0; + tools::Long nResult = 0; if (utl::ConfigManager::IsFuzzing() && (o3tl::checked_multiply(nWidth, nHeight, nResult) || nResult > 4000000)) return; @@ -284,7 +284,7 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS { // convert CMYK to RGB Scanline pScanline = pAccess->GetScanline(yIndex); - for (long cmyk = 0, x = 0; cmyk < nWidth * 4; cmyk += 4, ++x) + for (tools::Long cmyk = 0, x = 0; cmyk < nWidth * 4; cmyk += 4, ++x) { int color_C = 255 - rContext.pCYMKBuffer[cmyk + 0]; int color_M = 255 - rContext.pCYMKBuffer[cmyk + 1]; @@ -324,7 +324,7 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS } } -void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines, +void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, tools::Long* pLines, GraphicFilterImportFlags nImportFlags, BitmapScopedWriteAccess* ppAccess ) { @@ -333,14 +333,14 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines, } bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, - long nWidth, long nHeight, basegfx::B2DSize const & rPPI, bool bGreys, - long nQualityPercent, long aChromaSubsampling, + tools::Long nWidth, tools::Long nHeight, basegfx::B2DSize const & rPPI, bool bGreys, + tools::Long nQualityPercent, tools::Long aChromaSubsampling, css::uno::Reference<css::task::XStatusIndicator> const & status ) { jpeg_compress_struct cinfo; ErrorManagerStruct jerr; void* pScanline; - long nY; + tools::Long nY; JpegCompressOwner aOwner; @@ -425,7 +425,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, return true; } -void Transform(void* pInputStream, void* pOutputStream, long nAngle) +void Transform(void* pInputStream, void* pOutputStream, tools::Long nAngle) { jpeg_transform_info aTransformOption; JCOPY_OPTION aCopyOption = JCOPYOPT_ALL; |