Bug 976143 - Fix build warnings in iccread.c; r=jrmuizel
authorMs2ger <ms2ger@gmail.com>
Thu, 27 Mar 2014 21:05:15 +0100
changeset 175810 be912f59c937142595c6f7b735058b756064661d
parent 175809 d6f9707cbf5321a9a22e2a279a4c729656edd0c5
child 175811 c8434e3d0563c57e7562bc75d9e4e3eec5378577
push id26500
push userkwierso@gmail.com
push dateFri, 28 Mar 2014 23:16:18 +0000
treeherdermozilla-central@88ae1bfaaf3d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs976143
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 976143 - Fix build warnings in iccread.c; r=jrmuizel
gfx/qcms/iccread.c
--- a/gfx/qcms/iccread.c
+++ b/gfx/qcms/iccread.c
@@ -535,17 +535,17 @@ static struct lutmABType *read_tag_lutmA
 	uint32_t a_curve_offset, b_curve_offset, m_curve_offset;
 	uint32_t matrix_offset;
 	uint32_t clut_offset;
 	uint32_t clut_size = 1;
 	uint8_t clut_precision;
 	uint32_t type = read_u32(src, offset);
 	uint8_t num_in_channels, num_out_channels;
 	struct lutmABType *lut;
-	int i;
+	uint32_t i;
 
 	if (type != LUT_MAB_TYPE && type != LUT_MBA_TYPE) {
 		return NULL;
 	}
 
 	num_in_channels = read_u8(src, offset + 8);
 	num_out_channels = read_u8(src, offset + 8);
 	if (num_in_channels > MAX_CHANNELS || num_out_channels > MAX_CHANNELS)
@@ -670,17 +670,17 @@ static struct lutType *read_tag_lutType(
 	uint32_t type = read_u32(src, offset);
 	uint16_t num_input_table_entries;
 	uint16_t num_output_table_entries;
 	uint8_t in_chan, grid_points, out_chan;
 	uint32_t clut_offset, output_offset;
 	uint32_t clut_size;
 	size_t entry_size;
 	struct lutType *lut;
-	int i;
+	uint32_t i;
 
 	/* I'm not sure why the spec specifies a fixed number of entries for LUT8 tables even though
 	 * they have room for the num_entries fields */
 	if (type == LUT8_TYPE) {
 		num_input_table_entries = 256;
 		num_output_table_entries = 256;
 		entry_size = 1;
 	} else if (type == LUT16_TYPE) {
@@ -1200,17 +1200,17 @@ static void qcms_data_from_file(FILE *fi
 
 	/* successfully get the profile.*/
 	*mem = data;
 	*size = length;
 }
 
 qcms_profile* qcms_profile_from_file(FILE *file)
 {
-	uint32_t length;
+	size_t length;
 	qcms_profile *profile;
 	void *data;
 
 	qcms_data_from_file(file, &data, &length);
 	if ((data == NULL) || (length == 0))
 		return INVALID_PROFILE;
 
 	profile = qcms_profile_from_memory(data, length);