diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-03-21 22:01:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-03-21 22:01:16 +0200 |
| commit | 3159f9cd6113c7f3fe8c210c56be886bb0b897e8 (patch) | |
| tree | be6611f927bbae1d6d94109ddb0351b6a2bf8e31 /vcl | |
| parent | 3b5497f258fce37eebfc33536bfabb9016575cb5 (diff) | |
Avoid clash with the Win32 CreateBitmap()
On x64 Windows there is no name mangling for Win32 API calls, so a
plain extern "C" CreateBitmap() function clashes.
Change-Id: I39ca92c259f660f00952ec0a8065bae1e747cffb
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/jpeg/jpeg.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/filter/jpeg/jpeg.h | 2 | ||||
| -rw-r--r-- | vcl/source/filter/jpeg/jpegc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx index e32fe7488e48..206c92d67392 100644 --- a/vcl/source/filter/jpeg/jpeg.cxx +++ b/vcl/source/filter/jpeg/jpeg.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; #define JPEGMINREAD 512 -extern "C" void* CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam ) +extern "C" void* CreateBitmapFromJPEGReader( void* pJPEGReader, void* pJPEGCreateBitmapParam ) { return ( (JPEGReader*) pJPEGReader )->CreateBitmap( pJPEGCreateBitmapParam ); } diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h index 9c7e4b71d6a0..a6b5f0f24c06 100644 --- a/vcl/source/filter/jpeg/jpeg.h +++ b/vcl/source/filter/jpeg/jpeg.h @@ -53,7 +53,7 @@ long WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, lo void* GetScanline( void* pJPEGWriter, long nY ); void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ); -void* CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam ); +void* CreateBitmapFromJPEGReader( void* pJPEGReader, void* pJPEGCreateBitmapParam ); /* TODO: when incompatible changes are possible again the preview size hint should be redone */ diff --git a/vcl/source/filter/jpeg/jpegc.c b/vcl/source/filter/jpeg/jpegc.c index 7e2ae48fe264..16711d934710 100644 --- a/vcl/source/filter/jpeg/jpegc.c +++ b/vcl/source/filter/jpeg/jpegc.c @@ -146,7 +146,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ) aCreateBitmapParam.X_density = cinfo.X_density; aCreateBitmapParam.Y_density = cinfo.Y_density; aCreateBitmapParam.bGray = cinfo.output_components == 1; - pDIB = CreateBitmap( pJPEGReader, &aCreateBitmapParam ); + pDIB = CreateBitmapFromJPEGReader( pJPEGReader, &aCreateBitmapParam ); nAlignedWidth = aCreateBitmapParam.nAlignedWidth; range_limit=cinfo.sample_range_limit; |