[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/filter/jpeg/jpeg.cxx |    2 +-
 vcl/source/filter/jpeg/jpeg.h   |    2 +-
 vcl/source/filter/jpeg/jpegc.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3159f9cd6113c7f3fe8c210c56be886bb0b897e8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Mar 21 22:01:05 2013 +0200

    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

diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index e32fe74..206c92d 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 9c7e4b7..a6b5f0f 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 7e2ae48..16711d9 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;