2013-04-10 01:10 UTC+0200 Viktor Szakats (harbour syenar.net)

* contrib/hbhpdf/3rd/libhpdf/hpdfimap.c
  * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
    + patched to build with libpng 1.6 w/o warning
      identical to this upstream patch:
         f1817baea4

  * bin/commit.hb
    ! fixed to add shebang to newly created commit hook

  * bin/check.hb
    ! exclude maskimag.png from processing
    ! typo in png processor name
    ! minor syntax clarification

  * contrib/hbhpdf/tests/files/maskimag.png
    ! restored original version, as any optimized version will
      cause libharu to GPF (visible when running the demo)

ChangeLog.txt

@@ -10,6 +10,25 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-10 01:10 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbhpdf/3rd/libhpdf/hpdfimap.c
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
+    + patched to build with libpng 1.6 w/o warning
+      identical to this upstream patch:
+         https://github.com/libharu/libharu/commit/f1817baea49ab09de4635e383dc86b04a0fc3d8f
+
+  * bin/commit.hb
+    ! fixed to add shebang to newly created commit hook
+
+  * bin/check.hb
+    ! exclude maskimag.png from processing
+    ! typo in png processor name
+    ! minor syntax clarification
+
+  * contrib/hbhpdf/tests/files/maskimag.png
+    ! restored original version, as any optimized version will
+      cause libharu to GPF (visible when running the demo)
+
 2013-04-09 03:27 UTC+0200 Viktor Szakats (harbour syenar.net)
   * bin/check.hb
     * deleted one more contrib exception

bin/check.hb

@@ -149,6 +149,9 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes )
    LOCAL aForcedLF := { ;
       "*.sh" }
 
+   LOCAL aNoProc := { ;
+      "maskimag.png" }  /* will crash libharu demo if optimized in any way */
+
    LOCAL aCanHaveIdent
    LOCAL hAllowedExt := LoadGitattributes( @aCanHaveIdent )
    LOCAL nLines
@@ -287,7 +290,7 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes )
             ENDIF
          ENDIF
 
-         IF ( tmp := "$" + "Id" ) $ cFile != FNameExc( cName, aCanHaveIdent )
+         IF ( ( tmp := "$" + "Id" ) $ cFile ) != FNameExc( cName, aCanHaveIdent )
             IF tmp
                AAdd( aErr, "content: has " + "$" + "Id" )
             ELSE
@@ -321,7 +324,7 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes )
                EXIT
             ENDIF
          NEXT
-         IF lProcess
+         IF lProcess .AND. ! FNameExc( cName, aNoProc )
             OutStd( cName + ": " + "content: processing" + hb_eol() )
             ProcFile( cName )
          ENDIF
@@ -599,7 +602,7 @@ STATIC FUNCTION FNameExc( cName, aList )
 STATIC PROCEDURE ProcFile( cFileName )
 
    LOCAL hProc := { ;
-      ".png" => { "avdpng -z -4 %1$s", "optipng -o7 %1$s" }, ;
+      ".png" => { "advpng -z -4 %1$s", "optipng -o7 %1$s" }, ;
       ".jpg" => { "jpegoptim --strip-all %1$s" }, ;
       ".c"   => { hb_StrFormat( "uncrustify -c %1$s %%1$s", hb_DirSepToOS( _HBROOT_ + "bin/harbour.ucf" ) ), @FixFuncCase() }, ;
       ".cpp" => ".c", ;

bin/commit.hb

@@ -147,6 +147,10 @@ STATIC FUNCTION InstallHook( cHookName, cCommand )
       RETURN .T.
    ENDIF
 
+   IF Empty( cFile )
+      cFile += "#!/bin/sh" + hb_eol()
+   ENDIF
+
    RETURN hb_MemoWrit( cName, cFile + hb_eol() + cCommand + hb_eol() )
 
 STATIC FUNCTION FindChangeLog()

contrib/hbhpdf/3rd/libhpdf/hpdfimap.c

@@ -21,6 +21,7 @@
 
 #ifndef LIBHPDF_HAVE_NOPNGLIB
 #include <png.h>
+#include <string.h>
 
 static void
 PngErrorFunc  (png_structp       png_ptr,

contrib/hbhpdf/3rd/libhpdf/libhpdf.dif

@@ -1,6 +1,6 @@
-diff -urN libhpdf-rc2.orig\hpdf.h libhpdf-rc2\hpdf.h
---- libhpdf-rc2.orig\hpdf.h	Wed Apr 04 21:40:06 2012
-+++ libhpdf-rc2\hpdf.h	Wed Apr 04 21:40:06 2012
+diff -urN libhpdf.orig\hpdf.h libhpdf\hpdf.h
+--- libhpdf.orig\hpdf.h	Wed Apr 10 01:02:31 2013
++++ libhpdf\hpdf.h	Wed Apr 10 01:02:31 2013
 @@ -17,7 +17,7 @@
  #ifndef _HPDF_H
  #define _HPDF_H
@@ -19,9 +19,20 @@ diff -urN libhpdf-rc2.orig\hpdf.h libhpdf-rc2\hpdf.h
  HPDF_Page_CreateTextMarkupAnnot (HPDF_Page     page,
  								HPDF_Rect      rect,
  								const char     *text,
-diff -urN libhpdf-rc2.orig\hpdfutil.h libhpdf-rc2\hpdfutil.h
---- libhpdf-rc2.orig\hpdfutil.h	Wed Apr 04 21:40:06 2012
-+++ libhpdf-rc2\hpdfutil.h	Wed Apr 04 21:40:06 2012
+diff -urN libhpdf.orig\hpdfimap.c libhpdf\hpdfimap.c
+--- libhpdf.orig\hpdfimap.c	Wed Apr 10 01:02:31 2013
++++ libhpdf\hpdfimap.c	Wed Apr 10 01:02:31 2013
+@@ -21,6 +21,7 @@
+ 
+ #ifndef LIBHPDF_HAVE_NOPNGLIB
+ #include <png.h>
++#include <string.h>
+ 
+ static void
+ PngErrorFunc  (png_structp       png_ptr,
+diff -urN libhpdf.orig\hpdfutil.h libhpdf\hpdfutil.h
+--- libhpdf.orig\hpdfutil.h	Wed Apr 10 01:02:31 2013
++++ libhpdf\hpdfutil.h	Wed Apr 10 01:02:31 2013
 @@ -18,7 +18,7 @@
  #ifndef _HPDF_UTILS_H
  #define _HPDF_UTILS_H
@@ -31,3 +42,12 @@ diff -urN libhpdf-rc2.orig\hpdfutil.h libhpdf-rc2\hpdfutil.h
  #include "hpdftype.h"
  
  #ifdef __cplusplus
+diff -urN libhpdf.orig\t4.h libhpdf\t4.h
+--- libhpdf.orig\t4.h	Wed Apr 10 01:02:31 2013
++++ libhpdf\t4.h	Wed Apr 10 01:02:31 2013
+@@ -1,4 +1,4 @@
+-/* $Id: t4.h,v 1.20 2007/11/10 18:40:44 drolon Exp $ */
++/* $Id$ */
+ 
+ /*
+  * Copyright (c) 1988-1997 Sam Leffler