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

2015-06-24 00:33 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/vm/classes.c
    ! fixed __objGetIVars() to correctly serialize objects without any own
      and inherited instance variables

  * contrib/hbhpdf/3rd/libhpdf/hpdfimac.c
    ! include string.h
  * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
    * rediffed
This commit is contained in:
Przemysław Czerpak
2015-06-24 00:33:01 +02:00
parent e364f8634b
commit c67ac9166a
4 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog.txt
View File

@@ -10,6 +10,16 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-06-24 00:33 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/vm/classes.c
! fixed __objGetIVars() to correctly serialize objects without any own
and inherited instance variables
* contrib/hbhpdf/3rd/libhpdf/hpdfimac.c
! include string.h
* contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
* rediffed
2015-06-17 12:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/filesys.c
! fixed FXO_TRUNCATE flag used without FXO_SHARELOCK in POSIX systems

1
contrib/hbhpdf/3rd/libhpdf/hpdfimac.c
View File

@@ -19,6 +19,7 @@
#include "hpdfutil.h"
#include "hpdf.h"
#include <memory.h>
#include <string.h>
#include <assert.h>
#define G3CODES

30
contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
View File

@@ -1,6 +1,6 @@
diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
--- libhpdf.orig/hpdf.h 2014-10-07 01:00:01.376012911 +0200
+++ libhpdf/hpdf.h 2014-10-07 01:00:01.376012911 +0200
--- libhpdf.orig/hpdf.h 2015-06-22 16:44:34.339421842 +0200
+++ libhpdf/hpdf.h 2015-06-22 16:44:34.339421842 +0200
@@ -17,7 +17,7 @@
#ifndef _HPDF_H
#define _HPDF_H
@@ -20,9 +20,17 @@ diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
HPDF_Rect rect,
const char *text,
diff -urN libhpdf.orig/hpdfimac.c libhpdf/hpdfimac.c
--- libhpdf.orig/hpdfimac.c 2014-10-07 01:00:01.296012909 +0200
+++ libhpdf/hpdfimac.c 2014-10-07 01:00:01.296012909 +0200
@@ -78,7 +78,7 @@
--- libhpdf.orig/hpdfimac.c 2015-06-22 16:44:34.251421845 +0200
+++ libhpdf/hpdfimac.c 2015-06-22 16:44:34.251421845 +0200
@@ -19,6 +19,7 @@
#include "hpdfutil.h"
#include "hpdf.h"
#include <memory.h>
+#include <string.h>
#include <assert.h>
#define G3CODES
@@ -78,7 +79,7 @@
#define Fax3State(tif) (&(tif)->tif_data->b)
#define EncoderState(tif) ((tif)->tif_data)
@@ -32,8 +40,8 @@ diff -urN libhpdf.orig/hpdfimac.c libhpdf/hpdfimac.c
/* NB: the uint32 casts are to silence certain ANSI-C compilers */
#define TIFFhowmany(x, y) ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y)))
diff -urN libhpdf.orig/hpdfpago.c libhpdf/hpdfpago.c
--- libhpdf.orig/hpdfpago.c 2014-10-07 01:00:01.332012910 +0200
+++ libhpdf/hpdfpago.c 2014-10-07 01:00:01.332012910 +0200
--- libhpdf.orig/hpdfpago.c 2015-06-22 16:44:34.291421844 +0200
+++ libhpdf/hpdfpago.c 2015-06-22 16:44:34.291421844 +0200
@@ -1155,7 +1155,7 @@
return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT, 0);
@@ -44,8 +52,8 @@ diff -urN libhpdf.orig/hpdfpago.c libhpdf/hpdfpago.c
if (page->mmgr != font->mmgr)
return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT, 0);
diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h
--- libhpdf.orig/hpdfutil.h 2014-10-07 01:00:01.412012912 +0200
+++ libhpdf/hpdfutil.h 2014-10-07 01:00:01.412012912 +0200
--- libhpdf.orig/hpdfutil.h 2015-06-22 16:44:34.391421841 +0200
+++ libhpdf/hpdfutil.h 2015-06-22 16:44:34.391421841 +0200
@@ -18,7 +18,7 @@
#ifndef _HPDF_UTILS_H
#define _HPDF_UTILS_H
@@ -56,8 +64,8 @@ diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h
#ifdef __cplusplus
diff -urN libhpdf.orig/t4.h libhpdf/t4.h
--- libhpdf.orig/t4.h 2014-10-07 01:00:01.368012911 +0200
+++ libhpdf/t4.h 2014-10-07 01:00:01.368012911 +0200
--- libhpdf.orig/t4.h 2015-06-22 16:44:34.331421842 +0200
+++ libhpdf/t4.h 2015-06-22 16:44:34.331421842 +0200
@@ -1,4 +1,4 @@
-/* $Id: t4.h,v 1.20 2007/11/10 18:40:44 drolon Exp $ */
+/* $Id$ */

5
src/vm/classes.c
View File

@@ -5169,7 +5169,7 @@ static PHB_ITEM hb_objGetIVars( PHB_ITEM pObject,
pClass = s_pClasses[ uiClass ];
nLen = nCount = hb_arrayLen( pObject );
nSize = 0;
pIndex = ( PHB_IVARINFO ) hb_xgrabz( nLen * sizeof( HB_IVARINFO ) );
pIndex = nLen ? ( PHB_IVARINFO ) hb_xgrabz( nLen * sizeof( HB_IVARINFO ) ) : NULL;
if( fChanged && pClass->uiInitDatas )
{
@@ -5280,7 +5280,8 @@ static PHB_ITEM hb_objGetIVars( PHB_ITEM pObject,
}
}
hb_xfree( pIndex );
if( pIndex )
hb_xfree( pIndex );
return pReturn;
}