Bug 488468: qcms build break with pre-4 GCCs (#if 0 commented text should be C/C++ commented), r=jmuizelaar
authorPeter Weilbacher <mozilla@weilbacher.org>
Thu, 23 Apr 2009 19:38:11 +0200
changeset 27681 f083055d319ae23e2beeb8c1cffcad62c0e7db5d
parent 27680 a0b5b3125f606f72c28d7f633f9699206553e26e
child 27682 cad52cbe6537f738b7500bab36eb10a13ec1cbcc
push idunknown
push userunknown
push dateunknown
reviewersjmuizelaar
bugs488468
milestone1.9.2a1pre
Bug 488468: qcms build break with pre-4 GCCs (#if 0 commented text should be C/C++ commented), r=jmuizelaar
gfx/qcms/qcmsint.h
modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
--- a/gfx/qcms/qcmsint.h
+++ b/gfx/qcms/qcmsint.h
@@ -81,18 +81,19 @@ struct lutType {
 	uint16_t num_input_table_entries;
 	uint16_t num_output_table_entries;
 
 	uint16_t *input_table;
 	uint16_t *clut_table;
 	uint16_t *output_table;
 };
 #if 0
-this is from an intial idea of having the struct correspond to the data in
-the file. I decided that it wasn't a good idea.
+/* this is from an intial idea of having the struct correspond to the data in
+ * the file. I decided that it wasn't a good idea.
+ */
 struct tag_value {
 	uint32_t type;
 	union {
 		struct {
 			uint32_t reserved;
 			struct {
 				s15Fixed16Number X;
 				s15Fixed16Number Y;
--- a/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
+++ b/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
@@ -388,19 +388,20 @@ nsresult nsJPEGDecoder::ProcessData(cons
           break;
         default:
           mState = JPEG_ERROR;
           PR_LOG(gJPEGDecoderAccountingLog, PR_LOG_DEBUG,
                  ("} (unknown colorpsace (2))"));
           return NS_ERROR_UNEXPECTED;
         }
 #if 0
-	We don't currently support CMYK profiles. The following
-	code dealt with lcms types. Add something like this
-	back when we gain support for CMYK.
+        /* We don't currently support CMYK profiles. The following
+         * code dealt with lcms types. Add something like this
+         * back when we gain support for CMYK.
+         */
         /* Adobe Photoshop writes YCCK/CMYK files with inverted data */
         if (mInfo.out_color_space == JCS_CMYK)
           type |= FLAVOR_SH(mInfo.saw_Adobe_marker ? 1 : 0);
 #endif
 
         if (gfxPlatform::GetCMSOutputProfile()) {
 
           /* Calculate rendering intent. */