[mapserver-commits] r9440 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-10-11 17:27:28 -0400 (Sun, 11 Oct 2009)
New Revision: 9440

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapraster.c
Log:
Correct libjpeg v7 compatability issue in old jpeg interface code (#3167)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-11 20:37:45 UTC (rev 9439)
+++ trunk/mapserver/HISTORY.TXT	2009-10-11 21:27:28 UTC (rev 9440)
@@ -17,6 +17,9 @@
 
 - Correct sld generated from mapserver classes (#3133) 
 
+- Correct libjpeg v7 compatability issue in old jpeg interface code (#3167)
+
+
 Version 5.6.0-beta3 (2009-10-07):
 ---------------------------------
 

Modified: trunk/mapserver/mapraster.c
===================================================================
--- trunk/mapserver/mapraster.c	2009-10-11 20:37:45 UTC (rev 9439)
+++ trunk/mapserver/mapraster.c	2009-10-11 21:27:28 UTC (rev 9440)
@@ -990,6 +990,7 @@
   skipy = map->cellsize/cy;
 
   /* muck with scaling */
+  cinfo.scale_num = 1;
   if(MS_MIN(skipx, skipy) >= 8)
     cinfo.scale_denom = 8;
   else