From 7c66e97ed61131be87844cb467e53b63d18035a2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 3 Feb 2010 13:56:25 +0000
Subject: [PATCH] 2010-02-03 14:55 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.pt_BR.po   * utils/hbmk2/hbmk2.hu_HU.po   *
 utils/hbmk2/hbmk2.prg     + Added some details on <script> usage. Most
 probably it's still       confusing, I you know a better way, tell.

  * contrib/hbfimage/fi_winfu.c
    * Formatting.
---
 harbour/ChangeLog                   | 10 ++++++++++
 harbour/contrib/hbfimage/fi_winfu.c | 28 ++++++++++++++--------------
 harbour/utils/hbmk2/hbmk2.hu_HU.po  |  2 +-
 harbour/utils/hbmk2/hbmk2.prg       |  4 ++--
 harbour/utils/hbmk2/hbmk2.pt_BR.po  |  2 +-
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cc1135e4aa..7631e08019 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-03 14:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.pt_BR.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+  * utils/hbmk2/hbmk2.prg
+    + Added some details on <script> usage. Most probably it's still
+      confusing, I you know a better way, tell.
+
+  * contrib/hbfimage/fi_winfu.c
+    * Formatting.
+
 2010-02-03 14:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbfbird/tfirebrd.prg
     + Formatted.
diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c
index 9ce789d0f6..a503ec2a2f 100644
--- a/harbour/contrib/hbfimage/fi_winfu.c
+++ b/harbour/contrib/hbfimage/fi_winfu.c
@@ -89,9 +89,9 @@ HB_FUNC( FI_FITOBITMAP )
 
       /* run function */
       hDC = GetDC( NULL );
-      bitmap = CreateDIBitmap(hDC, FreeImage_GetInfoHeader(dib),
-                              CBM_INIT, FreeImage_GetBits(dib),
-                              FreeImage_GetInfo(dib), DIB_RGB_COLORS);
+      bitmap = CreateDIBitmap( hDC, FreeImage_GetInfoHeader( dib ),
+                               CBM_INIT, FreeImage_GetBits( dib ),
+                               FreeImage_GetInfo( dib ), DIB_RGB_COLORS );
       ReleaseDC( NULL, hDC );
 
       /* return value */
@@ -133,11 +133,11 @@ HB_FUNC( FI_BITMAPTOFI )
          BITMAP bm;
          HDC hDC;
 
-         GetObject( bitmap, sizeof(BITMAP), (LPSTR) &bm );
-         dib = FreeImage_Allocate(bm.bmWidth, bm.bmHeight, bm.bmBitsPixel, 0, 0, 0);
+         GetObject( bitmap, sizeof( BITMAP ), ( LPSTR ) &bm );
+         dib = FreeImage_Allocate( bm.bmWidth, bm.bmHeight, bm.bmBitsPixel, 0, 0, 0 );
          hDC = GetDC( NULL );
-         GetDIBits( hDC, bitmap, 0, FreeImage_GetHeight(dib),
-                    FreeImage_GetBits(dib), FreeImage_GetInfo(dib), DIB_RGB_COLORS);
+         GetDIBits( hDC, bitmap, 0, FreeImage_GetHeight( dib ),
+                    FreeImage_GetBits( dib ), FreeImage_GetInfo( dib ), DIB_RGB_COLORS );
          ReleaseDC( NULL, hDC );
       }
 
@@ -187,13 +187,13 @@ HB_FUNC( FI_WINDRAW )
       /* run function */
       SetStretchBltMode( hDC, COLORONCOLOR );
 
-      scanlines = StretchDIBits(hDC, rcDest.left,
-                                     rcDest.top,
-                                     rcDest.right-rcDest.left,
-                                     rcDest.bottom-rcDest.top,
-                                     0, 0, FreeImage_GetWidth(dib), FreeImage_GetHeight(dib),
-                                     FreeImage_GetBits(dib), FreeImage_GetInfo(dib),
-                                     DIB_RGB_COLORS, SRCCOPY);
+      scanlines = StretchDIBits( hDC, rcDest.left,
+                                      rcDest.top,
+                                      rcDest.right-rcDest.left,
+                                      rcDest.bottom-rcDest.top,
+                                      0, 0, FreeImage_GetWidth( dib ), FreeImage_GetHeight( dib ),
+                                      FreeImage_GetBits( dib ), FreeImage_GetInfo( dib ),
+                                      DIB_RGB_COLORS, SRCCOPY );
 
       /* return value */
       hb_retni( scanlines );
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index 6f0bb2546a..1cc046058a 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -404,7 +404,7 @@ msgstr ""
 
 #: hbmk2.prg:7959
 #, c-format
-msgid "<script> can be <@script> (.hbm format), <script.hbm>, <script.hbp> (marks a new target) or <script.hbc>."
+msgid "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file."
 msgstr ""
 
 #: hbmk2.prg:1105
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 7ca27cd25b..9f478eed0e 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -8232,7 +8232,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       NIL,;
       { "Options below are available on command line only:" },;
       NIL,;
-      { "-target=<script>"  , I_( "specify a new build target. <script> can be .prg (or no extension) or .hbm file" ) },;
+      { "-target=<script>"  , I_( "specify a new build target. <script> can be .prg (or no extension) or .hbm/.hbp file" ) },;
       { "-target"           , I_( "marks beginning of options belonging to a new build target" ) },;
       { "-alltarget"        , I_( "marks beginning of common options belonging to all targets" ) },;
       NIL,;
@@ -8273,7 +8273,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       I_( "Notes:" ) }
 
    LOCAL aNotes := {;
-      I_( "<script> can be <@script> (.hbm format), <script.hbm>, <script.hbp> (marks a new target) or <script.hbc>." ),;
+      I_( "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file." ),;
       I_( "Multiple -l, -L and <script> parameters are accepted." ),;
       I_( "Regular Harbour compiler options are also accepted." ),;
       hb_StrFormat( I_( "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk2 directory. The file format is the same as .hbc." ), _HBMK_CFG_NAME ),;
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index c0b6032553..485f06e1c3 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -538,7 +538,7 @@ msgstr ""
 
 #: hbmk2.prg:7960
 #, c-format
-msgid "<script> can be <@script> (.hbm format), <script.hbm>, <script.hbp> (marks a new target) or <script.hbc>."
+msgid "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file."
 msgstr "<script> pode ser <@script> (no formato .hbm), <script.hbm>, <script.hbp> (denotando um novo alvo) ou <script.hbc>."
 
 #: hbmk2.prg:7942