summaryrefslogtreecommitdiff
path: root/vcl/source/filter/jpeg
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-21 12:53:51 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-21 12:53:51 +0100
commite8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch)
treedae18a3acbf29c192118e7c003f80df8da8e21ae /vcl/source/filter/jpeg
parent1c8402465cfd4df862409dc310f5f099d044c4d8 (diff)
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'vcl/source/filter/jpeg')
-rw-r--r--vcl/source/filter/jpeg/JpegReader.cxx2
-rw-r--r--vcl/source/filter/jpeg/JpegReader.hxx2
-rw-r--r--vcl/source/filter/jpeg/JpegWriter.cxx8
-rw-r--r--vcl/source/filter/jpeg/JpegWriter.hxx4
-rw-r--r--vcl/source/filter/jpeg/jpeg.h2
-rw-r--r--vcl/source/filter/jpeg/jpegc.cxx8
6 files changed, 13 insertions, 13 deletions
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 5e5c6ac9e9c9..e473df1e7a7d 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -285,7 +285,7 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
else
{
pParam->nAlignedWidth = AlignedWidth4Bytes( aSize.Width() * ( bGray ? 8 : 24 ) );
- pParam->bTopDown = sal_True;
+ pParam->bTopDown = true;
pBmpBuf = mpBuffer = new unsigned char[pParam->nAlignedWidth * aSize.Height()];
}
}
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index 442c52d78ef2..978317a59c9d 100644
--- a/vcl/source/filter/jpeg/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
@@ -43,7 +43,7 @@ struct JPEGCreateBitmapParam
long bGray;
long nAlignedWidth; // these members will be filled by the
- long bTopDown; // CreateBitmap method in svtools
+ bool bTopDown; // CreateBitmap method in svtools
};
class JPEGReader : public GraphicReader
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index e763314138e9..78a96d43eeeb 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -186,9 +186,9 @@ void* JPEGWriter::GetScanline( long nY )
return pScanline;
}
-sal_Bool JPEGWriter::Write( const Graphic& rGraphic )
+bool JPEGWriter::Write( const Graphic& rGraphic )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( mxStatusIndicator.is() )
{
@@ -223,7 +223,7 @@ sal_Bool JPEGWriter::Write( const Graphic& rGraphic )
}
}
if ( bIsGrey )
- mbGreys = sal_True;
+ mbGreys = true;
}
if( mpExpWasGrey )
@@ -236,7 +236,7 @@ sal_Bool JPEGWriter::Write( const Graphic& rGraphic )
if( !mbNative )
mpBuffer = new sal_uInt8[ AlignedWidth4Bytes( mbGreys ? mpReadAccess->Width() * 8L : mpReadAccess->Width() * 24L ) ];
- bRet = (sal_Bool) WriteJPEG( this, &mrStream, mpReadAccess->Width(), mpReadAccess->Height(), mbGreys, mnQuality, maChromaSubsampling, mxStatusIndicator );
+ bRet = WriteJPEG( this, &mrStream, mpReadAccess->Width(), mpReadAccess->Height(), mbGreys, mnQuality, maChromaSubsampling, mxStatusIndicator );
delete[] mpBuffer;
mpBuffer = NULL;
diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx
index 88b6352f0c1b..8c4b13bbf197 100644
--- a/vcl/source/filter/jpeg/JpegWriter.hxx
+++ b/vcl/source/filter/jpeg/JpegWriter.hxx
@@ -33,7 +33,7 @@ class JPEGWriter
BitmapReadAccess* mpReadAccess;
sal_uInt8* mpBuffer;
bool mbNative;
- sal_Bool mbGreys;
+ bool mbGreys;
sal_Int32 mnQuality;
sal_Int32 maChromaSubsampling;
@@ -49,7 +49,7 @@ public:
virtual ~JPEGWriter() {};
void* GetScanline( long nY );
- sal_Bool Write( const Graphic& rGraphic );
+ bool Write( const Graphic& rGraphic );
};
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index 01209ba56509..1f8c21f62aac 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -38,7 +38,7 @@ void jpeg_svstream_src (j_decompress_ptr cinfo, void* infile);
void jpeg_svstream_dest (j_compress_ptr cinfo, void* outfile);
-long WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, long nWidth, long nHeight, long bGreyScale,
+bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, long nWidth, long nHeight, bool bGreyScale,
long nQualityPercent, long aChromaSubsampling,
css::uno::Reference<css::task::XStatusIndicator> const & status);
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 3f52a2f024b9..6cbb5899d855 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -217,8 +217,8 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
jpeg_destroy_decompress( &cinfo );
}
-long WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
- long nWidth, long nHeight, long bGreys,
+bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
+ long nWidth, long nHeight, bool bGreys,
long nQualityPercent, long aChromaSubsampling,
css::uno::Reference<css::task::XStatusIndicator> const & status )
{
@@ -230,7 +230,7 @@ long WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
if ( setjmp( jerr.setjmp_buffer ) )
{
jpeg_destroy_compress( &cinfo );
- return 0;
+ return false;
}
cinfo.err = jpeg_std_error( &jerr.pub );
@@ -295,7 +295,7 @@ long WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
jpeg_finish_compress(&cinfo);
jpeg_destroy_compress( &cinfo );
- return 1;
+ return true;
}
long Transform(void* pInputStream, void* pOutputStream, long nAngle)