From fe84e6e486f4201519a35371eecf0b5fd0778ded Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 24 Jan 2010 22:19:36 +0000
Subject: [PATCH] 2010-01-24 23:18 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbwin/hbwin.ch   * contrib/hbwin/win_prn1.c   *
 contrib/hbwin/win_tprn.prg     + Added HB_WIN_BITMAP_UNKNOWN.

---
 harbour/ChangeLog                  | 6 ++++++
 harbour/contrib/hbwin/hbwin.ch     | 1 +
 harbour/contrib/hbwin/win_prn1.c   | 5 +++--
 harbour/contrib/hbwin/win_tprn.prg | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2058e28c7d..93c729e0f7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-24 23:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/hbwin.ch
+  * contrib/hbwin/win_prn1.c
+  * contrib/hbwin/win_tprn.prg
+    + Added HB_WIN_BITMAP_UNKNOWN.
+
 2010-01-24 23:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbwin/hbwin.ch
   * contrib/hbwin/win_prn1.c
diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch
index 8d1cf15562..77f23b8fb5 100644
--- a/harbour/contrib/hbwin/hbwin.ch
+++ b/harbour/contrib/hbwin/hbwin.ch
@@ -140,6 +140,7 @@
 #define HB_WINFONT_LEN_             4
 
 /* WIN_BITMAPTYPE() return values */
+#define HB_WIN_BITMAP_UNKNOWN       0
 #define HB_WIN_BITMAP_BMP           1
 #define HB_WIN_BITMAP_JPEG          2
 #define HB_WIN_BITMAP_PNG           3
diff --git a/harbour/contrib/hbwin/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c
index f879d49e22..017d007e26 100644
--- a/harbour/contrib/hbwin/win_prn1.c
+++ b/harbour/contrib/hbwin/win_prn1.c
@@ -510,13 +510,14 @@ HB_FUNC( WIN_GETDOCUMENTPROPERTIES )
 
 /* Functions for loading & printing bitmaps */
 
+#define HB_WIN_BITMAP_UNKNOWN       0
 #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;
+   int iType = HB_WIN_BITMAP_UNKNOWN;
 
    if( pImgBuf )
    {
@@ -556,7 +557,7 @@ HB_FUNC( WIN_LOADBITMAPFILE )
 
          hb_fsSeek( fhnd, 0, FS_SET );
 
-         if( hb_fsReadLarge( fhnd, pbmfh, ulSize ) == ulSize && hbwin_BitmapType( pbmfh ) )
+         if( hb_fsReadLarge( fhnd, pbmfh, ulSize ) == ulSize && hbwin_BitmapType( pbmfh ) != HB_WIN_BITMAP_UNKNOWN )
             hb_retclen_buffer( ( char * ) pbmfh, ( HB_SIZE ) ulSize );
          else
             hb_xfree( pbmfh );
diff --git a/harbour/contrib/hbwin/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg
index af80ef818a..d102b51699 100644
--- a/harbour/contrib/hbwin/win_tprn.prg
+++ b/harbour/contrib/hbwin/win_tprn.prg
@@ -811,7 +811,7 @@ METHOD LoadFile( cFileName, aDimXY ) CLASS WIN_BMP
    ELSE
       ::Type := win_bitmapType( ::Bitmap )
    ENDIF
-   RETURN ::Type > 0
+   RETURN ::Type != HB_WIN_BITMAP_UNKNOWN
 
 METHOD Create() CLASS WIN_BMP  // Compatibility function for Alaska Xbase++
    RETURN Self