r8379 - ! dirs' list truncated !

Bruno Fuddl-guestquot; Fuddl" Kleinert fuddl-guest at alioth.debian.org
Tue Nov 11 17:58:33 UTC 2008


Author: fuddl-guest
Date: 2008-11-11 17:58:33 +0000 (Tue, 11 Nov 2008)
New Revision: 8379

Modified:
   packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch
Log:
* not many changes, the jpeg source manager still leads to a suspicous segfault somewhere in libjpeg.so

Modified: packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch	2008-11-11 16:38:14 UTC (rev 8378)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch	2008-11-11 17:58:33 UTC (rev 8379)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad openarena-0.8.1~/Makefile openarena-0.8.1/Makefile
---- openarena-0.8.1~/Makefile	2008-11-09 22:15:33.534134600 +0100
-+++ openarena-0.8.1/Makefile	2008-11-09 22:15:33.742134960 +0100
+--- openarena-0.8.1~/Makefile	2008-11-11 18:26:10.000000000 +0100
++++ openarena-0.8.1/Makefile	2008-11-11 18:26:10.000000000 +0100
 @@ -158,7 +158,7 @@
  NDIR=$(MOUNT_DIR)/null
  UIDIR=$(MOUNT_DIR)/ui
@@ -80,9 +80,9 @@
  $(B)/client/%.o: $(SPEEXDIR)/%.c
  	$(DO_CC)
 diff -urNad openarena-0.8.1~/code/renderer/tr_image_jpg.c openarena-0.8.1/code/renderer/tr_image_jpg.c
---- openarena-0.8.1~/code/renderer/tr_image_jpg.c	2008-11-09 22:15:27.000000000 +0100
-+++ openarena-0.8.1/code/renderer/tr_image_jpg.c	2008-11-09 22:15:50.385134040 +0100
-@@ -31,7 +31,25 @@
+--- openarena-0.8.1~/code/renderer/tr_image_jpg.c	2008-11-11 18:26:01.000000000 +0100
++++ openarena-0.8.1/code/renderer/tr_image_jpg.c	2008-11-11 18:56:35.000000000 +0100
+@@ -31,7 +31,33 @@
   */
  
  #define JPEG_INTERNALS
@@ -95,51 +95,57 @@
 +static void LoadJPG_init_source(j_decompress_ptr cinfo) {
 +}
 +
-+static void LoadJPG_fill_input_buffer(j_decompress_ptr cinfo) {
++static boolean LoadJPG_fill_input_buffer(j_decompress_ptr cinfo) {
++	return TRUE;
 +}
 +
 +static void LoadJPG_skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
++	if(num_bytes < 1)
++		return;
++	if(cinfo->src->bytes_in_buffer - num_bytes < 0) {
++		cinfo->src->next_input_byte += cinfo->src->bytes_in_buffer;
++		cinfo->src->bytes_in_buffer = 0;
++	} else {
++		cinfo->src->next_input_byte += num_bytes;
++		cinfo->src->bytes_in_buffer -= num_bytes;
++	}
++	return;
 +}
 +
-+static void LoadJPG_resync_to_restart(j_decompress_ptr cinfo, int desired) {
-+}
-+
 +static void LoadJPG_term_source(j_decompress_ptr cinfo) {
 +}
  
  void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
    /* This struct contains the JPEG decompression parameters and pointers to
-@@ -59,6 +77,8 @@
+@@ -59,6 +85,7 @@
    int len;
    byte	*fbuffer;
    byte  *buf;
-+  FILE *infile;
 +  struct jpeg_source_mgr jpeg_src_mgr;
  
    /* In this example we want to open the input file before doing anything else,
     * so that the setjmp() error recovery below can assume the file is open.
-@@ -70,6 +90,14 @@
+@@ -70,6 +97,14 @@
    if (!fbuffer || len < 0) {
  	return;
    }
-+  jpeg_src_mgr.next_input_byte = fbuffer;
-+  jpeg_src_mgr.bytes_in_buffer = len;
++  jpeg_src_mgr.next_input_byte = (JOCTET *) fbuffer;
++  jpeg_src_mgr.bytes_in_buffer = (size_t) len;
 +  jpeg_src_mgr.init_source = LoadJPG_init_source;
 +  jpeg_src_mgr.fill_input_buffer = LoadJPG_fill_input_buffer;
 +  jpeg_src_mgr.skip_input_data = LoadJPG_skip_input_data;
-+  jpeg_src_mgr.resync_to_restart = LoadJPG_resync_to_restart;
++  jpeg_src_mgr.resync_to_restart = jpeg_resync_to_restart;
 +  jpeg_src_mgr.term_source = LoadJPG_term_source;
 +  cinfo.src = &jpeg_src_mgr;
  
    /* Step 1: allocate and initialize JPEG decompression object */
  
-@@ -85,7 +113,8 @@
+@@ -85,7 +120,7 @@
  
    /* Step 2: specify data source (eg, a file) */
  
 -  jpeg_mem_src(&cinfo, fbuffer, len);
 +  /*jpeg_mem_src(&cinfo, fbuffer, len);*/
-+  jpeg_stdio_src(&cinfo, infile);
  
    /* Step 3: read file parameters with jpeg_read_header() */
  




More information about the Pkg-games-commits mailing list