Merge pull request #8572 from QuLogic/big-image-crash

tacaswell · web-flow · commit b54682230a39 · 2017-05-08T15:02:39.000-04:00
FIX: Upcast image stride to 64-bit when multiplying values.
diff --git a/extern/agg24-svn/include/agg_rendering_buffer.h b/extern/agg24-svn/include/agg_rendering_buffer.h
@@ -62,7 +62,7 @@ namespace agg
             m_stride = stride;
             if(stride < 0) 
             { 
-                m_start = m_buf - int(height - 1) * stride;
+                m_start = m_buf - (AGG_INT64)(height - 1) * stride;
             }
         }
 
@@ -80,10 +80,10 @@ namespace agg
         //--------------------------------------------------------------------
         AGG_INLINE       T* row_ptr(int, int y, unsigned) 
         { 
-            return m_start + y * m_stride; 
+            return m_start + y * (AGG_INT64)m_stride;
         }
-        AGG_INLINE       T* row_ptr(int y)       { return m_start + y * m_stride; }
-        AGG_INLINE const T* row_ptr(int y) const { return m_start + y * m_stride; }
+        AGG_INLINE       T* row_ptr(int y)       { return m_start + y * (AGG_INT64)m_stride; }
+        AGG_INLINE const T* row_ptr(int y) const { return m_start + y * (AGG_INT64)m_stride; }
         AGG_INLINE row_data row    (int y) const 
         { 
             return row_data(0, m_width-1, row_ptr(y)); 
@@ -181,7 +181,7 @@ namespace agg
 
             if(stride < 0)
             {
-                row_ptr = m_buf - int(height - 1) * stride;
+                row_ptr = m_buf - (AGG_INT64)(height - 1) * stride;
             }
 
             T** rows = &m_rows[0];

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ namespace agg`
`62`	`62`	`m_stride = stride;`
`63`	`63`	`if(stride < 0)`
`64`	`64`	`{`
`65`		`- m_start = m_buf - int(height - 1) * stride;`
	`65`	`+ m_start = m_buf - (AGG_INT64)(height - 1) * stride;`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`@@ -80,10 +80,10 @@ namespace agg`
`80`	`80`	`//--------------------------------------------------------------------`
`81`	`81`	`AGG_INLINE T* row_ptr(int, int y, unsigned)`
`82`	`82`	`{`
`83`		`- return m_start + y * m_stride;`
	`83`	`+ return m_start + y * (AGG_INT64)m_stride;`
`84`	`84`	`}`
`85`		`- AGG_INLINE T* row_ptr(int y) { return m_start + y * m_stride; }`
`86`		`- AGG_INLINE const T* row_ptr(int y) const { return m_start + y * m_stride; }`
	`85`	`+ AGG_INLINE T* row_ptr(int y) { return m_start + y * (AGG_INT64)m_stride; }`
	`86`	`+ AGG_INLINE const T* row_ptr(int y) const { return m_start + y * (AGG_INT64)m_stride; }`
`87`	`87`	`AGG_INLINE row_data row (int y) const`
`88`	`88`	`{`
`89`	`89`	`return row_data(0, m_width-1, row_ptr(y));`
`@@ -181,7 +181,7 @@ namespace agg`
`181`	`181`
`182`	`182`	`if(stride < 0)`
`183`	`183`	`{`
`184`		`- row_ptr = m_buf - int(height - 1) * stride;`
	`184`	`+ row_ptr = m_buf - (AGG_INT64)(height - 1) * stride;`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`T** rows = &m_rows[0];`