Index: src/af/gr/win/gr_Win32Image.h =================================================================== RCS file: /cvsroot/abi/src/af/gr/win/gr_Win32Image.h,v retrieving revision 1.5 diff -u -r1.5 gr_Win32Image.h --- src/af/gr/win/gr_Win32Image.h 2000/06/19 01:53:50 1.5 +++ src/af/gr/win/gr_Win32Image.h 2000/06/19 13:04:30 @@ -30,9 +30,9 @@ GR_Win32Image(const char* szName); ~GR_Win32Image(); - virtual UT_Bool convertToPNG(UT_ByteBuf** ppBB) const; - virtual UT_Bool convertFromPNG(const UT_ByteBuf* pBB, UT_sint32 iDisplayWidth, UT_sint32 iDisplayHeight); - + virtual UT_Bool convertFromBuffer(const UT_ByteBuf* pBB, UT_sint32 iDisplayWidth, UT_sint32 iDisplayHeight); + virtual UT_Bool convertToBuffer(UT_ByteBuf** ppBB) const; + void setDIB(BITMAPINFO *pDIB) { m_pDIB = pDIB; } inline BITMAPINFO* getDIB(void) const { return m_pDIB; } Index: src/af/xap/win/xap_Win32Dlg_About.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32Dlg_About.cpp,v retrieving revision 1.16 diff -u -r1.16 xap_Win32Dlg_About.cpp --- src/af/xap/win/xap_Win32Dlg_About.cpp 2000/05/10 11:28:43 1.16 +++ src/af/xap/win/xap_Win32Dlg_About.cpp 2000/06/19 13:04:30 @@ -91,8 +91,8 @@ UT_PNG_getDimensions(pBB, iImageWidth, iImageHeight); - m_pGrImageSidebar = new GR_Win32Image(NULL,NULL); - m_pGrImageSidebar->convertFromPNG(pBB, iImageWidth, iImageHeight); + m_pGrImageSidebar = new GR_Win32Image(NULL); + m_pGrImageSidebar->convertFromBuffer(pBB, iImageWidth, iImageHeight); DELETEP(pBB);