Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at 2011-11-02 12:08:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netpbm (Old) and /work/SRC/openSUSE:Factory/.netpbm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netpbm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/netpbm/netpbm.changes 2011-09-23 02:14:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netpbm.new/netpbm.changes 2011-11-02 12:08:48.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Nov 1 14:29:33 UTC 2011 - [email protected] + +- updated to 10.35.82: + * pnmtopng: fix bug: with -alpha specifying a mask which contains + no fully transparent area, output PNG is fully opaque. + Introduced in 10.29. + * pnmquant: work with older Perl that doesn't have 3-argument open. + * pnmtops: fix message: says "from top edge" where it means + "from bottom edge." + * pgmtexture: fix wrong sum variance result. Wrong since the + beginning. Thanks Francois P. S. Luus <[email protected]>. + +------------------------------------------------------------------- Old: ---- netpbm-10.35.80-documentation.tar.bz2 netpbm-10.35.80-nohpcdtoppm-nojbig.tar.bz2 New: ---- netpbm-10.35.82-documentation.tar.bz2 netpbm-10.35.82-nohpcdtoppm-nojbig.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.EF17uV/_old 2011-11-02 12:08:49.000000000 +0100 +++ /var/tmp/diff_new_pack.EF17uV/_new 2011-11-02 12:08:49.000000000 +0100 @@ -30,7 +30,7 @@ Obsoletes: netpbm-64bit %endif # -Version: 10.35.80 +Version: 10.35.82 Release: 1 Summary: A Powerful Graphics Conversion Package Source: netpbm-%{version}-nohpcdtoppm-nojbig.tar.bz2 @@ -142,6 +142,7 @@ make CFLAGS="$CFLAGS" \ JASPERLIB=-ljasper \ JASPERHDR_DIR=/usr/include/jasper +rm doc/INSTALL # # convert html to man pages cd netpbm.sourceforge.net/doc ++++++ netpbm-10.35.80-documentation.tar.bz2 -> netpbm-10.35.82-documentation.tar.bz2 ++++++ ++++ 1640 lines of diff (skipped) ++++++ netpbm-10.35.80-nohpcdtoppm-nojbig.tar.bz2 -> netpbm-10.35.82-nohpcdtoppm-nojbig.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm-10.35.80/Makefile.version new/netpbm-10.35.82/Makefile.version --- old/netpbm-10.35.80/Makefile.version 2011-05-24 14:14:54.000000000 +0200 +++ new/netpbm-10.35.82/Makefile.version 2011-11-01 14:18:28.000000000 +0100 @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 80 +NETPBM_POINT_RELEASE = 82 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm-10.35.80/analyzer/pgmtexture.c new/netpbm-10.35.82/analyzer/pgmtexture.c --- old/netpbm-10.35.80/analyzer/pgmtexture.c 2011-05-24 14:14:35.000000000 +0200 +++ new/netpbm-10.35.82/analyzer/pgmtexture.c 2011-11-01 14:18:08.000000000 +0100 @@ -997,10 +997,10 @@ sentropy[1] = f8_sentropy (P_matrix45, tones); sentropy[2] = f8_sentropy (P_matrix90, tones); sentropy[3] = f8_sentropy (P_matrix135, tones); - svar[0] = f7_svar (P_matrix0, tones, sentropy[0]); - svar[1] = f7_svar (P_matrix45, tones, sentropy[1]); - svar[2] = f7_svar (P_matrix90, tones, sentropy[2]); - svar[3] = f7_svar (P_matrix135, tones, sentropy[3]); + svar[0] = f7_svar (P_matrix0, tones, savg[0]); + svar[1] = f7_svar (P_matrix45, tones, savg[1]); + svar[2] = f7_svar (P_matrix90, tones, savg[2]); + svar[3] = f7_svar (P_matrix135, tones, savg[3]); results (F7, svar); results (F8, sentropy); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm-10.35.80/converter/other/pnmtopng.c new/netpbm-10.35.82/converter/other/pnmtopng.c --- old/netpbm-10.35.80/converter/other/pnmtopng.c 2011-05-24 14:14:48.000000000 +0200 +++ new/netpbm-10.35.82/converter/other/pnmtopng.c 2011-11-01 14:18:21.000000000 +0100 @@ -959,17 +959,17 @@ static void -analyzeAlpha(FILE * const ifp, - pm_filepos const rasterPos, - int const cols, - int const rows, - xelval const maxval, - int const format, - gray ** const alphaMask, - gray const alphaMaxval, - bool * const allOpaqueP, - bool * const singleColorIsTransP, - pixel* const alphaTranscolorP) { +analyzeAlpha(FILE * const ifP, + pm_filepos const rasterPos, + unsigned int const cols, + unsigned int const rows, + xelval const maxval, + int const format, + gray ** const alphaMask, + gray const alphaMaxval, + bool * const allOpaqueP, + bool * const singleColorIsTransP, + pixel * const alphaTranscolorP) { /*---------------------------------------------------------------------------- Get information about the alpha mask, in combination with the masked image, that Caller can use to choose the most efficient way to @@ -990,19 +990,38 @@ */ pixel transcolor; /* Color of the transparent pixel mentioned above. */ + bool foundNonOpaquePixel; + /* We found a pixel in the image where the alpha mask says it is + not fully opaque. + */ xelrow = pnm_allocrow(cols); { - int row; + unsigned int row; + /* See if the mask says every pixel is opaque. */ + foundNonOpaquePixel = false; /* initial assumption */ + pm_seek2(ifP, &rasterPos, sizeof(rasterPos)); + for (row = 0; row < rows && !foundNonOpaquePixel; ++row) { + unsigned int col; + pnm_readpnmrow(ifP, xelrow, cols, maxval, format); + for (col = 0; col < cols && !foundNonOpaquePixel; ++col) { + if (alphaMask[row][col] != maxval) + foundNonOpaquePixel = true; + } + } + } + + if (foundNonOpaquePixel) { + unsigned int row; /* Find a candidate transparent color -- the color of any pixel in the image that the alpha mask says should be transparent. */ - foundTransparentPixel = FALSE; /* initial assumption */ - pm_seek2(ifp, &rasterPos, sizeof(rasterPos)); - for (row = 0 ; row < rows && !foundTransparentPixel ; ++row) { - int col; - pnm_readpnmrow(ifp, xelrow, cols, maxval, format); + foundTransparentPixel = false; /* initial assumption */ + pm_seek2(ifP, &rasterPos, sizeof(rasterPos)); + for (row = 0; row < rows && !foundTransparentPixel; ++row) { + unsigned int col; + pnm_readpnmrow(ifP, xelrow, cols, maxval, format); for (col = 0; col < cols && !foundTransparentPixel; ++col) { if (alphaMask[row][col] == 0) { foundTransparentPixel = TRUE; @@ -1010,20 +1029,20 @@ } } } - } + } else + foundTransparentPixel = false; pnm_freerow(xelrow); + *allOpaqueP = !foundNonOpaquePixel; + if (foundTransparentPixel) { - *allOpaqueP = FALSE; - tryTransparentColor(ifp, rasterPos, cols, rows, maxval, format, + tryTransparentColor(ifP, rasterPos, cols, rows, maxval, format, alphaMask, alphaMaxval, transcolor, singleColorIsTransP); *alphaTranscolorP = transcolor; - } else { - *allOpaqueP = TRUE; - *singleColorIsTransP = FALSE; - } + } else + *singleColorIsTransP = false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm-10.35.80/converter/other/pnmtops.c new/netpbm-10.35.82/converter/other/pnmtops.c --- old/netpbm-10.35.80/converter/other/pnmtops.c 2011-05-24 14:14:48.000000000 +0200 +++ new/netpbm-10.35.82/converter/other/pnmtops.c 2011-11-01 14:18:21.000000000 +0100 @@ -645,7 +645,7 @@ if (verbose) pm_message("Image will be %3.2f points wide by %3.2f points high, " "left edge %3.2f points from left edge of page, " - "bottom edge %3.2f points from top of page; " + "bottom edge %3.2f points from bottom of page; " "%sturned to landscape orientation", *scolsP, *srowsP, *llxP, *llyP, *turnedP ? "" : "NOT "); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm-10.35.80/doc/HISTORY new/netpbm-10.35.82/doc/HISTORY --- old/netpbm-10.35.80/doc/HISTORY 2011-05-24 14:14:39.000000000 +0200 +++ new/netpbm-10.35.82/doc/HISTORY 2011-11-01 14:18:12.000000000 +0100 @@ -4,6 +4,22 @@ CHANGE HISTORY -------------- +11.09.25 BJH Release 10.35.82 + + pnmtopng: fix bug: with -alpha specifying a mask which contains + no fully transparent area, output PNG is fully opaque. + Introduced in 10.29. + + pnmquant: work with older Perl that doesn't have 3-argument open. + + pnmtops: fix message: says "from top edge" where it means + "from bottom edge." + +11.07.10 BJH Release 10.35.81 + + pgmtexture: fix wrong sum variance result. Wrong since the + beginning. Thanks Francois P. S. Luus <[email protected]>. + 11.02.18 BJH Release 10.35.80 asciitopgm: fix bug: memory corruption on too-long lines. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm-10.35.80/editor/pamcomp.c new/netpbm-10.35.82/editor/pamcomp.c --- old/netpbm-10.35.80/editor/pamcomp.c 2011-05-24 14:14:37.000000000 +0200 +++ new/netpbm-10.35.82/editor/pamcomp.c 2011-11-01 14:18:10.000000000 +0100 @@ -599,7 +599,7 @@ PAM_STRUCT_SIZE(allocation_depth)); if (overlayPam.width != alphaPam.width || - overlayPam.height != overlayPam.height) + overlayPam.height != alphaPam.height) pm_error("Opacity map and overlay image are not the same size"); } else alphaFileP = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm-10.35.80/editor/pnmquant new/netpbm-10.35.82/editor/pnmquant --- old/netpbm-10.35.80/editor/pnmquant 2011-05-24 14:14:37.000000000 +0200 +++ new/netpbm-10.35.82/editor/pnmquant 2011-11-01 14:18:10.000000000 +0100 @@ -149,7 +149,7 @@ tell(INFH); # Avoids bogus "INFH is not referenced" warning } } else { - open(STDIN, "<", $infile) + open(STDIN, "<$infile") or die("Unable to open input file '$infile'. Errno=$ERRNO"); } } @@ -194,7 +194,7 @@ push(@options, '-quiet'); } - open(STDOUT, ">", $mapfileSpec); + open(STDOUT, ">$mapfileSpec"); my $maprc = system("pnmcolormap", $ncolors, @options); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
