Attachment #1544 for bug #3359

Lines 23-28 Link Here

(-)media-libs/plotutils/plotutils-2.4.1-r1.ebuild~ (-1 / +5 lines)
23	media-libs/libpng	23	media-libs/libpng
24	X? ( virtual/x11 )"	24	X? ( virtual/x11 )"
25		25
		26	src_unpack() {
		27	unpack ${A} ; cd ${S}
		28	patch -p1 <${FILESDIR}/${P}-gcc-3.1.patch \|\| die
		29	}
		30
26	src_compile() {	31	src_compile() {
27		32
28	#enable build of C++ version	33	#enable build of C++ version
29	-----------EhZE2W2KIy8jWZ1FeVrhxN

Lines 40-46 Link Here

(-)plotutils-2.4.1/libplot/g_write.c~ (-1 / +1 lines)
40	}	40	}
41	#ifdef LIBPLOTTER	41	#ifdef LIBPLOTTER
42	else if (data->outstream)	42	else if (data->outstream)
43	data->outstream->write(c, n);	43	data->outstream->write ((const char*)c, n);
44	#endif	44	#endif
45	}	45	}
46		46

Lines 78-84 Link Here

(-)plotutils-2.4.1/libplot/i_rle.c~ (-1 / +1 lines)
78	else if (rle->outstream)	78	else if (rle->outstream)
79	{	79	{
80	rle->outstream->put ((unsigned char)(rle->oblen));	80	rle->outstream->put ((unsigned char)(rle->oblen));
81	rle->outstream->write (&(rle->oblock[0]), rle->oblen);	81	rle->outstream->write (&(const char)(rle->oblock[0]), rle->oblen);
82	}	82	}
83	#endif	83	#endif
84		84




		  linebuf[pos++] = '0';
		if (pos >= MAX_PBM_PIXELS_PER_LINE || i == (width - 1))
		  {
		    stream->write ((const char*)linebuf, pos);
		    stream->put ('\n');

		    pos = 0;

		  rowbuf[bytecount++] = outbyte;
		}
	      /* emit row of bytes */
	      stream->write ((const char*)rowbuf, bytecount);
	    }

	  free (rowbuf);

		num_pixels++;
		if (num_pixels >= MAX_PGM_PIXELS_PER_LINE || i == (width - 1))
		  {
		    stream->write ((const char*)linebuf, pos);
		    stream->put ('\n');

		    num_pixels = 0;

	    {
	      for (i = 0; i < width; i++)
		rowbuf[i] = pixmap[j][i].u.rgb[0];
	      stream->write ((const char*)rowbuf, width);
	    }
	  free (rowbuf);
	}

		num_pixels++;
		if (num_pixels >= MAX_PPM_PIXELS_PER_LINE || i == (width - 1))
		  {
		    stream->write ((const char*)linebuf, pos);
		    stream->put ('\n');

		    num_pixels = 0;

	      for (i = 0; i < width; i++)
		for (component = 0; component < 3; component++)
		  rowbuf[3 * i + component] = pixmap[j][i].u.rgb[component];
	      stream->write ((const char*)rowbuf, 3 * width);
	    }
	  free (rowbuf);
	}

Lines 484-490 Link Here

(-)plotutils-2.4.1/libplot/z_write.c~ (-2 / +1 lines)
484	ostream *stream;	484	ostream *stream;
485		485
486	stream = (ostream *)png_get_io_ptr (png_ptr);	486	stream = (ostream *)png_get_io_ptr (png_ptr);
487	stream->write (data, length);	487	stream->write ((const char*)data, length);
488	}	488	}
489		489
490	static void	490	static void
491	-----------EhZE2W2KIy8jWZ1FeVrhxN--

Return to bug 3359

Lines 208-214 Link Here

(-)plotutils-2.4.1/libplot/n_write.c~ (-6 / +6 lines)
208	linebuf[pos++] = '0';	208	linebuf[pos++] = '0';
209	if (pos >= MAX_PBM_PIXELS_PER_LINE \|\| i == (width - 1))	209	if (pos >= MAX_PBM_PIXELS_PER_LINE \|\| i == (width - 1))
210	{	210	{
211	stream->write (linebuf, pos);	211	stream->write ((const char*)linebuf, pos);
212	stream->put ('\n');	212	stream->put ('\n');
213		213
214	pos = 0;	214	pos = 0;
Lines 253-259 Link Here
253	rowbuf[bytecount++] = outbyte;	253	rowbuf[bytecount++] = outbyte;
254	}	254	}
255	/* emit row of bytes */	255	/* emit row of bytes */
256	stream->write (rowbuf, bytecount);	256	stream->write ((const char*)rowbuf, bytecount);
257	}	257	}
258		258
259	free (rowbuf);	259	free (rowbuf);
Lines 366-372 Link Here
366	num_pixels++;	366	num_pixels++;
367	if (num_pixels >= MAX_PGM_PIXELS_PER_LINE \|\| i == (width - 1))	367	if (num_pixels >= MAX_PGM_PIXELS_PER_LINE \|\| i == (width - 1))
368	{	368	{
369	stream->write (linebuf, pos);	369	stream->write ((const char*)linebuf, pos);
370	stream->put ('\n');	370	stream->put ('\n');
371		371
372	num_pixels = 0;	372	num_pixels = 0;
Lines 392-398 Link Here
392	{	392	{
393	for (i = 0; i < width; i++)	393	for (i = 0; i < width; i++)
394	rowbuf[i] = pixmap[j][i].u.rgb[0];	394	rowbuf[i] = pixmap[j][i].u.rgb[0];
395	stream->write (rowbuf, width);	395	stream->write ((const char*)rowbuf, width);
396	}	396	}
397	free (rowbuf);	397	free (rowbuf);
398	}	398	}
Lines 514-520 Link Here
514	num_pixels++;	514	num_pixels++;
515	if (num_pixels >= MAX_PPM_PIXELS_PER_LINE \|\| i == (width - 1))	515	if (num_pixels >= MAX_PPM_PIXELS_PER_LINE \|\| i == (width - 1))
516	{	516	{
517	stream->write (linebuf, pos);	517	stream->write ((const char*)linebuf, pos);
518	stream->put ('\n');	518	stream->put ('\n');
519		519
520	num_pixels = 0;	520	num_pixels = 0;
Lines 542-548 Link Here
542	for (i = 0; i < width; i++)	542	for (i = 0; i < width; i++)
543	for (component = 0; component < 3; component++)	543	for (component = 0; component < 3; component++)
544	rowbuf[3 * i + component] = pixmap[j][i].u.rgb[component];	544	rowbuf[3 * i + component] = pixmap[j][i].u.rgb[component];
545	stream->write (rowbuf, 3 * width);	545	stream->write ((const char)rowbuf, 3 width);
546	}	546	}
547	free (rowbuf);	547	free (rowbuf);
548	}	548	}