rpms/openjpeg/devel openjpeg-1.3-reverse-bogus-aligned-malloc.patch, NONE, 1.1 openjpeg-1.3-tcd_init_encode-alloc-fix.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 openjpeg.spec, 1.2, 1.3 sources, 1.3, 1.4

[Callum Lerwick (seg)]

Author: seg

Update of /cvs/extras/rpms/openjpeg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29394

Modified Files:
	.cvsignore openjpeg.spec sources 
Added Files:
	openjpeg-1.3-reverse-bogus-aligned-malloc.patch 
	openjpeg-1.3-tcd_init_encode-alloc-fix.patch 
Log Message:
* Thu Dec 27 2007 Callum Lerwick <seg at haxxed.com> 1.3-1
- New upstream release.


openjpeg-1.3-reverse-bogus-aligned-malloc.patch:

--- NEW FILE openjpeg-1.3-reverse-bogus-aligned-malloc.patch ---
--- OpenJPEG_v1_3/libopenjpeg/opj_malloc.h	2007-12-21 04:19:01.000000000 -0600
+++ trunk/libopenjpeg/opj_malloc.h	2007-10-18 07:26:11.000000000 -0500
@@ -75,9 +75,6 @@
 #else /* Not WIN32 */
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
-		#elif defined(__GNUC__)
-			#define HAVE_MEMALIGN
-			#include <malloc.h>		
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
 		#elif !defined(__amd64__) && !defined(__APPLE__)	
 			/* FIXME: Yes, this is a big assumption */
@@ -85,8 +82,6 @@
 	#endif
 #endif
 
-
-
 #define opj_aligned_malloc(size) malloc(size)
 #define opj_aligned_free(m) free(m)
 

openjpeg-1.3-tcd_init_encode-alloc-fix.patch:

--- NEW FILE openjpeg-1.3-tcd_init_encode-alloc-fix.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/tcd.c OpenJPEG.patched/libopenjpeg/tcd.c
--- OpenJPEG.orig/libopenjpeg/tcd.c	2007-12-19 06:28:40.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/tcd.c	2007-12-27 21:58:57.000000000 -0600
@@ -584,7 +584,9 @@
 							cblk->y0 = int_max(cblkystart, prc->y0);
 							cblk->x1 = int_min(cblkxend, prc->x1);
 							cblk->y1 = int_min(cblkyend, prc->y1);
-							cblk->data = (unsigned char*) opj_calloc(8192, sizeof(unsigned char));
+							cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
+							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
+							cblk->data += 2;
 							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
 							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
 						}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openjpeg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Dec 2007 03:05:05 -0000	1.3
+++ .cvsignore	4 Jan 2008 08:18:37 -0000	1.4
@@ -1 +1 @@
-openjpeg-20071211svn484.tar.bz2
+openjpeg_v1_3.tar.gz


Index: openjpeg.spec
===================================================================
RCS file: /cvs/extras/rpms/openjpeg/devel/openjpeg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openjpeg.spec	12 Dec 2007 03:05:05 -0000	1.2
+++ openjpeg.spec	4 Jan 2008 08:18:37 -0000	1.3
@@ -1,9 +1,6 @@
-%define rev 484
-%define snapshot 20071211svn%{rev}
-
 Name:    openjpeg
-Version: 1.2
-Release: 4.%{snapshot}%{?dist}
+Version: 1.3
+Release: 1%{?dist}
 Summary: OpenJPEG command line tools
 
 Group:     Applications/Multimedia
@@ -14,14 +11,13 @@
 BuildRequires: cmake
 BuildRequires: libtiff-devel
 
-# This is an SVN snapshot.
-# svn export -r 484 http://www.openjpeg.org/svn/trunk
-# tar -cjvf openjpeg-20071211svn484.tar.bz2 trunk
-Source0: openjpeg-%{snapshot}.tar.bz2
+Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz
 
 Patch1: openjpeg-20070717svn-codec-libtiff.patch
 Patch4: openjpeg-svn480-cmake.patch
 Patch5: openjpeg-svn480-use-stdbool.patch
+Patch6: openjpeg-1.3-tcd_init_encode-alloc-fix.patch
+Patch7: openjpeg-1.3-reverse-bogus-aligned-malloc.patch
 Patch44: openjpeg-svn468-mj2-noscroll.patch
 Patch21: openjpeg-20070717svn-mqc-optimize.patch
 Patch22: openjpeg-20070821svn-t1-remove-macro.patch
@@ -55,7 +51,7 @@
 developing applications that use OpenJPEG.
 
 %prep
-%setup -q -n trunk
+%setup -q -n OpenJPEG_v1_3
 # Windows stuff, delete it, it slows down patch making
 rm -rf jp3d
 # Make sure we use system libraries
@@ -63,6 +59,8 @@
 %patch1 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 %patch44 -p1
 %patch22 -p1
 %patch23 -p1
@@ -114,6 +112,9 @@
 %{_libdir}/libopenjpeg.so
 
 %changelog
+* Thu Dec 27 2007 Callum Lerwick <seg at haxxed.com> 1.3-1
+- New upstream release.
+
 * Tue Dec 11 2007 Callum Lerwick <seg at haxxed.com> 1.2-4.20071211svn484
 - New snapshot. Fixes bz420811.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openjpeg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Dec 2007 03:05:05 -0000	1.3
+++ sources	4 Jan 2008 08:18:37 -0000	1.4
@@ -1 +1 @@
-897fb7b9d66cf7098ccca6526c00640e  openjpeg-20071211svn484.tar.bz2
+f9a3ccfa91ac34b589e9bf7577ce8ff9  openjpeg_v1_3.tar.gz