Hello community, here is the log from the commit of package netpbm checked in at Thu Apr 12 18:12:29 CEST 2007. -------- --- netpbm/netpbm.changes 2007-03-29 14:13:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/netpbm/netpbm.changes 2007-04-11 16:20:55.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 11 16:19:31 CEST 2007 - nadvornik@suse.cz + +- removed ppmtompeg sources [#261140] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.x13322/_old 2007-04-12 18:11:45.000000000 +0200 +++ /var/tmp/diff_new_pack.x13322/_new 2007-04-12 18:11:45.000000000 +0200 @@ -17,7 +17,7 @@ Provides: pbmplus Autoreqprov: on Version: 10.26.22 -Release: 44 +Release: 46 Summary: A Powerful Graphics Conversion Package Source: netpbm-%{version}-nohpcdtoppm-nojbig.tar.bz2 Source1: netpbm-%{version}-documentation.tar.bz2 @@ -91,7 +91,7 @@ %package -n libnetpbm Version: 1.0.0 -Release: 687 +Release: 689 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: Libraries for the NetPBM (NetPortableBitmap) Graphic Formats Group: System/Libraries @@ -132,16 +132,8 @@ %patch15 %patch16 %patch17 -# for ppmtompeg -rm -fr ppmtompeg -mkdir -p ppmtompeg mkdir -p pnmtopalm -cd ppmtompeg -cp -v ../converter/ppm/ppmtompeg/BUGS . -cp -v ../converter/ppm/ppmtompeg/CHANGES . -cp -vr ../converter/ppm/ppmtompeg/docs/ . -cp -vr ../converter/ppm/ppmtompeg/examples/ . -cd ../pnmtopalm +cd pnmtopalm cp -v ../converter/other/pnmtopalm/LICENSE . cp -v ../converter/other/pnmtopalm/README . @@ -177,7 +169,7 @@ %files %defattr(-,root,root) %doc README doc/* netpbm.sourceforge.net/doc -%doc ppmtompeg/ pnmtopalm/ +%doc pnmtopalm/ %doc %{_mandir}/man1/*.gz %doc %{_mandir}/man3/*.gz %doc %{_mandir}/man5/*.gz @@ -190,6 +182,8 @@ %{_libdir}/lib* %changelog +* Wed Apr 11 2007 - nadvornik@suse.cz +- removed ppmtompeg sources [#261140] * Thu Mar 29 2007 - rguenther@suse.de - add flex BuildRequires * Wed Dec 06 2006 - prusnak@suse.cz ++++++ netpbm-10.26.22-nohpcdtoppm-nojbig.tar.bz2 ++++++ ++++ 41147 lines of diff (skipped) ++++++ netpbm-10.26.22-overflow.patch ++++++ --- /var/tmp/diff_new_pack.x13322/_old 2007-04-12 18:11:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x13322/_new 2007-04-12 18:11:47.000000000 +0200 @@ -53,7 +53,7 @@ + return; + } - colormap = pnm_allocrow(cmapsize); + colormap = pnm_allocrow(MAX(1, cmapsize)); --- converter/other/gemtopnm.c +++ converter/other/gemtopnm.c @@ -197,7 +197,7 @@ --- converter/other/pnmtopng.c +++ converter/other/pnmtopng.c -@@ -2010,6 +2010,7 @@ +@@ -2014,6 +2014,7 @@ /* Write the raster */ /* max: 3 color channels, one alpha channel, 16-bit */ @@ -918,299 +918,6 @@ medias.maxcols *= 2; medias.maxrows *= 2; } ---- converter/ppm/ppmtompeg/frame.c -+++ converter/ppm/ppmtompeg/frame.c -@@ -137,15 +137,16 @@ - omfrw->orig_y = NULL; - Fsize_x = out_x; - /* Allocate new frame memory */ -- omfrw->orig_y = (uint8 **) malloc(sizeof(uint8 *) * Fsize_y); -+ omfrw->orig_y = (uint8 **) malloc2(sizeof(uint8 *) , Fsize_y); - ERRCHK(omfrw->orig_y, "malloc"); - for (y = 0; y < Fsize_y; y++) { -- omfrw->orig_y[y] = (uint8 *) malloc(sizeof(uint8) * out_x); -+ omfrw->orig_y[y] = (uint8 *) malloc2(sizeof(uint8) , out_x); - ERRCHK(omfrw->orig_y[y], "malloc"); - } - -- omfrw->orig_cr = (uint8 **) malloc(sizeof(int8 *) * Fsize_y / 2); -+ omfrw->orig_cr = (uint8 **) malloc2(sizeof(int8 *) , Fsize_y / 2); - ERRCHK(omfrw->orig_cr, "malloc"); -+ overflow2(out_x, sizeof(int8)); - for (y = 0; y < Fsize_y / 2; y++) { - omfrw->orig_cr[y] = (uint8 *) malloc(sizeof(int8) * out_x / 2); - ERRCHK(omfrw->orig_cr[y], "malloc"); -@@ -205,21 +206,23 @@ - Fsize_y = out_y; - - /* Allocate new frame memory */ -- omfrh->orig_y = (uint8 **) malloc(sizeof(uint8 *) * out_y); -+ omfrh->orig_y = (uint8 **) malloc2(sizeof(uint8 *), out_y); - ERRCHK(omfrh->orig_y, "malloc"); - for (y = 0; y < out_y; y++) { -- omfrh->orig_y[y] = (uint8 *) malloc(sizeof(uint8) * Fsize_x); -+ omfrh->orig_y[y] = (uint8 *) malloc2(sizeof(uint8) , Fsize_x); - ERRCHK(omfrh->orig_y[y], "malloc"); - } - -+ overflow2(out_y, sizeof(int8 *)); - omfrh->orig_cr = (uint8 **) malloc(sizeof(int8 *) * out_y / 2); - ERRCHK(omfrh->orig_cr, "malloc"); -+ overflow2(sizeof(int8), Fsize_x); - for (y = 0; y < out_y / 2; y++) { - omfrh->orig_cr[y] = (uint8 *) malloc(sizeof(int8) * Fsize_x / 2); - ERRCHK(omfrh->orig_cr[y], "malloc"); - } - -- omfrh->orig_cb = (uint8 **) malloc(sizeof(int8 *) * out_y / 2); -+ omfrh->orig_cb = (uint8 **) malloc2(sizeof(int8 *) , out_y / 2); - ERRCHK(omfrh->orig_cb, "malloc"); - for (y = 0; y < out_y / 2; y++) { - omfrh->orig_cb[y] = (uint8 *) malloc(sizeof(int8) * Fsize_x / 2); -@@ -522,20 +525,20 @@ - dctx = Fsize_x / DCTSIZE; - dcty = Fsize_y / DCTSIZE; - -- frame->y_blocks = (Block **) malloc(sizeof(Block *) * dcty); -+ frame->y_blocks = (Block **) malloc2(sizeof(Block *), dcty); - ERRCHK(frame->y_blocks, "malloc"); - for (i = 0; i < dcty; i++) { -- frame->y_blocks[i] = (Block *) malloc(sizeof(Block) * dctx); -+ frame->y_blocks[i] = (Block *) malloc2(sizeof(Block), dctx); - ERRCHK(frame->y_blocks[i], "malloc"); - } - -- frame->cr_blocks = (Block **) malloc(sizeof(Block *) * (dcty >> 1)); -- frame->cb_blocks = (Block **) malloc(sizeof(Block *) * (dcty >> 1)); -+ frame->cr_blocks = (Block **) malloc2(sizeof(Block *) , (dcty >> 1)); -+ frame->cb_blocks = (Block **) malloc2(sizeof(Block *) , (dcty >> 1)); - ERRCHK(frame->cr_blocks, "malloc"); - ERRCHK(frame->cb_blocks, "malloc"); - for (i = 0; i < (dcty >> 1); i++) { -- frame->cr_blocks[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); -- frame->cb_blocks[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); -+ frame->cr_blocks[i] = (Block *) malloc2(sizeof(Block) , (dctx >> 1)); -+ frame->cb_blocks[i] = (Block *) malloc2(sizeof(Block) , (dctx >> 1)); - ERRCHK(frame->cr_blocks[i], "malloc"); - ERRCHK(frame->cb_blocks[i], "malloc"); - } -@@ -567,10 +570,10 @@ - /* - * first, allocate tons of memory - */ -- frame->orig_y = (uint8 **) malloc(sizeof(uint8 *) * Fsize_y); -+ frame->orig_y = (uint8 **) malloc2(sizeof(uint8 *), Fsize_y); - ERRCHK(frame->orig_y, "malloc"); - for (y = 0; y < Fsize_y; y++) { -- frame->orig_y[y] = (uint8 *) malloc(sizeof(uint8) * Fsize_x); -+ frame->orig_y[y] = (uint8 *) malloc2(sizeof(uint8), Fsize_x); - ERRCHK(frame->orig_y[y], "malloc"); - } - -@@ -618,22 +621,24 @@ - return; - } - -- frame->halfX = (uint8 **) malloc(Fsize_y*sizeof(uint8 *)); -+ frame->halfX = (uint8 **) malloc2(Fsize_y, sizeof(uint8 *)); - ERRCHK(frame->halfX, "malloc"); -- frame->halfY = (uint8 **) malloc((Fsize_y-1)*sizeof(uint8 *)); -+ if(Fsize_y == 0 || Fsize_x == 0) -+ pm_error("assert: zero size"); -+ frame->halfY = (uint8 **) malloc2((Fsize_y-1), sizeof(uint8 *)); - ERRCHK(frame->halfY, "malloc"); -- frame->halfBoth = (uint8 **) malloc((Fsize_y-1)*sizeof(uint8 *)); -+ frame->halfBoth = (uint8 **) malloc2((Fsize_y-1), sizeof(uint8 *)); - ERRCHK(frame->halfBoth, "malloc"); - for ( y = 0; y < Fsize_y; y++ ) { -- frame->halfX[y] = (uint8 *) malloc((Fsize_x-1)*sizeof(uint8)); -+ frame->halfX[y] = (uint8 *) malloc2((Fsize_x-1), sizeof(uint8)); - ERRCHK(frame->halfX[y], "malloc"); - } - for ( y = 0; y < Fsize_y-1; y++ ) { -- frame->halfY[y] = (uint8 *) malloc(Fsize_x*sizeof(uint8)); -+ frame->halfY[y] = (uint8 *) malloc2(Fsize_x, sizeof(uint8)); - ERRCHK(frame->halfY[y], "malloc"); - } - for ( y = 0; y < Fsize_y-1; y++ ) { -- frame->halfBoth[y] = (uint8 *) malloc((Fsize_x-1)*sizeof(uint8)); -+ frame->halfBoth[y] = (uint8 *) malloc2((Fsize_x-1), sizeof(uint8)); - ERRCHK(frame->halfBoth[y], "malloc"); - } - } -@@ -667,24 +672,24 @@ - it for some reason, so do it this way at least for now -- more - flexible - */ -- frame->decoded_y = (uint8 **) malloc(sizeof(uint8 *) * Fsize_y); -+ frame->decoded_y = (uint8 **) malloc2(sizeof(uint8 *), Fsize_y); - ERRCHK(frame->decoded_y, "malloc"); - for (y = 0; y < Fsize_y; y++) { -- frame->decoded_y[y] = (uint8 *) malloc(sizeof(uint8) * Fsize_x); -+ frame->decoded_y[y] = (uint8 *) malloc2(sizeof(uint8), Fsize_x); - ERRCHK(frame->decoded_y[y], "malloc"); - } - -- frame->decoded_cr = (uint8 **) malloc(sizeof(int8 *) * (Fsize_y >> 1)); -+ frame->decoded_cr = (uint8 **) malloc2(sizeof(int8 *), (Fsize_y >> 1)); - ERRCHK(frame->decoded_cr, "malloc"); - for (y = 0; y < (Fsize_y >> 1); y++) { -- frame->decoded_cr[y] = (uint8 *) malloc(sizeof(uint8) * (Fsize_x >> 1)); -+ frame->decoded_cr[y] = (uint8 *) malloc2(sizeof(uint8), (Fsize_x >> 1)); - ERRCHK(frame->decoded_cr[y], "malloc"); - } - -- frame->decoded_cb = (uint8 **) malloc(sizeof(int8 *) * (Fsize_y >> 1)); -+ frame->decoded_cb = (uint8 **) malloc2(sizeof(int8 *), (Fsize_y >> 1)); - ERRCHK(frame->decoded_cb, "malloc"); - for (y = 0; y < (Fsize_y >> 1); y++) { -- frame->decoded_cb[y] = (uint8 *) malloc(sizeof(uint8) * (Fsize_x >> 1)); -+ frame->decoded_cb[y] = (uint8 *) malloc2(sizeof(uint8), (Fsize_x >> 1)); - ERRCHK(frame->decoded_cb[y], "malloc"); - } - ---- converter/ppm/ppmtompeg/iframe.c -+++ converter/ppm/ppmtompeg/iframe.c -@@ -859,6 +859,7 @@ - int ysz = (Fsize_y>>3) * sizeof(int32 *); - int xsz = (Fsize_x>>3); - -+ overflow2(Fsize_y>>3, sizeof(int32 *)); - needs_init = FALSE; - for (y=0; y<3; y++) { - varDiff[y] = ratio[y] = total[y] = 0.0; -@@ -877,6 +878,7 @@ - fprintf(stderr, "Out of memory in BlockComputeSNR\n"); - exit(-1); - } -+ overflow2(xsz, 4); - for (y = 0; y < ySize[0]>>3; y++) { - SignalY[y] = (int32 *) calloc(xsz,4); - SignalCr[y] = (int32 *) calloc(xsz,4); -@@ -1032,27 +1034,27 @@ - dctx = Fsize_x / DCTSIZE; - dcty = Fsize_y / DCTSIZE; - -- dct = (Block **) malloc(sizeof(Block *) * dcty); -+ dct = (Block **) malloc2(sizeof(Block *), dcty); - ERRCHK(dct, "malloc"); - for (i = 0; i < dcty; i++) { -- dct[i] = (Block *) malloc(sizeof(Block) * dctx); -+ dct[i] = (Block *) malloc2(sizeof(Block), dctx); - ERRCHK(dct[i], "malloc"); - } - -- dct_data = (dct_data_type **) malloc(sizeof(dct_data_type *) * dcty); -+ dct_data = (dct_data_type **) malloc2(sizeof(dct_data_type *), dcty); - ERRCHK(dct_data, "malloc"); - for (i = 0; i < dcty; i++) { -- dct_data[i] = (dct_data_type *) malloc(sizeof(dct_data_type) * dctx); -+ dct_data[i] = (dct_data_type *) malloc2(sizeof(dct_data_type),dctx); - ERRCHK(dct[i], "malloc"); - } - -- dctr = (Block **) malloc(sizeof(Block *) * (dcty >> 1)); -- dctb = (Block **) malloc(sizeof(Block *) * (dcty >> 1)); -+ dctr = (Block **) malloc2(sizeof(Block *), (dcty >> 1)); -+ dctb = (Block **) malloc2(sizeof(Block *), (dcty >> 1)); - ERRCHK(dctr, "malloc"); - ERRCHK(dctb, "malloc"); - for (i = 0; i < (dcty >> 1); i++) { -- dctr[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); -- dctb[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); -+ dctr[i] = (Block *) malloc2(sizeof(Block), (dctx >> 1)); -+ dctb[i] = (Block *) malloc2(sizeof(Block), (dctx >> 1)); - ERRCHK(dctr[i], "malloc"); - ERRCHK(dctb[i], "malloc"); - } ---- converter/ppm/ppmtompeg/jpeg.c -+++ converter/ppm/ppmtompeg/jpeg.c -@@ -228,7 +228,7 @@ - exit(1); - } - -- inoffsets = (int *)malloc(no_frames*sizeof(int)); -+ inoffsets = (int *)malloc2(no_frames, sizeof(int)); - - if (fread (&(width),sizeof(int),1,inFile) != 1) - { ---- converter/ppm/ppmtompeg/parallel.c -+++ converter/ppm/ppmtompeg/parallel.c -@@ -2113,6 +2113,8 @@ - - /* should keep list of port numbers to notify when frames become ready */ - -+ overflow2(numInputFiles, sizeof(int)); -+ overflow2(numInputFiles, sizeof(boolean)); - ready = (boolean *) calloc(numInputFiles, sizeof(boolean)); - waitMachine = (int *) calloc(numInputFiles, sizeof(int)); - waitPort = (int *) malloc(numMachines*sizeof(int)); -@@ -2126,7 +2128,7 @@ - - TransmitPortNum(masterHostName, masterPortNum, decodePortNum); - -- frameDone = (boolean *) malloc(numInputFiles*sizeof(boolean)); -+ frameDone = (boolean *) malloc2(numInputFiles, sizeof(boolean)); - memset((char *)frameDone, 0, numInputFiles*sizeof(boolean)); - - /* wait for ready signals and requests */ ---- converter/ppm/ppmtompeg/psearch.c -+++ converter/ppm/ppmtompeg/psearch.c -@@ -217,6 +217,13 @@ - int const max_search = max(searchRangeP, searchRangeB); - - int index; -+ -+ overflow2(searchRangeP, 2); -+ overflow2(searchRangeB, 2); -+ overflow_add(searchRangeP*2, 3); -+ overflow_add(searchRangeB*2, 3); -+ overflow2(2*searchRangeB+3, sizeof(int)); -+ overflow2(2*searchRangeP+3, sizeof(int)); - - pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *)); - bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *)); -@@ -824,6 +831,9 @@ - int *columnTotals; - int rowTotal; - -+ overflow2(searchRangeP, 2); -+ overflow_add(searchRangeP*2, 3); -+ overflow2(searchRangeP*2+3, sizeof(int)); - columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int)); - - #ifdef COMPLETE_DISPLAY -@@ -871,6 +881,9 @@ - - fprintf(fpointer, "B-frame Backwards:\n"); - -+ overflow2(searchRangeB, 2); -+ overflow_add(searchRangeB*2, 3); -+ overflow2(searchRangeB*2+3, sizeof(int)); - columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int)); - - #ifdef COMPLETE_DISPLAY -@@ -918,6 +931,9 @@ - - fprintf(fpointer, "B-frame Forwards:\n"); - -+ overflow2(searchRangeB, 2); -+ overflow_add(searchRangeB*2, 3); -+ overflow2(searchRangeB*2+3, sizeof(int)); - columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int)); - - #ifdef COMPLETE_DISPLAY ---- converter/ppm/ppmtompeg/rgbtoycc.c -+++ converter/ppm/ppmtompeg/rgbtoycc.c -@@ -72,6 +72,8 @@ - } - table_maxval = maxval; - -+ overflow_add(table_maxval, 1); -+ overflow2(table_maxval+1, sizeof(float)); - mult299 = malloc((table_maxval+1)*sizeof(float)); - mult587 = malloc((table_maxval+1)*sizeof(float)); - mult114 = malloc((table_maxval+1)*sizeof(float)); --- converter/ppm/ppmtopcx.c +++ converter/ppm/ppmtopcx.c @@ -418,6 +418,8 @@ @@ -1572,7 +1279,7 @@ #include "pnm.h" #include "shhopt.h" -@@ -572,8 +573,16 @@ +@@ -563,8 +564,16 @@ yshearfac = sin(cmdline.angle); if (yshearfac < 0.0) yshearfac = -yshearfac; @@ -1930,7 +1637,7 @@ reallocProduct((void **)&arrayName, nElements, sizeof(arrayName[0])) --- other/pnmcolormap.c +++ other/pnmcolormap.c -@@ -788,6 +788,7 @@ +@@ -795,6 +795,7 @@ pamP->width = intsqrt; else pamP->width = intsqrt + 1; ++++++ prepare-src-tarball ++++++ --- netpbm/prepare-src-tarball 2006-01-06 16:25:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/netpbm/prepare-src-tarball 2007-04-11 15:46:49.000000000 +0200 @@ -29,6 +29,16 @@ echo clean: >> Makefile cd ../../../.. +cd netpbm*/converter/ppm/ppmtompeg || exit 1 +rm -rf * +echo all: >> Makefile +echo install.bin: >> Makefile +echo install.man: >> Makefile +echo install.data: >> Makefile +echo clean: >> Makefile +cd ../../../.. + + tar cjf ../netpbm-$VER-nohpcdtoppm-nojbig.tar.bz2 * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org