Backout of jat's checkin for 78649 - win32 line endings will break some

commercial unix compilers.

modules/libimg/png/pnggccrd.c

@@ -1283,12 +1283,10 @@ 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
          {
             // this should never happen
-#ifdef DEBUG
             fprintf(stderr,
               "libpng internal error:  png_ptr->row_info.pixel_depth = %d\n",
               png_ptr->row_info.pixel_depth);
             fflush(stderr);
-#endif
             break;
          }
       } /* end switch (png_ptr->row_info.pixel_depth) */
@@ -3032,10 +3030,8 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
       {
 
          // GRR:  PRINT ERROR HERE:  SHOULD NEVER BE REACHED
-#ifdef DEBUG
          fprintf(stderr,
            "libpng:  internal logic error (png_read_filter_row_mmx_avg())\n");
-#endif
 
 #if 0
         __asm__ __volatile__ (

modules/libimg/pngcom/ipng.cpp

@@ -429,17 +429,13 @@ il_png_error_handler(png_structp png_ptr, png_const_charp msg)
      * been defined.  Adapted from readpng2_error_handler() in "PNG: The
      * Definitive Guide" (O'Reilly, 1999). */
 
-#ifdef DEBUG
     fprintf(stderr, "nspng libpng error: %s\n", msg);
     fflush(stderr);
-#endif
 
     ipng_p = (ipng_structp)png_get_error_ptr(png_ptr);
     if (ipng_p == NULL) {            /* we are completely hosed now */
-#ifdef DEBUG
         fprintf(stderr, "nspng severe error:  jmpbuf not recoverable.\n");
         fflush(stderr);
-#endif
         PR_ASSERT(ipng_p != NULL);   /* instead of exit(99); */
     }
 

modules/libimg/src/if.cpp

@@ -1278,7 +1278,6 @@ IL_ChromeAlphaAbuseCheck(il_container *ic)
         else if (alpha[x] == 255)
           num255++;
       }
-#ifdef DEBUG
     if (num000+num255 == header->width*header->height) {
       fprintf(stderr, "CHROME ALPHA ABUSE\n");
       fprintf(stderr, "\tusing an 8-bit alpha channel to represent binary alpha\n");
@@ -1286,7 +1285,6 @@ IL_ChromeAlphaAbuseCheck(il_container *ic)
       fprintf(stderr, "\tnum000=%d num255=%d sum=%d w*h=%d\n",
               num000, num255, num000+num255, header->width*header->height);
     }
-#endif
   } else if (ic->image->header.alpha_bits == 1) {
     PRBool constAlpha=PR_TRUE;
 
@@ -1311,13 +1309,12 @@ IL_ChromeAlphaAbuseCheck(il_container *ic)
           constAlpha = PR_FALSE;
           break;
         }
-#ifdef DEBUG    
+    
     if (constAlpha) {
       fprintf(stderr, "CHROME ALPHA ABUSE\n");
       fprintf(stderr, "\tfully opaque 1-bit alpha mask\n");
       fprintf(stderr, "\t%s\n", ic->url_address);
     }
-#endif
   }
 }
 

modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp

@@ -431,11 +431,7 @@ NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PR
 
           return NS_OK; /* I/O suspension */
         default:
-          {
-#ifdef DEBUG
-            printf("got someo other state!?\n");
-#endif
-          }
+          printf("got someo other state!?\n");
       }
     }
   }