backport r4242 to branch 32

crowell · crowell · commit 3f917696279f · 2015-06-15T10:45:34.000-04:00
Fix compiler errors on gcc 4.6.3 due to mismatched format strings
and integer types.
diff --git a/src/pagespeed/kernel/image/image_frame_interface.cc b/src/pagespeed/kernel/image/image_frame_interface.cc
@@ -94,7 +94,8 @@ GoogleString FrameSpec::ToString() const {
   return StringPrintf(
       "Frame: size %u x %u at (%u, %u) "
       "pixel_format: %d, duration_ms: %lu, disposal: %d, progressive: %s",
-      width, height, top, left, pixel_format, duration_ms, disposal,
+      width, height, top, left, pixel_format,
+      static_cast<unsigned long>(duration_ms), disposal,
       (hint_progressive ? "yes" : "no"));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ GoogleString FrameSpec::ToString() const {`
`94`	`94`	`return StringPrintf(`
`95`	`95`	`"Frame: size %u x %u at (%u, %u) "`
`96`	`96`	`"pixel_format: %d, duration_ms: %lu, disposal: %d, progressive: %s",`
`97`		`- width, height, top, left, pixel_format, duration_ms, disposal,`
	`97`	`+ width, height, top, left, pixel_format,`
	`98`	`+ static_cast<unsigned long>(duration_ms), disposal,`
`98`	`99`	`(hint_progressive ? "yes" : "no"));`
`99`	`100`	`}`
`100`	`101`