fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-01-24 23:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbwin/hbwin.ch
  * contrib/hbwin/win_prn1.c
  * contrib/hbwin/win_tprn.prg
    + Added constants for bitmap types.
    * Minor cleanups to jpg/png handling.
This commit is contained in:
Viktor Szakats
2010-01-24 22:04:08 +00:00
parent ca5db97c84
commit 6e5932bd54
4 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-24 23:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/hbwin.ch
* contrib/hbwin/win_prn1.c
* contrib/hbwin/win_tprn.prg
+ Added constants for bitmap types.
* Minor cleanups to jpg/png handling.
2010-01-24 13:54 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbxbp/xbpdialog.prg
+ Implemented :maxSize and :minSize instance variables.
@@ -27,9 +34,9 @@
Currently only for XbpSLE and XbpMLE.
* contrib/hbxbp/xbpwindow.prg
! Method :isDerivedFrom( cClassOrObject ) extended to match
! Method :isDerivedFrom( cClassOrObject ) extended to match
the class name of oParent till it matches the given parameter.
I am wondering if this functionality be included in class
I am wondering if this functionality be included in class
engine itself. Przemek ?
2010-01-24 19:40 UTC+0100 Xavi (jarabal/at/gmail.com)

5
harbour/contrib/hbwin/hbwin.ch
View File

@@ -139,6 +139,11 @@
#define HB_WINFONT_CHARSET 4
#define HB_WINFONT_LEN_ 4
/* WIN_BITMAPTYPE() return values */
#define HB_WIN_BITMAP_BMP 1
#define HB_WIN_BITMAP_JPEG 2
#define HB_WIN_BITMAP_PNG 3
#define WIN_RGB( nR, nG, nB ) ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) )
/* Color constants for convenience */

40
harbour/contrib/hbwin/win_prn1.c
View File

@@ -510,27 +510,30 @@ HB_FUNC( WIN_GETDOCUMENTPROPERTIES )
/* Functions for loading & printing bitmaps */
/* Type BitMap: 1 == BM, 2 == JPEG, 3 == PNG [jarabal] */
static int hbwin_TypeBitMap( const void *pImgBuf )
#define HB_WIN_BITMAP_BMP 1
#define HB_WIN_BITMAP_JPEG 2
#define HB_WIN_BITMAP_PNG 3
static int hbwin_BitmapType( const void * pImgBuf )
{
int iType = 0;
if( pImgBuf )
{
if( memcmp( pImgBuf, "BM", 2 ) == 0 )
iType = 1;
iType = HB_WIN_BITMAP_BMP;
else if( memcmp( pImgBuf, "\377\330\377", 3 ) == 0 )
iType = 2;
iType = HB_WIN_BITMAP_JPEG;
else if( memcmp( pImgBuf, "\211PNG", 4 ) == 0 )
iType = 3;
iType = HB_WIN_BITMAP_PNG;
}
return iType;
}
HB_FUNC( WIN_TYPEBITMAP )
HB_FUNC( WIN_BITMAPTYPE )
{
hb_retni( hbwin_TypeBitMap( hb_parc( 1 ) ) );
hb_retni( hbwin_BitmapType( hb_parc( 1 ) ) );
}
HB_FUNC( WIN_LOADBITMAPFILE )
@@ -553,7 +556,7 @@ HB_FUNC( WIN_LOADBITMAPFILE )
hb_fsSeek( fhnd, 0, FS_SET );
if( hb_fsReadLarge( fhnd, pbmfh, ulSize ) == ulSize && hbwin_TypeBitMap( pbmfh ) )
if( hb_fsReadLarge( fhnd, pbmfh, ulSize ) == ulSize && hbwin_BitmapType( pbmfh ) )
hb_retclen_buffer( ( char * ) pbmfh, ( HB_SIZE ) ulSize );
else
hb_xfree( pbmfh );
@@ -571,15 +574,15 @@ HB_FUNC( WIN_LOADBITMAPFILE )
#define CHECKPNGFORMAT 4120
#endif
static HB_BOOL hbwin_CheckPrnDrvFormat( HDC hDC, int iType, const void *pImgBuf, ULONG ulSize, PHB_ITEM pItmErrMsg )
static HB_BOOL hbwin_CheckPrnDrvFormat( HDC hDC, int iType, const void * pImgBuf, ULONG ulSize, PHB_ITEM pItmErrMsg )
{
if( hDC && iType && pImgBuf && ulSize >= sizeof( BITMAPCOREHEADER ) )
{
if( iType == 1 )
if( iType == HB_WIN_BITMAP_BMP )
return HB_TRUE;
else
{
int iRes = iType = (iType == 2 ? CHECKJPEGFORMAT : CHECKPNGFORMAT);
int iRes = iType = ( iType == HB_WIN_BITMAP_JPEG ? CHECKJPEGFORMAT : CHECKPNGFORMAT );
iRes = ExtEscape( hDC, QUERYESCSUPPORT, sizeof(iRes), ( LPCSTR ) &iRes, 0, 0 );
if( iRes > 0 )
@@ -616,7 +619,7 @@ HB_FUNC( WIN_CHECKPRNDRVFORMAT )
{
const char * pImgBuf = hb_parc( 2 );
hb_retl( hbwin_CheckPrnDrvFormat( hbwapi_par_HDC( 1 ), hbwin_TypeBitMap( pImgBuf ), pImgBuf, hb_parclen( 2 ), hb_param( 3, HB_IT_BYREF ) ) );
hb_retl( hbwin_CheckPrnDrvFormat( hbwapi_par_HDC( 1 ), hbwin_BitmapType( pImgBuf ), pImgBuf, hb_parclen( 2 ), hb_param( 3, HB_IT_BYREF ) ) );
}
HB_FUNC( WIN_DRAWBITMAP )
@@ -626,14 +629,17 @@ HB_FUNC( WIN_DRAWBITMAP )
HDC hDC = hbwapi_par_HDC( 1 );
ULONG ulSize = hb_parclen( 2 );
BITMAPFILEHEADER * pbmfh = ( BITMAPFILEHEADER * ) hb_parc( 2 );
int cxDib = hb_parni( 7 ), cyDib = hb_parni( 8 ), iType = hbwin_TypeBitMap( pbmfh );
int iType = hbwin_BitmapType( pbmfh );
/* TOFIX: No check is done on 2nd parameter which is a large security hole
and may cause GPF in simple error cases.
[vszakats] */
if( hbwin_CheckPrnDrvFormat( hDC, iType, pbmfh, ulSize, NULL ) )
{
if( iType == 1 )
int cxDib = hb_parni( 7 );
int cyDib = hb_parni( 8 );
if( iType == HB_WIN_BITMAP_BMP )
{
pbmi = ( BITMAPINFO * ) ( pbmfh + 1 );
pBits = ( BYTE * ) pbmfh + pbmfh->bfOffBits;
@@ -660,13 +666,13 @@ HB_FUNC( WIN_DRAWBITMAP )
bmi.bmiHeader.biHeight = -cyDib; /* top-down image */
bmi.bmiHeader.biPlanes = 1;
bmi.bmiHeader.biBitCount = 0;
bmi.bmiHeader.biCompression = (iType == 2 ? BI_JPEG : BI_PNG);
bmi.bmiHeader.biCompression = ( iType == HB_WIN_BITMAP_JPEG ? BI_JPEG : BI_PNG );
bmi.bmiHeader.biSizeImage = ulSize;
pbmi = &bmi;
pBits = ( BYTE * ) pbmfh;
}
if( pBits )
if( pbmi && pBits )
{
SetStretchBltMode( hDC, COLORONCOLOR );
hb_retl( StretchDIBits( hDC, hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ),
@@ -684,7 +690,7 @@ HB_FUNC( WIN_BITMAPDIMENSIONS )
{
BITMAPFILEHEADER * pbmfh = ( BITMAPFILEHEADER * ) hb_parc( 1 );
if( hb_parclen( 1 ) >= sizeof( BITMAPCOREHEADER ) && hbwin_TypeBitMap( pbmfh ) == 1 )
if( hb_parclen( 1 ) >= sizeof( BITMAPCOREHEADER ) && hbwin_BitmapType( pbmfh ) == HB_WIN_BITMAP_BMP )
{
int cxDib, cyDib;
BITMAPINFO * pbmi = ( BITMAPINFO * ) ( pbmfh + 1 );

8
harbour/contrib/hbwin/win_tprn.prg
View File

@@ -799,7 +799,7 @@ METHOD New() CLASS WIN_BMP
METHOD LoadFile( cFileName, aDimXY ) CLASS WIN_BMP
::FileName := cFileName
IF ValType( aDimXY ) == "A"
IF ISARRAY( aDimXY )
::DimXY := aDimXY
ELSE
::DimXY := { 1, 1 } // Driver using the original dimensions
@@ -809,7 +809,7 @@ METHOD LoadFile( cFileName, aDimXY ) CLASS WIN_BMP
::Type := 0
::DimXY := { 0, 0 }
ELSE
::Type := win_TypeBitMap( ::Bitmap )
::Type := win_bitmapType( ::Bitmap )
ENDIF
RETURN ::Type > 0
@@ -820,10 +820,10 @@ METHOD Destroy() CLASS WIN_BMP // Compatibility function for Alaska Xbase++
RETURN NIL
METHOD Draw( oPrn, aRectangle, aDimXY ) CLASS WIN_BMP // Pass a WIN_PRN object reference & Rectangle array [& Image Dimensions X Y pixels array]
IF ValType( aRectangle ) == "A"
IF ISARRAY( aRectangle )
::Rect := aRectangle
ENDIF
IF ValType( aDimXY ) == "A"
IF ISARRAY( aDimXY )
::DimXY := aDimXY
ENDIF
RETURN oPrn:DrawBitMap( Self )