Attachment #406566 for bug #517524

View | Details | Raw Unified | Return to bug 517524
Collapse All | Expand All




++ netpbm-10.61.02/converter/pbm/cmuwmtopbm.c


    rc = pm_readbiglong(ifP, &l);
    if (rc == -1 )
        pm_error("%s", initReadError);
    if ((uint32_t)l != cmuwmMagic)
        pm_error("bad magic number in CMU window manager file");
    rc = pm_readbiglong(ifP, &l);
    if (rc == -1)
        pm_error("%s", initReadError);
    *colsP = l;
    rc = pm_readbiglong(ifP, &l);
    if (rc == -1 )
        pm_error("%s", initReadError);
    *rowsP = l;
    rc = pm_readbigshort(ifP, &s);
    if (rc == -1)
        pm_error("%s", initReadError);
    *depthP = s;
}

++ netpbm-10.61.02/converter/other/tifftopnm.c

        int ok;
        ok = TIFFRGBAImageOK(tif, emsg);
        if (!ok) {
            pm_message("%s", emsg);
            *statusP = CONV_UNABLE;
        } else {
            uint32 * raster;

                
                ok = TIFFRGBAImageBegin(&img, tif, stopOnErrorFalse, emsg);
                if (!ok) {
                    pm_message("%s", emsg);
                    *statusP = CONV_FAILED;
                } else {
                    int ok;
                    ok = TIFFRGBAImageGet(&img, raster, cols, rows);
                    TIFFRGBAImageEnd(&img) ;
                    if (!ok) {
                        pm_message("%s", emsg);
                        *statusP = CONV_FAILED;
                    } else {
                        *statusP = CONV_DONE;
++ netpbm-10.61.02/converter/other/fiasco/pnmtofiasco.c

      return 0;
   else
   {
      fprintf (stderr, "%s", fiasco_get_error_message ());
      fprintf (stderr, "\n");
      return 1;
   }
++ netpbm-10.61.02/converter/other/fiasco/params.c

    fprintf (stderr, "Usage: %s [OPTION]...%s\n", progname,
             non_opt_string ? non_opt_string : " ");
    if (synopsis != NULL)
        fprintf (stderr, "%s", synopsis);
    fprintf (stderr, "\n\n");
    fprintf (stderr, "Mandatory or optional arguments to long options "
             "are mandatory or optional\nfor short options too. "

Return to bug 517524

Line Link Here

(-)file_not_specified_in_diff (-13 / +13 lines)
0	-- netpbm-10.61.02.orig/converter/pbm/cmuwmtopbm.c	0	++ netpbm-10.61.02/converter/pbm/cmuwmtopbm.c
Lines 48-67 Link Here
48		48
49	rc = pm_readbiglong(ifP, &l);	49	rc = pm_readbiglong(ifP, &l);
50	if (rc == -1 )	50	if (rc == -1 )
51	pm_error(initReadError);	51	pm_error("%s", initReadError);
52	if ((uint32_t)l != cmuwmMagic)	52	if ((uint32_t)l != cmuwmMagic)
53	pm_error("bad magic number in CMU window manager file");	53	pm_error("bad magic number in CMU window manager file");
54	rc = pm_readbiglong(ifP, &l);	54	rc = pm_readbiglong(ifP, &l);
55	if (rc == -1)	55	if (rc == -1)
56	pm_error(initReadError);	56	pm_error("%s", initReadError);
57	*colsP = l;	57	*colsP = l;
58	rc = pm_readbiglong(ifP, &l);	58	rc = pm_readbiglong(ifP, &l);
59	if (rc == -1 )	59	if (rc == -1 )
60	pm_error(initReadError);	60	pm_error("%s", initReadError);
61	*rowsP = l;	61	*rowsP = l;
62	rc = pm_readbigshort(ifP, &s);	62	rc = pm_readbigshort(ifP, &s);
63	if (rc == -1)	63	if (rc == -1)
64	pm_error(initReadError);	64	pm_error("%s", initReadError);
65	*depthP = s;	65	*depthP = s;
66	}	66	}
67		67
68	-- netpbm-10.61.02.orig/converter/other/tifftopnm.c	68	++ netpbm-10.61.02/converter/other/tifftopnm.c
Lines 1459-1465 Link Here
1459	int ok;	1459	int ok;
1460	ok = TIFFRGBAImageOK(tif, emsg);	1460	ok = TIFFRGBAImageOK(tif, emsg);
1461	if (!ok) {	1461	if (!ok) {
1462	pm_message(emsg);	1462	pm_message("%s", emsg);
1463	*statusP = CONV_UNABLE;	1463	*statusP = CONV_UNABLE;
1464	} else {	1464	} else {
1465	uint32 * raster;	1465	uint32 * raster;
Lines 1479-1492 Link Here
1479		1479
1480	ok = TIFFRGBAImageBegin(&img, tif, stopOnErrorFalse, emsg);	1480	ok = TIFFRGBAImageBegin(&img, tif, stopOnErrorFalse, emsg);
1481	if (!ok) {	1481	if (!ok) {
1482	pm_message(emsg);	1482	pm_message("%s", emsg);
1483	*statusP = CONV_FAILED;	1483	*statusP = CONV_FAILED;
1484	} else {	1484	} else {
1485	int ok;	1485	int ok;
1486	ok = TIFFRGBAImageGet(&img, raster, cols, rows);	1486	ok = TIFFRGBAImageGet(&img, raster, cols, rows);
1487	TIFFRGBAImageEnd(&img) ;	1487	TIFFRGBAImageEnd(&img) ;
1488	if (!ok) {	1488	if (!ok) {
1489	pm_message(emsg);	1489	pm_message("%s", emsg);
1490	*statusP = CONV_FAILED;	1490	*statusP = CONV_FAILED;
1491	} else {	1491	} else {
1492	*statusP = CONV_DONE;	1492	*statusP = CONV_DONE;
1493	-- netpbm-10.61.02.orig/converter/other/fiasco/pnmtofiasco.c	1493	++ netpbm-10.61.02/converter/other/fiasco/pnmtofiasco.c
Lines 170-176 Link Here
170	return 0;	170	return 0;
171	else	171	else
172	{	172	{
173	fprintf (stderr, fiasco_get_error_message ());	173	fprintf (stderr, "%s", fiasco_get_error_message ());
174	fprintf (stderr, "\n");	174	fprintf (stderr, "\n");
175	return 1;	175	return 1;
176	}	176	}
177	-- netpbm-10.61.02.orig/converter/other/fiasco/params.c	177	++ netpbm-10.61.02/converter/other/fiasco/params.c
Lines 656-662 Link Here
656	fprintf (stderr, "Usage: %s [OPTION]...%s\n", progname,	656	fprintf (stderr, "Usage: %s [OPTION]...%s\n", progname,
657	non_opt_string ? non_opt_string : " ");	657	non_opt_string ? non_opt_string : " ");
658	if (synopsis != NULL)	658	if (synopsis != NULL)
659	fprintf (stderr, synopsis);	659	fprintf (stderr, "%s", synopsis);
660	fprintf (stderr, "\n\n");	660	fprintf (stderr, "\n\n");
661	fprintf (stderr, "Mandatory or optional arguments to long options "	661	fprintf (stderr, "Mandatory or optional arguments to long options "
662	"are mandatory or optional\nfor short options too. "	662	"are mandatory or optional\nfor short options too. "