summaryrefslogtreecommitdiff
path: root/vcl/source/filter/jpeg/JpegReader.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/filter/jpeg/JpegReader.hxx')
-rw-r--r--vcl/source/filter/jpeg/JpegReader.hxx23
1 files changed, 11 insertions, 12 deletions
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index 71f8b9ae37e2..c3b52fd2abf9 100644
--- a/vcl/source/filter/jpeg/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
@@ -39,34 +39,33 @@ struct JPEGCreateBitmapParam
unsigned long density_unit;
unsigned long X_density;
unsigned long Y_density;
- long bGray;
- long nAlignedWidth; // these members will be filled by the
- bool bTopDown; // CreateBitmap method in svtools
+ bool bGray;
+ bool bTopDown; // CreateBitmap method in svtools
};
class JPEGReader : public GraphicReader
{
SvStream& mrStream;
- Bitmap maBmp;
- Bitmap maBmp1;
- BitmapWriteAccess* mpAcc;
- BitmapWriteAccess* mpAcc1;
- unsigned char * mpBuffer;
+ Bitmap maBitmap;
+ Bitmap maIncompleteAlpha;
+
long mnLastPos;
long mnFormerPos;
long mnLastLines;
bool mbSetLogSize;
- Graphic CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines );
- void FillBitmap();
+ Graphic CreateIntermediateGraphic(long nLines);
public:
JPEGReader( SvStream& rStream, void* pCallData, bool bSetLogSize );
virtual ~JPEGReader() override;
- ReadState Read( Graphic& rGraphic );
- unsigned char * CreateBitmap( JPEGCreateBitmapParam& param );
+ ReadState Read(Graphic& rGraphic);
+
+ bool CreateBitmap(JPEGCreateBitmapParam& param);
+
+ Bitmap& GetBitmap() { return maBitmap; }
};
#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGREADER_HXX