Kaydet (Commit) 3159f9cd authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 3b5497f2
...@@ -38,7 +38,7 @@ using namespace ::com::sun::star; ...@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
#define JPEGMINREAD 512 #define JPEGMINREAD 512
extern "C" void* CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam ) extern "C" void* CreateBitmapFromJPEGReader( void* pJPEGReader, void* pJPEGCreateBitmapParam )
{ {
return ( (JPEGReader*) pJPEGReader )->CreateBitmap( pJPEGCreateBitmapParam ); return ( (JPEGReader*) pJPEGReader )->CreateBitmap( pJPEGCreateBitmapParam );
} }
......
...@@ -53,7 +53,7 @@ long WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, lo ...@@ -53,7 +53,7 @@ long WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, lo
void* GetScanline( void* pJPEGWriter, long nY ); void* GetScanline( void* pJPEGWriter, long nY );
void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ); 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 /* TODO: when incompatible changes are possible again
the preview size hint should be redone */ the preview size hint should be redone */
......
...@@ -146,7 +146,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ) ...@@ -146,7 +146,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines )
aCreateBitmapParam.X_density = cinfo.X_density; aCreateBitmapParam.X_density = cinfo.X_density;
aCreateBitmapParam.Y_density = cinfo.Y_density; aCreateBitmapParam.Y_density = cinfo.Y_density;
aCreateBitmapParam.bGray = cinfo.output_components == 1; aCreateBitmapParam.bGray = cinfo.output_components == 1;
pDIB = CreateBitmap( pJPEGReader, &aCreateBitmapParam ); pDIB = CreateBitmapFromJPEGReader( pJPEGReader, &aCreateBitmapParam );
nAlignedWidth = aCreateBitmapParam.nAlignedWidth; nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
range_limit=cinfo.sample_range_limit; range_limit=cinfo.sample_range_limit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment