Bug 468994 - fixing warning about formal parameter 2 different from declaration int16 != int, r=joe
authortimeless@mozdev.org
Sun, 13 Dec 2009 09:11:39 -0800
changeset 35667 6956e3df30f564c75070ec580a7fb047014dd1a2
parent 35666 6cae4ab0b62281e5272b2edb71b7cbb216509fb2
child 35668 8499d4d2037ff3ccced54849f56b371f2d8e0f1a
push id10671
push userphilringnalda@gmail.com
push dateSun, 13 Dec 2009 17:12:14 +0000
treeherdermozilla-central@6956e3df30f5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs468994
milestone1.9.3a1pre
Bug 468994 - fixing warning about formal parameter 2 different from declaration int16 != int, r=joe
jpeg/jcmarker.c
--- a/jpeg/jcmarker.c
+++ b/jpeg/jcmarker.c
@@ -428,32 +428,32 @@ emit_adobe_app14 (j_compress_ptr cinfo)
  * These routines allow writing an arbitrary marker with parameters.
  * The only intended use is to emit COM or APPn markers after calling
  * write_file_header and before calling write_frame_header.
  * Other uses are not guaranteed to produce desirable results.
  * Counting the parameter bytes properly is the caller's responsibility.
  */
 
 METHODDEF(void)
-write_marker_header (j_compress_ptr cinfo, int16 marker, unsigned int datalen)
+write_marker_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
 /* Emit an arbitrary marker header */
 {
   if (datalen > (unsigned int) 65533)		/* safety check */
     ERREXIT(cinfo, JERR_BAD_LENGTH);
 
   emit_marker(cinfo, (JPEG_MARKER) marker);
 
   emit_2bytes(cinfo, (int16) (datalen + 2));	/* total length */
 }
 
 METHODDEF(void)
-write_marker_byte (j_compress_ptr cinfo, int16 val)
+write_marker_byte (j_compress_ptr cinfo, int val)
 /* Emit one byte of marker parameters following write_marker_header */
 {
-  emit_byte(cinfo, val);
+  emit_byte(cinfo, (int16) val);
 }
 
 
 /*
  * Write datastream header.
  * This consists of an SOI and optional APPn markers.
  * We recommend use of the JFIF marker, but not the Adobe marker,
  * when using YCbCr or grayscale data.  The JFIF marker should NOT