зеркало из https://github.com/mozilla/gecko-dev.git
Removes console output from non-debug builds in libimg and libpr0n modules.
r=cls, sr=tor, a=drivers(dbaron), bug=78649.
This commit is contained in:
Родитель
0f6bf1f2e1
Коммит
3a75667d13
|
@ -1283,10 +1283,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
|
||||||
default: // png_ptr->row_info.pixel_depth != 1,2,4,8,16,24,32,48,64
|
default: // png_ptr->row_info.pixel_depth != 1,2,4,8,16,24,32,48,64
|
||||||
{
|
{
|
||||||
// this should never happen
|
// this should never happen
|
||||||
|
#ifdef DEBUG
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"libpng internal error: png_ptr->row_info.pixel_depth = %d\n",
|
"libpng internal error: png_ptr->row_info.pixel_depth = %d\n",
|
||||||
png_ptr->row_info.pixel_depth);
|
png_ptr->row_info.pixel_depth);
|
||||||
fflush(stderr);
|
fflush(stderr);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} /* end switch (png_ptr->row_info.pixel_depth) */
|
} /* end switch (png_ptr->row_info.pixel_depth) */
|
||||||
|
@ -3030,8 +3032,10 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
|
||||||
{
|
{
|
||||||
|
|
||||||
// GRR: PRINT ERROR HERE: SHOULD NEVER BE REACHED
|
// GRR: PRINT ERROR HERE: SHOULD NEVER BE REACHED
|
||||||
|
#ifdef DEBUG
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"libpng: internal logic error (png_read_filter_row_mmx_avg())\n");
|
"libpng: internal logic error (png_read_filter_row_mmx_avg())\n");
|
||||||
|
#endif
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
__asm__ __volatile__ (
|
__asm__ __volatile__ (
|
||||||
|
|
|
@ -429,13 +429,17 @@ il_png_error_handler(png_structp png_ptr, png_const_charp msg)
|
||||||
* been defined. Adapted from readpng2_error_handler() in "PNG: The
|
* been defined. Adapted from readpng2_error_handler() in "PNG: The
|
||||||
* Definitive Guide" (O'Reilly, 1999). */
|
* Definitive Guide" (O'Reilly, 1999). */
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
fprintf(stderr, "nspng libpng error: %s\n", msg);
|
fprintf(stderr, "nspng libpng error: %s\n", msg);
|
||||||
fflush(stderr);
|
fflush(stderr);
|
||||||
|
#endif
|
||||||
|
|
||||||
ipng_p = (ipng_structp)png_get_error_ptr(png_ptr);
|
ipng_p = (ipng_structp)png_get_error_ptr(png_ptr);
|
||||||
if (ipng_p == NULL) { /* we are completely hosed now */
|
if (ipng_p == NULL) { /* we are completely hosed now */
|
||||||
|
#ifdef DEBUG
|
||||||
fprintf(stderr, "nspng severe error: jmpbuf not recoverable.\n");
|
fprintf(stderr, "nspng severe error: jmpbuf not recoverable.\n");
|
||||||
fflush(stderr);
|
fflush(stderr);
|
||||||
|
#endif
|
||||||
PR_ASSERT(ipng_p != NULL); /* instead of exit(99); */
|
PR_ASSERT(ipng_p != NULL); /* instead of exit(99); */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1278,6 +1278,7 @@ IL_ChromeAlphaAbuseCheck(il_container *ic)
|
||||||
else if (alpha[x] == 255)
|
else if (alpha[x] == 255)
|
||||||
num255++;
|
num255++;
|
||||||
}
|
}
|
||||||
|
#ifdef DEBUG
|
||||||
if (num000+num255 == header->width*header->height) {
|
if (num000+num255 == header->width*header->height) {
|
||||||
fprintf(stderr, "CHROME ALPHA ABUSE\n");
|
fprintf(stderr, "CHROME ALPHA ABUSE\n");
|
||||||
fprintf(stderr, "\tusing an 8-bit alpha channel to represent binary alpha\n");
|
fprintf(stderr, "\tusing an 8-bit alpha channel to represent binary alpha\n");
|
||||||
|
@ -1285,6 +1286,7 @@ IL_ChromeAlphaAbuseCheck(il_container *ic)
|
||||||
fprintf(stderr, "\tnum000=%d num255=%d sum=%d w*h=%d\n",
|
fprintf(stderr, "\tnum000=%d num255=%d sum=%d w*h=%d\n",
|
||||||
num000, num255, num000+num255, header->width*header->height);
|
num000, num255, num000+num255, header->width*header->height);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
} else if (ic->image->header.alpha_bits == 1) {
|
} else if (ic->image->header.alpha_bits == 1) {
|
||||||
PRBool constAlpha=PR_TRUE;
|
PRBool constAlpha=PR_TRUE;
|
||||||
|
|
||||||
|
@ -1309,12 +1311,13 @@ IL_ChromeAlphaAbuseCheck(il_container *ic)
|
||||||
constAlpha = PR_FALSE;
|
constAlpha = PR_FALSE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#ifdef DEBUG
|
||||||
if (constAlpha) {
|
if (constAlpha) {
|
||||||
fprintf(stderr, "CHROME ALPHA ABUSE\n");
|
fprintf(stderr, "CHROME ALPHA ABUSE\n");
|
||||||
fprintf(stderr, "\tfully opaque 1-bit alpha mask\n");
|
fprintf(stderr, "\tfully opaque 1-bit alpha mask\n");
|
||||||
fprintf(stderr, "\t%s\n", ic->url_address);
|
fprintf(stderr, "\t%s\n", ic->url_address);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -431,7 +431,11 @@ NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PR
|
||||||
|
|
||||||
return NS_OK; /* I/O suspension */
|
return NS_OK; /* I/O suspension */
|
||||||
default:
|
default:
|
||||||
printf("got someo other state!?\n");
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("got someo other state!?\n");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче