From 69c19230077ee65bc6c8c17942aa6a020daad897 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 25 Jun 2010 17:26:08 +0000
Subject: [PATCH] 2010-06-25 19:25 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * external/png/Makefile     ! Fixed one MAP entry. Patch by
 Tamas Tevesz.

  * contrib/hbodbc/todbc.prg
    ! Attempt to fix sf.net bug #2984474.
      - TODBC class seems to have a typo where ROUND() is called with
        full number width instead of number of decimals in
         in TODBC():LoadData() method
      - Added SQL_BIGINT to list of numeric types when doing the
        conversion in TODBC():LoadData() method.
    ; Please review me a test with real ODBC connection, these were
      blind fixes, I'm not user of TODBC class.
---
 harbour/ChangeLog                | 14 ++++++++++++++
 harbour/contrib/hbodbc/todbc.prg |  3 ++-
 harbour/external/png/Makefile    |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c8a97b6f36..99ebb59051 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-25 19:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/png/Makefile
+    ! Fixed one MAP entry. Patch by Tamas Tevesz.
+
+  * contrib/hbodbc/todbc.prg
+    ! Attempt to fix sf.net bug #2984474.
+      - TODBC class seems to have a typo where ROUND() is called with
+        full number width instead of number of decimals in
+         in TODBC():LoadData() method
+      - Added SQL_BIGINT to list of numeric types when doing the
+        conversion in TODBC():LoadData() method.
+    ; Please review me a test with real ODBC connection, these were
+      blind fixes, I'm not user of TODBC class.
+
 2010-06-25 18:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/achoice.prg
     ! ACHOICE(): Fixed two navigation bugs (misplacement and RTE)
diff --git a/harbour/contrib/hbodbc/todbc.prg b/harbour/contrib/hbodbc/todbc.prg
index f89c974a31..3507535a20 100644
--- a/harbour/contrib/hbodbc/todbc.prg
+++ b/harbour/contrib/hbodbc/todbc.prg
@@ -748,13 +748,14 @@ METHOD LoadData( nPos ) CLASS TODBC
         CASE SQL_DOUBLE
         CASE SQL_TINYINT
         CASE SQL_SMALLINT
+        CASE SQL_BIGINT
         CASE SQL_INTEGER
         CASE SQL_FLOAT
         CASE SQL_REAL
 
            IF ISCHARACTER( uData )
               uData := StrTran( uData, ",", "." )
-              uData := Round( Val( uData ), ::Fields[ i ]:DataSize )
+              uData := Round( Val( uData ), ::Fields[ i ]:DataDecs )
            ENDIF
            uData := SQLNumSetLen( uData, ::Fields[ i ]:DataSize, ::Fields[ i ]:DataDecs )
            EXIT
diff --git a/harbour/external/png/Makefile b/harbour/external/png/Makefile
index bc39f92f15..4806d4e27e 100644
--- a/harbour/external/png/Makefile
+++ b/harbour/external/png/Makefile
@@ -73,7 +73,7 @@ endif
 # URL    http://sourceforge.net/projects/libpng/files/01-libpng-master/1.4.2/lpng142.zip/download
 # DIFF
 #
-# MAP    LICENCE
+# MAP    LICENSE
 # MAP    png.c
 # MAP    pngconf.h
 # MAP    pngerror.c