[packages/gdal] - updated openjpeg2 patch to fix build also when size_t is not 32-bit

qboosh qboosh at pld-linux.org
Mon Jan 7 21:23:37 CET 2013


commit 2d0a5069f1174a6093a91511e0a6f4492580ef5e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jan 7 21:23:42 2013 +0100

    - updated openjpeg2 patch to fix build also when size_t is not 32-bit

 gdal-openjpeg2.patch | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/gdal-openjpeg2.patch b/gdal-openjpeg2.patch
index 87834c7..222d1f1 100644
--- a/gdal-openjpeg2.patch
+++ b/gdal-openjpeg2.patch
@@ -36,7 +36,7 @@
    if test "$HAVE_OPENJPEG" = "yes" ; then
      AC_MSG_NOTICE([using OpenJPEG library from $with_openjpeg.])
 --- gdal-1.9.2/frmts/openjpeg/openjpegdataset.cpp.orig	2012-10-09 02:58:27.000000000 +0200
-+++ gdal-1.9.2/frmts/openjpeg/openjpegdataset.cpp	2013-01-06 15:06:51.307945668 +0100
++++ gdal-1.9.2/frmts/openjpeg/openjpegdataset.cpp	2013-01-07 20:31:31.410092737 +0100
 @@ -37,7 +37,7 @@
  /* and when calling openjpeg API from the driver, we have to replace bool by int also */
  #define bool int
@@ -46,8 +46,24 @@
  #undef bool /* undef now, so that later includes are happy */
  
  #include "gdal_pam.h"
---- gdal-1.9.2/frmts/openjpeg/openjpegdataset.cpp.orig	2013-01-06 16:55:59.004475860 +0100
-+++ gdal-1.9.2/frmts/openjpeg/openjpegdataset.cpp	2013-01-06 18:46:00.987671587 +0100
+@@ -77,7 +77,7 @@
+ /*                      JP2OpenJPEGDataset_Read()                       */
+ /************************************************************************/
+ 
+-static OPJ_UINT32 JP2OpenJPEGDataset_Read(void* pBuffer, OPJ_UINT32 nBytes,
++static OPJ_SIZE_T JP2OpenJPEGDataset_Read(void* pBuffer, OPJ_SIZE_T nBytes,
+                                        void *pUserData)
+ {
+     int nRet = VSIFReadL(pBuffer, 1, nBytes, (VSILFILE*)pUserData);
+@@ -93,7 +93,7 @@
+ /*                      JP2OpenJPEGDataset_Write()                      */
+ /************************************************************************/
+ 
+-static OPJ_UINT32 JP2OpenJPEGDataset_Write(void* pBuffer, OPJ_UINT32 nBytes,
++static OPJ_SIZE_T JP2OpenJPEGDataset_Write(void* pBuffer, OPJ_SIZE_T nBytes,
+                                        void *pUserData)
+ {
+     int nRet = VSIFWriteL(pBuffer, 1, nBytes, (VSILFILE*)pUserData);
 @@ -107,7 +107,7 @@
  /*                       JP2OpenJPEGDataset_Seek()                      */
  /************************************************************************/
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/2d0a5069f1174a6093a91511e0a6f4492580ef5e



More information about the pld-cvs-commit mailing list